diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-05-19 22:26:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 09:49:30 +0100 |
commit | b3ab9fe75de4075bf33aec62a1f14ca6f3e62bbd (patch) | |
tree | 56e0671d52fb3c01d190c8e3df6c3302f945b253 /filter | |
parent | 7e4f1b45e1cb49f737f52fb8c756bc8daccecd26 (diff) |
adapt for singleton api change
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 10 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 10 | ||||
-rw-r--r-- | filter/source/svg/svgreader.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 7dc457222ab2..1af5e63e6034 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3725,12 +3725,12 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt nErrCode = GraphicConverter::Export( aStream, aGraphic, ( eGraphicType == GRAPHIC_BITMAP ) ? CVT_PNG : CVT_EMF ); else { // to store a animation, a gif has to be included into the msOG chunk of a png #I5583# - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); SvMemoryStream aGIFStream; ByteString aVersion( "MSOFFICE9.0" ); aGIFStream.Write( aVersion.GetBuffer(), aVersion.Len() ); - nErrCode = pFilter->ExportGraphic( aGraphic, String(), aGIFStream, - pFilter->GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "GIF" ) ) ), NULL ); + nErrCode = rFilter.ExportGraphic( aGraphic, String(), aGIFStream, + rFilter.GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "GIF" ) ) ), NULL ); com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 ); com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence( 1 ); sal_uInt32 nGIFSreamLen = aGIFStream.Tell(); @@ -3745,8 +3745,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt aFilterProp.Name = String( RTL_CONSTASCII_USTRINGPARAM( "AdditionalChunks" ) ); aFilterProp.Value <<= aAdditionalChunkSequence; aFilterData[ 0 ] = aFilterProp; - nErrCode = pFilter->ExportGraphic( aGraphic, String(), aStream, - pFilter->GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "PNG" ) ) ), &aFilterData ); + nErrCode = rFilter.ExportGraphic( aGraphic, String(), aStream, + rFilter.GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "PNG" ) ) ), &aFilterData ); } if ( nErrCode == ERRCODE_NONE ) { diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6ea0a519ef70..e5c080232f05 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4542,9 +4542,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) { - GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); - aFilterName = pGrfFilter->GetImportFormatName( - pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); + GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter(); + aFilterName = rGrfFilter.GetImportFormatName( + rGrfFilter.GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); } aLinkFileName = aName; @@ -6933,9 +6933,9 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, } else { // und unsere feinen Filter darauf loslassen - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); String aEmptyStr; - nRes = pGF->ImportGraphic( rData, aEmptyStr, *pGrStream, GRFILTER_FORMAT_DONTKNOW ); + nRes = rGF.ImportGraphic( rData, aEmptyStr, *pGrStream, GRFILTER_FORMAT_DONTKNOW ); // SJ: I40472, sometimes the aspect ratio (aMtfSize100) does not match and we get scaling problems, // then it is better to use the prefsize that is stored within the metafile. Bug #72846# for what the diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index b66b7aa31fee..125a68f2e406 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -2318,7 +2318,7 @@ struct ShapeRenderingVisitor STREAM_READ); sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -2361,7 +2361,7 @@ struct ShapeRenderingVisitor if (nStreamLen_) { pDest->Seek(0L); - GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; |