diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-01 19:04:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-01 19:51:18 +0100 |
| commit | 7c7204ceefd7f2828225d40e8d88f69c84927c43 (patch) | |
| tree | 9ab8ca2f9f29f454335933d3565353a6b4afc068 /filter | |
| parent | 537fff14c233ad85a22588557ff0e9a3caeea155 (diff) | |
CGM_EXPORT_IMPRESS is always used
Change-Id: Ic5d9f0f015deae6e4db00912f1b432dbfefd8534
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.hxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/class7.cxx | 27 |
3 files changed, 13 insertions, 18 deletions
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 0183cb2fc539..970416a45941 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -60,7 +60,7 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel ) , mnParaSize(0) , mnActCount(0) , mpBuf(nullptr) - , mnMode(nMode | CGM_EXPORT_IMPRESS) + , mnMode(nMode) , mnEscape(0) , mnElementClass(0) , mnElementID(0) diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index a9e8fbffb70d..9de86ba8881b 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/frame/XModel.hpp> -#define CGM_EXPORT_IMPRESS 0x00000100 - #include <rtl/ustring.hxx> #include <vector> #include <vcl/vclptr.hxx> diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index a18c5fd30272..116338b870da 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -76,25 +76,22 @@ void CGM::ImplDoClass7() break; 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 - } - else if ( pAppData[ 2 ] & 0x80 ) - { - // this is a template - } - else - { - mpOutAct->InsertPage(); - } + // this starts the document -> maybe we could insert a new document + } + else if ( pAppData[ 2 ] & 0x80 ) + { + // this is a template + } + else + { + mpOutAct->InsertPage(); } - mpChart->ResetAnnotation(); } + mpChart->ResetAnnotation(); } break; case 0x2C0 : /*AppData - SHWKEYTABLE */break; |