"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "framework/source/uiconfiguration/imagemanagerimpl.cxx" between
libreoffice-7.1.5.1.tar.xz and libreoffice-7.1.5.2.tar.xz

About: LibreOffice source code (core). "Fresh" packages (pre-release version).

imagemanagerimpl.cxx  (libreoffice-7.1.5.1.tar.xz):imagemanagerimpl.cxx  (libreoffice-7.1.5.2.tar.xz)
skipping to change at line 931 skipping to change at line 931
} }
void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUS tring >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGra phicSequence ) void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUS tring >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGra phicSequence )
{ {
replaceImages(nImageType,aCommandURLSequence,aGraphicSequence); replaceImages(nImageType,aCommandURLSequence,aGraphicSequence);
} }
// XUIConfigurationPersistence // XUIConfigurationPersistence
void ImageManagerImpl::reload() void ImageManagerImpl::reload()
{ {
SolarMutexClearableGuard aGuard; SolarMutexResettableGuard aGuard;
if ( m_bDisposed ) if ( m_bDisposed )
throw DisposedException(); throw DisposedException();
CommandMap aOldUserCmdImageSet; CommandMap aOldUserCmdImageSet;
std::vector< OUString > aNewUserCmdImageSet; std::vector< OUString > aNewUserCmdImageSet;
if ( !m_bModified ) if ( !m_bModified )
return; return;
skipping to change at line 1070 skipping to change at line 1070
ConfigurationEvent aRemoveEvent; ConfigurationEvent aRemoveEvent;
aRemoveEvent.aInfo <<= static_cast<sal_uInt16>(i); aRemoveEvent.aInfo <<= static_cast<sal_uInt16>(i);
aRemoveEvent.Accessor <<= xOwner; aRemoveEvent.Accessor <<= xOwner;
aRemoveEvent.Source = xOwner; aRemoveEvent.Source = xOwner;
aRemoveEvent.ResourceURL = m_aResourceString; aRemoveEvent.ResourceURL = m_aResourceString;
aRemoveEvent.Element <<= uno::Reference< XNameAccess >( aRemoveEvent.Element <<= uno::Reference< XNameAccess >(
static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ); static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY );
implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
} }
aGuard.clear(); aGuard.reset();
} }
} }
} }
void ImageManagerImpl::store() void ImageManagerImpl::store()
{ {
SolarMutexGuard g; SolarMutexGuard g;
if ( m_bDisposed ) if ( m_bDisposed )
throw DisposedException(); throw DisposedException();
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)