Resolves: #i121045 After save a xls file contain marco in AOO, macor can't...

Reported by: binguo
Reviewed by: sunying
Patched by: Jianyuan Li

Change-Id: Ie728ce5185082334e3ce250d73e0660a6097f494

1 files changed, 2 insertions, 12 deletions

diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 4ce70eea5330..7d0b501976dc 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -27,9 +27,6 @@
 #include "xeroot.hxx"
 #include <vector>
 
-// 0 = Export TBX form controls, 1 = Export OCX form controls.
-#define EXC_EXP_OCX_CTRL 0
-
 namespace utl { class TempFile; }
 
 // ============================================================================
@@ -59,11 +56,8 @@ class XclExpDffAnchorBase;
 class XclEscherHostAppData;
 class XclEscherClientData;
 class XclEscherClientTextbox;
-#if EXC_EXP_OCX_CTRL
 class XclExpOcxControlObj;
-#else
 class XclExpTbxControlObj;
-#endif
 class XclExpShapeObj;
 class EscherExHostAppData;
 class ShapeInteractionHelper
@@ -111,19 +105,16 @@ public:
 
                                 /// Flush and merge PicStream into EscherStream
             void                EndDocument();
-
-#if EXC_EXP_OCX_CTRL
     /** Creates an OCX form control OBJ record from the passed form control.
         @descr  Writes the form control data to the 'Ctls' stream. */
-    XclExpOcxControlObj* CreateCtrlObj(
+    XclExpOcxControlObj* CreateOCXCtrlObj(
                             ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
                             const Rectangle* pChildAnchor );
 
 private:
     SotStorageStreamRef  mxCtlsStrm;         /// The 'Ctls' stream.
-#else
     /** Creates a TBX form control OBJ record from the passed form control. */
-    XclExpTbxControlObj* CreateCtrlObj(
+    XclExpTbxControlObj* CreateTBXCtrlObj(
                             ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
                             const Rectangle* pChildAnchor );
 
@@ -133,7 +124,6 @@ private:
                             XclExpTbxControlObj& rTbxCtrlObj,
                             ::com::sun::star::uno::Reference<
                                 ::com::sun::star::awt::XControlModel > xCtrlModel );
-#endif
 
     void                DeleteCurrAppData();