mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cgm mode is now unused

Browse Source 
Change-Id: Iea58345633cdea50fdecfe9376160ae4ffcfc6a9
This commit is contained in:
Caolán McNamara
2017-04-01 19:07:52 +01:00
parent 7c7204ceef
commit f050faebab
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
filter/source/graphicfilter/icgm/cgm.cxx
View File

@@ -31,7 +31,7 @@
using namespace ::com::sun::star; 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) : mnOutdx(28000)
, mnOutdy(21000) , mnOutdy(21000)
, mnVDCXadd(0) , mnVDCXadd(0)
@@ -60,7 +60,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel )
, mnParaSize(0) , mnParaSize(0)
, mnActCount(0) , mnActCount(0)
, mpBuf(nullptr) , mpBuf(nullptr)
, mnMode(nMode)
, mnEscape(0) , mnEscape(0)
, mnElementClass(0) , mnElementClass(0)
, mnElementID(0) , mnElementID(0)
@@ -706,7 +705,7 @@ bool CGM::Write( SvStream& rIStm )
// GraphicImport - the exported function // GraphicImport - the exported function
extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL 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 sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR
@@ -716,7 +715,7 @@ ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, sal_uI
{ {
try try
{ {
std::unique_ptr<CGM> pCGM(new CGM( nMode, rXModel )); std::unique_ptr<CGM> pCGM(new CGM(rXModel));
if (pCGM && pCGM->IsValid()) if (pCGM && pCGM->IsValid())
{ {
rIn.SetEndian(SvStreamEndian::BIG); rIn.SetEndian(SvStreamEndian::BIG);

3
filter/source/graphicfilter/icgm/cgm.hxx
View File

@@ -83,7 +83,6 @@ class CGM
sal_uInt8* mpBuf; // source stream operation -> then this is allocated for sal_uInt8* mpBuf; // source stream operation -> then this is allocated for
// the temp input buffer // the temp input buffer
sal_uInt32 mnMode; // source description
sal_uInt32 mnEscape; sal_uInt32 mnEscape;
sal_uInt32 mnElementClass; sal_uInt32 mnElementClass;
sal_uInt32 mnElementID; sal_uInt32 mnElementID;
@@ -134,7 +133,7 @@ class CGM
~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; GDIMetaFile* mpGDIMetaFile;
sal_uInt32 GetBackGroundColor(); sal_uInt32 GetBackGroundColor();
bool IsValid() const { return mbStatus; }; bool IsValid() const { return mbStatus; };

10
sd/source/filter/cgm/sdcgmfilter.cxx
View File

@@ -33,18 +33,16 @@
#include "../../ui/inc/DrawDocShell.hxx" #include "../../ui/inc/DrawDocShell.hxx"
#define CGM_BIG_ENDIAN 0x00020000
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task; using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame; 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 #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 #endif
@@ -95,7 +93,7 @@ bool SdCGMFilter::Import()
CreateStatusIndicator(); CreateStatusIndicator();
std::unique_ptr<SvStream> xIn(::utl::UcbStreamHelper::CreateStream(aFileURL, StreamMode::READ)); 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 ) if( nRetValue )
{ {
@@ -133,7 +131,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCGM(SvStream &rStream)
CGMPointer aPointer; 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(); xDocShRef->DoClose();