CGM_EXPORT_IMPRESS is always used

Change-Id: Ic5d9f0f015deae6e4db00912f1b432dbfefd8534

4 files changed, 15 insertions, 21 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;
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 1dc775256435..70e35bcbcb9d 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -33,7 +33,6 @@
 
 #include "../../ui/inc/DrawDocShell.hxx"
 
-#define CGM_EXPORT_IMPRESS  0x00000100
 #define CGM_BIG_ENDIAN      0x00020000
 
 using namespace ::com::sun::star;
@@ -96,7 +95,7 @@ bool SdCGMFilter::Import()
 
         CreateStatusIndicator();
         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 )
         {
@@ -134,7 +133,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCGM(SvStream &rStream)
 
     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();