diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 757858364555..759cf6289093 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -169,7 +169,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter().GetLastError().nStreamError ); } } } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 887504cacba2..5d9001b26d88 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -361,7 +361,6 @@ SdFilterDetect::~SdFilterDetect() const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicDescriptor aDesc( *pStm, &aFileName ); - GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); if( !aDesc.Detect( sal_False ) ) { pFilter = 0; @@ -385,7 +384,8 @@ SdFilterDetect::~SdFilterDetect() else { String aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) ); - const String aName( pGrfFilter->GetImportFormatTypeName( pGrfFilter->GetImportFormatNumberForShortName( aShortName ) ) ); + GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); + const String aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) ); if ( pFilter && aShortName.EqualsIgnoreCaseAscii( "PCD" ) ) // there is a multiple pcd selection possible { diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 0d389004e8ac..e3ea7182ece5 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -386,14 +386,14 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aURL = INetURLObject( aURLStr ); } - GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); if( !::avmedia::MediaWindow::isMediaURL( aCurrentDropFile ) ) { - if( !pGraphicFilter->ImportGraphic( aGraphic, aURL ) ) + if( !rGraphicFilter.ImportGraphic( aGraphic, aURL ) ) { sal_Int8 nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0; InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL ); |