mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

empty Image is an empty XGraphic

Browse Source 
Change-Id: I43fa17c2ef9324c841344554b093500d0fb26165
This commit is contained in:
Caolán McNamara 2017-01-20 16:03:08 +00:00
parent 92bfe7e305
commit aa0951b22d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/source/uiconfiguration/imagemanagerimpl.cxx
View File

@ -224,7 +224,7 @@ static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic
if ( !rInGraphic.is() ) if ( !rInGraphic.is() )
{ {
rOutGraphic = Image().GetXGraphic(); rOutGraphic = uno::Reference<graphic::XGraphic>();
return false; return false;
} }
@ -882,7 +882,7 @@ throw ( css::lang::IllegalArgumentException,
pDefaultImageList = implts_getDefaultImageList(); pDefaultImageList = implts_getDefaultImageList();
} }
ImageList* pImageList = implts_getUserImageList(nIndex); ImageList* pImageList = implts_getUserImageList(nIndex);
uno::Reference< XGraphic > xEmptyGraphic( Image().GetXGraphic() ); uno::Reference<XGraphic> xEmptyGraphic;
for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ ) for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
{ {
@ -1034,8 +1034,8 @@ void ImageManagerImpl::reload()
rGlobalImageList = implts_getGlobalImageList(); rGlobalImageList = implts_getGlobalImageList();
pDefaultImageList = implts_getDefaultImageList(); pDefaultImageList = implts_getDefaultImageList();
} }
uno::Reference< XGraphic > xEmptyGraphic( Image().GetXGraphic() ); uno::Reference<XGraphic> xEmptyGraphic;
CommandMap::const_iterator pIter = aOldUserCmdImageSet.begin(); CommandMap::const_iterator pIter = aOldUserCmdImageSet.begin();
while ( pIter != aOldUserCmdImageSet.end() ) while ( pIter != aOldUserCmdImageSet.end() )
{ {
if ( !pIter->second ) if ( !pIter->second )