diff options
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 7 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.hxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/cgm/sdcgmfilter.cxx | 10 |
3 files changed, 8 insertions, 12 deletions
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 970416a45941..8caba71e88a0 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel ) +CGM::CGM(uno::Reference< frame::XModel > const & rModel) : mnOutdx(28000) , mnOutdy(21000) , mnVDCXadd(0) @@ -60,7 +60,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel ) , mnParaSize(0) , mnActCount(0) , mpBuf(nullptr) - , mnMode(nMode) , mnEscape(0) , mnElementClass(0) , mnElementID(0) @@ -706,7 +705,7 @@ bool CGM::Write( SvStream& rIStm ) // GraphicImport - the exported function extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL -ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, sal_uInt32 nMode, css::uno::Reference<css::task::XStatusIndicator> const & aXStatInd) +ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, css::uno::Reference<css::task::XStatusIndicator> const & aXStatInd) { sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR @@ -716,7 +715,7 @@ ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, sal_uI { try { - std::unique_ptr<CGM> pCGM(new CGM( nMode, rXModel )); + std::unique_ptr<CGM> pCGM(new CGM(rXModel)); if (pCGM && pCGM->IsValid()) { rIn.SetEndian(SvStreamEndian::BIG); diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 9de86ba8881b..4da49ea302de 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -83,7 +83,6 @@ class CGM sal_uInt8* mpBuf; // source stream operation -> then this is allocated for // the temp input buffer - sal_uInt32 mnMode; // source description sal_uInt32 mnEscape; sal_uInt32 mnElementClass; sal_uInt32 mnElementID; @@ -134,7 +133,7 @@ class CGM ~CGM(); - CGM( sal_uInt32 nMode, css::uno::Reference< css::frame::XModel > const & rModel ); + CGM(css::uno::Reference< css::frame::XModel > const & rModel); GDIMetaFile* mpGDIMetaFile; sal_uInt32 GetBackGroundColor(); bool IsValid() const { return mbStatus; }; diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 70e35bcbcb9d..0d24bcf88097 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -33,18 +33,16 @@ #include "../../ui/inc/DrawDocShell.hxx" -#define CGM_BIG_ENDIAN 0x00020000 - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )(SvStream&, Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const &); +typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )(SvStream&, Reference< XModel > const &, Reference< XStatusIndicator > const &); #ifdef DISABLE_DYNLOADING -extern "C" sal_uInt32 ImportCGM(SvStream&, Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const &); +extern "C" sal_uInt32 ImportCGM(SvStream&, Reference< XModel > const &, Reference< XStatusIndicator > const &); #endif @@ -95,7 +93,7 @@ bool SdCGMFilter::Import() CreateStatusIndicator(); std::unique_ptr<SvStream> xIn(::utl::UcbStreamHelper::CreateStream(aFileURL, StreamMode::READ)); - nRetValue = xIn ? FncImportCGM(*xIn, mxModel, CGM_BIG_ENDIAN, mxStatusIndicator) : 0; + nRetValue = xIn ? FncImportCGM(*xIn, mxModel, mxStatusIndicator) : 0; if( nRetValue ) { @@ -133,7 +131,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCGM(SvStream &rStream) CGMPointer aPointer; - bool bRet = aPointer.get()(rStream, xDocShRef->GetModel(), CGM_BIG_ENDIAN, css::uno::Reference<css::task::XStatusIndicator>()) == 0; + bool bRet = aPointer.get()(rStream, xDocShRef->GetModel(), css::uno::Reference<css::task::XStatusIndicator>()) == 0; xDocShRef->DoClose(); |