adjust for return by ref instead of pointer

4 files changed, 16 insertions, 16 deletions

diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index d66e3f28c036..0266d67ad49e 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -208,18 +208,18 @@ sal_Bool SdGRFFilter::Import()
 {
     Graphic         aGraphic;
     const String    aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
-    GraphicFilter*  pGraphicFilter = GraphicFilter::GetGraphicFilter();
-    const sal_uInt16    nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
+    GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
+    const sal_uInt16 nFilter = rGraphicFilter.GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
     sal_Bool        bRet = sal_False;
 
     // ggf. Filterdialog ausfuehren
-    if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) )
+    if ( !rGraphicFilter.HasImportDialog( nFilter ) || rGraphicFilter.DoImportDialog( NULL, nFilter ) )
     {
         SvStream*       pIStm = mrMedium.GetInStream();
-        sal_uInt16          nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
+        sal_uInt16          nReturn = pIStm ? rGraphicFilter.ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
 
         if( nReturn )
-            HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError );
+            HandleGraphicFilterError( nReturn, rGraphicFilter.GetLastError().nStreamError );
         else
         {
             if( mrDocument.GetPageCount() == 0L )
@@ -310,11 +310,11 @@ sal_Bool SdGRFFilter::Export()
                 {
                     uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY );
                     SfxItemSet* pSet = mrMedium.GetItemSet();
-                    GraphicFilter*  pGraphicFilter = GraphicFilter::GetGraphicFilter();
-                    if ( pSet && pGraphicFilter && xSource.is() )
+                    if ( pSet && xSource.is() )
                     {
                         const String aTypeName( mrMedium.GetFilter()->GetTypeName() );
-                        const sal_uInt16 nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName );
+                        GraphicFilter &rGraphicFilter = GraphicFilter::GetGraphicFilter();
+                        const sal_uInt16 nFilter = rGraphicFilter.GetExportFormatNumberForTypeName( aTypeName );
                         if ( nFilter != GRFILTER_FORMAT_NOTFOUND )
                         {
                             uno::Reference< task::XInteractionHandler > mXInteractionHandler;
@@ -324,7 +324,7 @@ sal_Bool SdGRFFilter::Export()
 
                             rtl::OUString sInteractionHandler( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) );
                             rtl::OUString sFilterName( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
-                            rtl::OUString sShortName( pGraphicFilter->GetExportFormatShortName( nFilter ) );
+                            rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) );
 
                             sal_Bool    bFilterNameFound = sal_False;
                             sal_Int32   i, nCount;
@@ -374,7 +374,7 @@ sal_Bool SdGRFFilter::Export()
                             if ( !bRet && mXInteractionHandler.is() )
                                 SdGRFFilter::HandleGraphicFilterError(
                                     static_cast< SdGRFFilter_ImplInteractionHdl* >( mXInteractionHandler.get() )->GetErrorCode(),
-                                                    pGraphicFilter->GetLastError().nStreamError );
+                                                    rGraphicFilter.GetLastError().nStreamError );
                         }
                      }
                 }
@@ -476,7 +476,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
 
         // populate filter dialog filter list and select default filter to match graphic mime type
 
-        GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter();
+        GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
         Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
         OUString aDefaultFormatName;
         sal_uInt16 nCount = rGF.GetExportFormatCount();
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 );