Remove useless code

These macros was never defined:
	KANJI
	AMIKAKE
	BORDER_BMP
	SMARTEXT
	JAPANESE_ENABLED
	BENUTIL_SUPPORT

So, these code inside these ifdefs was never executed. Remove all this.
Also in this commit, remove some odd comments and commented code.

Change-Id: Idd4991d06d1c879e64f07875241a8acfa35695d0
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/777
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 1 insertions, 81 deletions

diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 8b57de456b0d..5c4de3f9e8d5 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -124,7 +124,6 @@ void LwpTextStyle::ReadCommon()
 
     m_pLangOverride->Read(m_pObjStrm);
     m_pTxtAttrOverride->Read(m_pObjStrm);
-//#ifdef AMIKAKE
     if (LwpFileHeader::m_nFileRevision < 0x000B)
     {
         m_pCharacterBorderOverride->Read(m_pObjStrm);
@@ -135,7 +134,6 @@ void LwpTextStyle::ReadCommon()
         m_CharacterBorder.ReadIndexed(m_pObjStrm);
         m_Amikake.ReadIndexed(m_pObjStrm);
     }
-//#endif
     sal_uInt16 nCount = 6;
     if (LwpFileHeader::m_nFileRevision > 0x0005)
         nCount = m_pObjStrm->QuickReaduInt16();
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index f7b800de6b3b..d801d42ae038 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -169,36 +169,10 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt
         case FRIB_TAG_NOTE:
             newFrib = new  LwpFribNote(pPara);
             break;
-/*      case FRIB_TAG_KANJI:
-            #ifdef KANJI
-            newFrib = new CFribHelperKanji;
-            #else
-            newFrib = new CFribHelperUnicode;
-            #endif
-            break;
-        case FRIB_TAG_HKATAKANA:
-            #ifdef KANJI
-            newFrib = new CFribHelperHKatakana;
-            #else
-            newFrib = new CFribHelperUnicode;
-            #endif
-            break;
-        case FRIB_TAG_SEPARATOR:
-            newFrib = new CFribHelperSeparator;
-            break;*/
         case FRIB_TAG_SECTION:
             newFrib = new LwpFribSection(pPara);
             break;
-/*      case FRIB_TAG_TOMBSTONE:
-            newFrib = new CFribHelperTombstone;
-            break;
-        case FRIB_TAG_SPECIALTAB:
-            newFrib = new CFribHelperSpecialTab;
-            break;
         case FRIB_TAG_PAGENUMBER:
-            newFrib = new CFribHelperPageNumber;
-            break;
-*/      case FRIB_TAG_PAGENUMBER:
             newFrib = new LwpFribPageNumber(pPara);
             break;
         case FRIB_TAG_DOCVAR:
@@ -207,30 +181,18 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt
         case FRIB_TAG_BOOKMARK:
             newFrib = new LwpFribBookMark(pPara);
             break;
-/*      case FRIB_TAG_DOCVAR:
-            newFrib = new CFribHelperBookmark;
-            break;
-        case FRIB_TAG_DDE:
-            newFrib = new CFribHelperDDE;
-            break;
-*/      case FRIB_TAG_FIELD:
+        case FRIB_TAG_FIELD:
             newFrib = new LwpFribField(pPara);
             break;
         case FRIB_TAG_CHBLOCK:
             newFrib = new LwpFribCHBlock(pPara);
             break;
-/*      case FRIB_TAG_FLOWBREAK:
-            newFrib = new CFribHelperFlowBreak;
-            break;
-#ifdef RUBY*/
         case FRIB_TAG_RUBYMARKER:
             newFrib = new LwpFribRubyMarker(pPara);
             break;
         case FRIB_TAG_RUBYFRAME:
             newFrib = new LwpFribRubyFrame(pPara);
             break;
-/*#endif
-*/
     }
 
     //Do not know why the fribTag judgement is necessary, to be checked with
@@ -400,10 +362,6 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo)
     }
 }
 
-//do nothing
-//void LwpFrib::Parse(IXFStream* pOutputStream)
-//{}
-
 /**
 *  @descr:   Whether there are other fribs following current frib.
 *  @return:  Ture if having following fribs, or false.
diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx b/lotuswordpro/source/filter/lwpfribheader.hxx
index 143799e756d5..e6863a6ff367 100644
--- a/lotuswordpro/source/filter/lwpfribheader.hxx
+++ b/lotuswordpro/source/filter/lwpfribheader.hxx
@@ -103,13 +103,8 @@ enum
     FRIB_TAG_SOFTHYPHEN,    // FT_SOFTHYPHEN
     FRIB_TAG_PARANUMBER,    // FT_PARANUMBER
     FRIB_TAG_UNICODE,       // FT_UNICODE
-#ifdef KANJI
-    FRIB_TAG_KANJI,         // FT_KANJI
-    FRIB_TAG_HKATAKANA,     // FT_HKATAKANA
-#else
     FRIB_TAG_UNICODE2,      // FT_UNICODE
     FRIB_TAG_UNICODE3,      // FT_UNICODE
-#endif
     FRIB_TAG_SEPARATOR,     // FT_SEPARATOR
     FRIB_TAG_SECTION,       // FT_SECTION
     FRIB_TAG_TOMBSTONE,     // FT_TOMBSTONE
@@ -121,13 +116,9 @@ enum
     FRIB_TAG_DDE,           // FT_DDE
     FRIB_TAG_FIELD,         // FT_FIELD
     FRIB_TAG_CHBLOCK,       // FT_CHBLOCK
-//#ifdef RUBY
     FRIB_TAG_FLOWBREAK,     // FT_FLOWBREAK
     FRIB_TAG_RUBYMARKER,    // FT_RUBYMARKER
     FRIB_TAG_RUBYFRAME      // FT_RUBYFRAME
-//#else
-//  FRIB_TAG_FLOWBREAK      // FT_FLOWBREAK
-//#endif
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 4abae5218dc0..c086f160253c 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -121,9 +121,7 @@ public:
     void SetContentRotation(sal_uInt16 nVal){m_nContentRotation = nVal;}
     sal_uInt16 GetPlacement(){return m_nPlacement;}
     void SetPlacement(sal_uInt16 nVal){m_nPlacement = nVal;}
-    // add by , 04/05/2005
     inline LwpPoint* GetOffset() {return &m_Offset;}
-    // end add
 protected:
     virtual void Read();
 protected:
@@ -275,7 +273,6 @@ private:
         DOG_EAR_PAGE = 8,
         DESKTOP = 9,
         BOX_HIGHLIGHT = 10,
-//#ifdef BORDER_BMP
         STAR = 11,
         ROPE = 12,
         DECO1 = 13,
@@ -285,7 +282,6 @@ private:
         ROSE = 17,
         SUNF = 18,
         DECO3 = 19,
-//#endif //BORDER_BMP
         WARNING = 20,
         BUBBLE = 21,
         GIRDER = 22,
@@ -326,7 +322,6 @@ protected:
     LwpShadow m_Shadow;
 };
 
-/*class LwpLayoutRelativityGuts*/
 class LwpLayoutRelativityGuts
 {
 public:
diff --git a/lotuswordpro/source/filter/lwpobjtags.hxx b/lotuswordpro/source/filter/lwpobjtags.hxx
index 5bc2802dbd75..b091ae45e579 100644
--- a/lotuswordpro/source/filter/lwpobjtags.hxx
+++ b/lotuswordpro/source/filter/lwpobjtags.hxx
@@ -212,13 +212,6 @@
 #define TAG_NOTIFY          0x7966744EUL        // "Ntfy"
 #define TAG_LONGHOLDER      0x676E6F4CUL        // "Long"
 
-#ifdef SMARTEXT
-#define TAG_STXINFO         0x6e495f53UL        // "S_In"
-#define TAG_STXMANAGER      0x674d5f53UL        // "S_Mg"
-#define TAG_STXLINK         0x6b4c5f53UL        // "S_Lk"
-#define TAG_STXLINKMARKERLIST   0x4c4d5f53UL        // "S_ML"
-#endif // SMARTEXT
-
 #define TAG_DIVOPTS         0x74704f44UL        // "DOpt"
 #define TAG_FOOTNOTEOPTS    0x704f4e46UL        // "FNOp"
 
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index e5c88168e85f..71a9385d6349 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -458,12 +458,7 @@ private:
         IO_REL_FIRST    = 0x0100,
         IO_REL_REST     = 0x0200,
         IO_REL_FLAGS    = (IO_REL_ALL | IO_REL_FIRST | IO_REL_REST),
-#ifdef JAPANESE_ENABLED // 96/4/8 ueda for indentation by char width
-        IO_USE_RELATIVE = 0x0400,
-        IO_CHARUNIT     = 0x0800
-#else
         IO_USE_RELATIVE = 0x0400
-#endif
     };
 
     sal_Int32   m_nAll;
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index 95027bbed9f6..2a6f289ed793 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -230,7 +230,6 @@ CBenTOCReader::ReadTOC()
 
                 if (LookAhead == BEN_REFERENCE_LIST_ID)
                 {
-                    // Eat it, unless BENUTIL_SUPPORT turned on
                     if ((Err = GetDWord(&ReferencedListID)) != BenErr_OK)
                         return Err;
                     LookAhead = GetCode();
@@ -298,9 +297,6 @@ CBenTOCReader::ReadTOC()
 
                     delete[] sAllocBuffer;
                 }
-                // If BENUTIL_SUPPORT turned on, read in references object
-                // like regular object
-#ifndef BENUTIL_SUPPORT
                 else if (PropertyID == BEN_PROPID_OBJ_REFERENCES)
                 {
                     // Don't need to read in references object--we assume
@@ -308,7 +304,6 @@ CBenTOCReader::ReadTOC()
                     if ((Err = ReadSegments(NULL, &LookAhead)) != BenErr_OK)
                         return Err;
                 }
-#endif
                 else if (ObjectID == BEN_OBJID_TOC)
                 {
                     if (PropertyID == BEN_PROPID_TOC_SEED)
@@ -343,11 +338,6 @@ CBenTOCReader::ReadTOC()
                     pProperty = new CBenProperty(pObject, PropertyID, TypeID,
                       (pCBenProperty) pObject->GetProperties()->GetLast());
 
-#ifdef BENUTIL_SUPPORT
-                    pProperty->UseValue()->
-                      SetReferencedListObjectID(ReferencedListID);
-#endif
-
                     if ((Err = ReadSegments(pProperty->UseValue(),
                       &LookAhead)) != BenErr_OK)
                         return Err;