adapt for singleton api change

3 files changed, 18 insertions, 18 deletions

diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index e0b5ef1adf..77131c1281 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -296,8 +296,8 @@ static bool impl_loadBitmap(
         // Use graphic class to also support more graphic formats (bmp,png,...)
         Graphic aGraphic;
 
-        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-        pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
+        GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
+        rGF.ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
 
         // Default case, we load the intro bitmap from a seperate file
         // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 7287bc2646..b5290aa18e 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -313,10 +313,10 @@ sal_Bool SvFileObject::LoadFile_Impl()
 
 sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 {
-    GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+    GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
 
-    const sal_uInt16 nFilter = sFilter.Len() && pGF->GetImportFormatCount()
-                            ? pGF->GetImportFormatNumber( sFilter )
+    const sal_uInt16 nFilter = sFilter.Len() && rGF.GetImportFormatCount()
+                            ? rGF.GetImportFormatNumber( sFilter )
                             : GRFILTER_FORMAT_DONTKNOW;
 
     String aEmptyStr;
@@ -329,16 +329,16 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 
     if( !pStream )
         nRes = xMed.Is() ? GRFILTER_OPENERROR
-                         : pGF->ImportGraphic( rGrf, INetURLObject(sFileNm),
+                         : rGF.ImportGraphic( rGrf, INetURLObject(sFileNm),
                             nFilter );
     else if( !pDownLoadData )
     {
         pStream->Seek( STREAM_SEEK_TO_BEGIN );
-        nRes = pGF->ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
+        nRes = rGF.ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
     }
     else
     {
-        nRes = pGF->ImportGraphic( pDownLoadData->aGrf, aEmptyStr,
+        nRes = rGF.ImportGraphic( pDownLoadData->aGrf, aEmptyStr,
                                     *pStream, nFilter );
 
         if( pDownLoadData )
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index c24d05d58e..802b7d0849 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -127,12 +127,12 @@ short SvxOpenGraphicDialog::Execute()
     {
         if( GetPath().Len() )
         {
-            GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
+            GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
             INetURLObject aObj( GetPath() );
 
             // check whether we can load the graphic
             String	aCurFilter( GetCurrentFilter() );
-            sal_uInt16 	nFormatNum = pFilter->GetImportFormatNumber( aCurFilter );
+            sal_uInt16 	nFormatNum = rFilter.GetImportFormatNumber( aCurFilter );
             sal_uInt16 	nRetFormat = 0;
             sal_uInt16	nFound = USHRT_MAX;
 
@@ -144,23 +144,23 @@ short SvxOpenGraphicDialog::Execute()
                 SvStream* pStream = aMed.GetInStream();
 
                 if( pStream )
-                    nImpRet = pFilter->CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, nFormatNum, &nRetFormat );
+                    nImpRet = rFilter.CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream, nFormatNum, &nRetFormat );
                 else
-                    nImpRet = pFilter->CanImportGraphic( aObj, nFormatNum, &nRetFormat );
+                    nImpRet = rFilter.CanImportGraphic( aObj, nFormatNum, &nRetFormat );
 
                 if ( GRFILTER_OK != nImpRet )
                 {
                     if ( !pStream )
-                        nImpRet = pFilter->CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
+                        nImpRet = rFilter.CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
                     else
-                        nImpRet = pFilter->CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream,
+                        nImpRet = rFilter.CanImportGraphic( aObj.GetMainURL( INetURLObject::NO_DECODE ), *pStream,
                                                              GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
                 }
             }
             else
             {
-                if( (nImpRet=pFilter->CanImportGraphic( aObj, nFormatNum, &nRetFormat )) != GRFILTER_OK )
-                    nImpRet = pFilter->CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
+                if( (nImpRet=rFilter.CanImportGraphic( aObj, nFormatNum, &nRetFormat )) != GRFILTER_OK )
+                    nImpRet = rFilter.CanImportGraphic( aObj, GRFILTER_FORMAT_DONTKNOW, &nRetFormat );
             }
 
             if ( GRFILTER_OK == nImpRet )
@@ -175,9 +175,9 @@ short SvxOpenGraphicDialog::Execute()
             else
             {
                 // setup appropriate filter (so next time, it will work)
-                if( pFilter->GetImportFormatCount() )
+                if( rFilter.GetImportFormatCount() )
                 {
-                    String	aFormatName(pFilter->GetImportFormatName(nFound));
+                    String	aFormatName(rFilter.GetImportFormatName(nFound));
                     SetCurrentFilter(aFormatName);
                 }