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

CGM_EXPORT_IMPRESS is always used

Browse Source 
Change-Id: Ic5d9f0f015deae6e4db00912f1b432dbfefd8534
This commit is contained in:
Caolán McNamara
2017-04-01 19:04:08 +01:00
parent 537fff14c2
commit 7c7204ceef
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ 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 | CGM_EXPORT_IMPRESS) , mnMode(nMode)
, mnEscape(0) , mnEscape(0)
, mnElementClass(0) , mnElementClass(0)
, mnElementID(0) , mnElementID(0)

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

@@ -22,8 +22,6 @@
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#define CGM_EXPORT_IMPRESS 0x00000100
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <vector> #include <vector>
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>

27
filter/source/graphicfilter/icgm/class7.cxx
View File

@@ -76,25 +76,22 @@ void CGM::ImplDoClass7()
break; break;
case 0x2BE : /*AppData - SHWSLIDEREC*/ case 0x2BE : /*AppData - SHWSLIDEREC*/
{ {
if ( mnMode & CGM_EXPORT_IMPRESS ) if ( pAppData[ 16 ] == 0 ) // a blank template ?
{ {
if ( pAppData[ 16 ] == 0 ) // a blank template ? if ( pAppData[ 2 ] == 46 )
{ {
if ( pAppData[ 2 ] == 46 ) // this starts the document -> maybe we could insert a new document
{ }
// this starts the document -> maybe we could insert a new document else if ( pAppData[ 2 ] & 0x80 )
} {
else if ( pAppData[ 2 ] & 0x80 ) // this is a template
{ }
// this is a template else
} {
else mpOutAct->InsertPage();
{
mpOutAct->InsertPage();
}
} }
mpChart->ResetAnnotation();
} }
mpChart->ResetAnnotation();
} }
break; break;
case 0x2C0 : /*AppData - SHWKEYTABLE */break; case 0x2C0 : /*AppData - SHWKEYTABLE */break;

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

@@ -33,7 +33,6 @@
#include "../../ui/inc/DrawDocShell.hxx" #include "../../ui/inc/DrawDocShell.hxx"
#define CGM_EXPORT_IMPRESS 0x00000100
#define CGM_BIG_ENDIAN 0x00020000 #define CGM_BIG_ENDIAN 0x00020000
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -96,7 +95,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 | CGM_EXPORT_IMPRESS, mxStatusIndicator) : 0; nRetValue = xIn ? FncImportCGM(*xIn, mxModel, CGM_BIG_ENDIAN, mxStatusIndicator) : 0;
if( nRetValue ) if( nRetValue )
{ {
@@ -134,7 +133,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 | CGM_EXPORT_IMPRESS, css::uno::Reference<css::task::XStatusIndicator>()) == 0; bool bRet = aPointer.get()(rStream, xDocShRef->GetModel(), CGM_BIG_ENDIAN, css::uno::Reference<css::task::XStatusIndicator>()) == 0;
xDocShRef->DoClose(); xDocShRef->DoClose();