Remove not used macros from lotusworkpro

Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/749Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

lotuswordpro/source/filter/bentoid.hxx

@@ -61,20 +61,11 @@ namespace OpenStormBento
 
 #define BEN_OBJID_TOC 1 // TOC object ID
 #define BEN_PROPID_TOC_SEED 2 // TOC object starting seed
-#define BEN_PROPID_TOC_MIN_SEED 3 // TOC object minimum seed
-#define BEN_PROPID_TOC_OBJECT 4 // TOC object
-#define BEN_PROPID_TOC_CONTAINER 5 // TOC object entire container
-#define BEN_PROPID_TOC_DELETED 6 // TOC object amount deleted
 #define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type
-#define BEN_OBJID_WRITEABLE 20 // Predefined ID's below this value will be
-                               // written to container TOC.  Predefined IDs
-                               // above this are not written
 #define BEN_TYPEID_7_BIT_ASCII 21 // 7-bit ASCII
 #define BEN_PROPID_GLOBAL_TYPE_NAME 23 // Global type name
 #define BEN_PROPID_GLOBAL_PROPERTY_NAME 24 // Global property name
 #define BEN_PROPID_OBJ_REFERENCES 31 // Referenced objects from an object
-#define BEN_TYPEID_OBJ_REFERENCES_DATA 32 // Reference data
-#define BEN_OBJID_MIN_GENERAL_ID 100 // Min object ID for general std objects
 
 #define BEN_NEW_OBJECT 1 // object + property + type
 #define BEN_NEW_PROPERTY 2 // property + type
@@ -95,14 +86,6 @@ namespace OpenStormBento
 #define BEN_SEGMENT_CODE_END 14
 
 #define BEN_REFERENCE_LIST_ID 15 // references recording object ID
-#define BEN_RESERVED4B 16
-#define BEN_RESERVED4C 17
-#define BEN_RESERVED8A 18 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8B 19 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8C 20 // reserved for future use of 8 byte entry
-#define BEN_RESERVED12A 21 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12B 22 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12C 23 // reserved for future use of 12 byte entry
 #define BEN_END_OF_BUFFER 24 // end of current buffer, go to next
 #define BEN_READ_PAST_END_OF_TOC 50 // Our code
 #define BEN_NOOP 0xFF

lotuswordpro/source/filter/lwpdoc.hxx

@@ -98,16 +98,7 @@ private:
     enum
     {
         DOC_PROTECTED = 0x00000004UL,
-        /*#define DOC_USECONTENTS       0x00000008UL
-        #define DOC_LOCKREVISIONS       0x00000200UL
-        #define DOC_LOCAL               0x00000400UL
-        */
         DOC_CHILDDOC =  0x00000800UL
-        /*#define DOC_DOPREVIEW         0x02000000UL
-        #define DOC_REBUILDENDNOTES     0x04000000UL
-        #define DOC_FILEPROTECTION      0x10000000UL
-        #define DOC_PERSISTENTBITS  (DOC_PROTECTED | DOC_USECONTENTS | DOC_LOCKREVISIONS | DOC_LOCAL | DOC_CHILDDOC | DOC_DOPREVIEW | DOC_REBUILDENDNOTES | DOC_FILEPROTECTION)
-        */
     };
 
     //Code cleaning by change some members to local variables in Read()

lotuswordpro/source/filter/lwpfribheader.hxx

@@ -68,10 +68,7 @@
 #define FRIB_MTAG_CHARSTYLE     3
 #define FRIB_MTAG_ATTRIBUTE     4
 #define FRIB_MTAG_LANGUAGE      5
-#define FRIB_MTAG_CHARBORDER    6
-#define FRIB_MTAG_AMIKAKE       7
 #define FRIB_MTAG_CODEPAGE      8
-#define FRIB_MTAG_STXLINK       9       // SmarText; do not #ifdef out
 
 #define FT_MAXIMUM      30
 

lotuswordpro/source/filter/lwpgrfobj.cxx

@@ -85,9 +85,7 @@
 #include <osl/thread.h>
 
 #define EF_NONE 0x0000
-#define EF_FTP 0x0001
 #define EF_ODMA 0x0002
-#define EF_NOS 0x0003
 
 LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpGraphicOleObject(objHdr, pStrm)
@@ -119,7 +117,6 @@ void LwpGraphicObject::Read()
     {
         pServerContext = new unsigned char[nServerContextSize];
         m_pObjStrm->QuickRead(pServerContext, static_cast<sal_uInt16>(nServerContextSize));
-        // add by , 04/05/2005
         if (nServerContextSize > 44)
         {
             m_aIPData.nBrightness = pServerContext[14];
@@ -129,7 +126,6 @@ void LwpGraphicObject::Read()
             m_aIPData.bInvertImage = (sal_Bool)(pServerContext[34] == 0x01);
             m_aIPData.bAutoContrast = (sal_Bool)(pServerContext[44] == 0x00);
         }
-        // end add
     }
     m_pObjStrm->QuickReaduInt16(); //disksize
     strsize = m_pObjStrm->QuickReaduInt16();
@@ -149,7 +145,6 @@ void LwpGraphicObject::Read()
     }
     m_nCachedBaseLine = m_pObjStrm->QuickReadInt32();
     m_bIsLinked = m_pObjStrm->QuickReadInt16();
-    //OUString pLinkedFilePath;
     unsigned char * pFilterContext = NULL;
 
     if (m_bIsLinked)
@@ -202,15 +197,11 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
 {
     if ((m_sServerContextFormat[1]=='s'&&m_sServerContextFormat[2]=='d'&&m_sServerContextFormat[3]=='w'))
     {
-        //XFParagraph* pPara = new XFParagraph();
         std::vector <XFFrame*>::iterator iter;
         for (iter = m_vXFDrawObjects.begin(); iter != m_vXFDrawObjects.end(); ++iter)
         {
             pCont->Add(*iter);
         }
-
-        //pCont->Add(pPara);
-
     }
     else if (this->IsGrafFormatValid())
     {
@@ -299,7 +290,6 @@ void LwpGraphicObject::RegisterStyle()
 
 }
 
-// add by , 03/25/2005
 /**
  * @descr   create drawing object.
  */
@@ -443,7 +433,6 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData)
     return 0;
 }
 
-
 /**
  * @descr   create xf-image object and save it in the container: m_vXFDrawObjects.
  */
@@ -462,8 +451,6 @@ void LwpGraphicObject::CreateGrafObject()
         }
         if (m_aIPData.nContrast != 50)
         {
-            //sal_Int32 nSODCContrast = (sal_Int32)m_aIPData.nContrast*2 - 100;
-            //lwp [0, 100] map to sodc [80, -80]
             sal_Int32 nSODCContrast = (sal_Int32)(80 - (double)m_aIPData.nContrast*1.6);
             pImageStyle->SetContrast(nSODCContrast);
         }
@@ -499,8 +486,8 @@ void LwpGraphicObject::CreateGrafObject()
             double fDisFrameHeight = fFrameHeight - (fTopMargin+fBottomMargin);
 
             // scaled image size
-            double fSclGrafWidth = fOrgGrafWidth;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleWidth());
-            double fSclGrafHeight = fOrgGrafHeight;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleHeight());
+            double fSclGrafWidth = fOrgGrafWidth;
+            double fSclGrafHeight = fOrgGrafHeight;
 
             // get scale mode
             sal_uInt16 nScalemode = pMyScale->GetScaleMode();
@@ -664,7 +651,6 @@ void LwpGraphicObject::CreateGrafObject()
 
     // set archor to frame
     pImage->SetAnchorType(enumXFAnchorFrame);
-//      pImage->SetAnchorType(enumXFAnchorPara);//enumXFAnchorFrame);
 
     // set object name
     LwpAtomHolder* pHolder = this->GetName();
@@ -677,7 +663,6 @@ void LwpGraphicObject::CreateGrafObject()
     m_vXFDrawObjects.push_back(pImage);
 
 }
-// end add
 
 /**
  * @descr   Reserve the equation text in a note in the context.

lotuswordpro/source/filter/lwplayout.hxx

@@ -83,13 +83,10 @@
 #include "xfilter/xfbgimage.hxx"
 #include "lwpusewhen.hxx"
 
-#define ANCHOR_HEIGHT       0x120000
 #define FIRST_LAYOUTPAGENO  0x0001
 #define LAST_LAYOUTPAGENO       0xffff
 
-#define LAY_BUOYFLOAT       0x01
 #define LAY_BUOYNEUTRAL     0x02
-#define LAY_BUOYSINK        0x03
 #define LAY_BUOYLAYER       0x80
 
 class LwpPara;
@@ -224,7 +221,6 @@ class LwpAssociatedLayouts
 {
 public:
     LwpAssociatedLayouts(){}
-    //LwpAssociatedLayouts(LwpObjectStream* pStrm){Read(pStrm);}
 public:
     void Read(LwpObjectStream* pStrm);
     LwpObjectID* GetOnlyLayout(){return &m_OnlyLayout;}
@@ -247,7 +243,6 @@ protected:
     virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HEAD_LAYOUT;}
 };
 
-//add by , 01/20/2005
 class LwpLayoutStyle
 {
 public:
@@ -271,7 +266,6 @@ private:
     sal_uInt16 m_nGridType;
     LwpAtomHolder* m_pContentStyle;
 };
-//end add
 
 #include "lwplaypiece.hxx"
 
@@ -320,11 +314,8 @@ public:
     virtual double GetHeight();
     virtual LwpPoint GetOrigin();
 
-    // added by , 06/01/2004
     sal_Bool IsPatternFill();
     XFBGImage* GetFillPattern();
-    // end add
-
 
     //Check whether there are contents in the layout
     virtual sal_Bool HasContent();
@@ -342,7 +333,6 @@ protected:
     LwpObjectID m_Content;
     LwpObjectID m_BasedOnStyle;
 
-    // 01/20/2005
     LwpObjectID     m_TabPiece;
     LwpLayoutStyle* m_pStyleStuff;
     LwpLayoutMisc*  m_pMiscStuff;
@@ -352,7 +342,6 @@ protected:
     LwpObjectID     m_LayBorderStuff;
     LwpObjectID     m_LayBackgroundStuff;
     LwpObjectID     m_LayExtBorderStuff;
-    //end
 public:
     LwpObjectID* GetContent(){return &m_Content;}
     LwpTabOverride* GetTabOverride();
@@ -370,7 +359,6 @@ public:
 protected:
     void Read();
 protected:
-    // 01/20/2005
     LwpUseWhen* m_pUseWhen;
     LwpObjectID m_Positon;
     LwpObjectID m_LayColumns;
@@ -378,7 +366,6 @@ protected:
     LwpObjectID m_LayJoinStuff;
     LwpObjectID m_LayShadow;
     LwpObjectID m_LayExtJoinStuff;
-    //end
 
 public:
     LwpUseWhen* VirtualGetUseWhen();
@@ -428,7 +415,6 @@ public:
         LAY_NO_WRAP_AROUND,
         LAY_WRAP_LEFT,
         LAY_WRAP_RIGHT,
-        //OLD_LAY_WRAP_RIGHT,
         LAY_WRAP_BOTH,
         LAY_WRAP_IRREG_BOTH,
         LAY_WRAP_IRREG_LEFT,

lotuswordpro/source/filter/lwpoleobject.hxx

@@ -87,8 +87,6 @@ typedef struct tagAFID_CACHE
 #define AFID_MAX_FILE_FORMAT_SIZE                   80
 #define AFID_MAX_CONTEXT_FORMAT_SIZE                80
 
-// OLE defined maximum
-#define MAX_STREAMORSTORAGENAME     32
 /**
  * @descr
  * super class of LwpOleObject and LwpGraphicObject

lotuswordpro/source/filter/xfilter/xfframe.cxx

@@ -59,7 +59,6 @@
  ************************************************************************/
 #include    "xfframe.hxx"
 #include    "xfparagraph.hxx"
-#define     ZINDEX_MAX 0x7fffffff
 #define     ZINDEX_MIN 0
 XFFrame::XFFrame()
 {