diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-19 22:15:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:23:09 +0100 |
| commit | e8e132784a5fdea65859d06d6356d6beea5d75e4 (patch) | |
| tree | 562415779869cee2fb37ea3f948d7d9ff3b154ab /svx/source/svdraw/svdograf.cxx | |
| parent | 0d9f2e66db48475c9198480a1f04cda5c873d134 (diff) | |
adapt for singleton api change
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5d22b4dd3a09..000771a6e10a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -100,10 +100,10 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt if ( pInStrm ) { pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() - ? pGF->GetImportFormatNumber( rFilterName ) + const sal_uInt16 nFilter = rFilterName.Len() && rGF.GetImportFormatCount() + ? rGF.GetImportFormatNumber( rFilterName ) : GRFILTER_FORMAT_DONTKNOW; String aEmptyStr; @@ -115,7 +115,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt // there we should create a new service to provide this data if needed aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); aFilterData[ 0 ].Value = Any( sal_True ); - pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); + rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } return aGraphic; } @@ -1299,7 +1299,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream, + if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); |