diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 10:04:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:23:09 +0100 |
| commit | e97177e5d8c7c54fc7321c5b80d838291e2f1206 (patch) | |
| tree | f4ccec426772358323cc899739bd145d89847add | |
| parent | 21d75c573e4da2c1dae6a9ebf78b99caec3c038a (diff) | |
resolve merge conflicts
| -rw-r--r-- | editeng/source/rtf/rtfgrf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 7a4279906d..a11e810ddf 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -477,15 +477,15 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) if( bValidBmp ) { - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW; if( pFilterNm ) { String sTmp; - for( sal_uInt16 n = pGF->GetImportFormatCount(); n; ) + for( sal_uInt16 n = rGF.GetImportFormatCount(); n; ) { - sTmp = pGF->GetImportFormatShortName( --n ); + sTmp = rGF.GetImportFormatShortName( --n ); if( sTmp.EqualsAscii( pFilterNm )) { nImportFilter = n; @@ -503,7 +503,7 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right>0 && aAPMHeader.bottom>0?&aAPMHeader:NULL); pTmpFile->Seek( STREAM_SEEK_TO_BEGIN ); - bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader ); + bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader ); } } |