de-ICC this for maximum readability

6 files changed, 14 insertions, 50 deletions

diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index d66f387eb4f3..f09f39ef1d89 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -156,11 +156,12 @@ public:
 };
 
 
-// Inline methods from Node.hxx - we know TxtNode only here!!
+// Inline methods from Node.hxx
 inline SwOLENode *SwNode::GetOLENode()
 {
      return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0;
 }
+
 inline const SwOLENode *SwNode::GetOLENode() const
 {
      return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 381fc85cd129..52bae7a74b89 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -843,18 +843,16 @@ inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
     return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn()));
 }
 
-// For IBM-Compiler do not inline this because of 42876
-#ifndef ICC
-// Inline methods from Node.hxx - we know TxtNode only now!!
-inline       SwTxtNode   *SwNode::GetTxtNode()
+// Inline methods from Node.hxx
+inline SwTxtNode *SwNode::GetTxtNode()
 {
      return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0;
 }
-inline const SwTxtNode   *SwNode::GetTxtNode() const
+
+inline const SwTxtNode *SwNode::GetTxtNode() const
 {
      return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0;
 }
-#endif
 
 inline void
 SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart,
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index ec8f58fb1024..bbe3c5934be9 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -149,21 +149,14 @@ public:
     inline const SwCntntNode *GetCntntNode() const;
     inline       SwEndNode   *GetEndNode();
     inline const SwEndNode   *GetEndNode() const;
-#ifndef  ICC
-  inline
-#endif
-    SwTxtNode   *GetTxtNode();
-
-#ifndef  ICC
-  inline
-#endif
-    const SwTxtNode   *GetTxtNode() const;
-    inline        SwOLENode   *GetOLENode();
-    inline  const SwOLENode   *GetOLENode() const;
-    inline        SwNoTxtNode *GetNoTxtNode();
-    inline  const SwNoTxtNode *GetNoTxtNode() const;
-    inline        SwGrfNode   *GetGrfNode();
-    inline  const SwGrfNode   *GetGrfNode() const;
+    inline       SwTxtNode   *GetTxtNode();
+    inline const SwTxtNode   *GetTxtNode() const;
+    inline       SwOLENode   *GetOLENode();
+    inline const SwOLENode   *GetOLENode() const;
+    inline       SwNoTxtNode *GetNoTxtNode();
+    inline const SwNoTxtNode *GetNoTxtNode() const;
+    inline       SwGrfNode   *GetGrfNode();
+    inline const SwGrfNode   *GetGrfNode() const;
     inline       SwTableNode *GetTableNode();
     inline const SwTableNode *GetTableNode() const;
     inline       SwSectionNode *GetSectionNode();
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index ef91eb46de7c..55c592c371a5 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1955,20 +1955,6 @@ SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnly
     return pNodes;
 }
 
-//FEATURE::CONDCOLL
-// Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-// os: nur fuer ICC, da der zum optimieren zu dumm ist
-#ifdef ICC
-SwTxtNode   *SwNode::GetTxtNode()
-{
-     return ND_TEXTNODE == nNodeType ? (SwTxtNode*)this : 0;
-}
-const SwTxtNode   *SwNode::GetTxtNode() const
-{
-     return ND_TEXTNODE == nNodeType ? (const SwTxtNode*)this : 0;
-}
-#endif
-
 /*
  * Document Interface Access
  */
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index c9f63230735f..22dcd941d71b 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -674,18 +674,6 @@ SvxCSS1MapEntry::SvxCSS1MapEntry( const String& rKey, const SfxItemSet& rItemSet
     aKey.ToUpperAscii();
 }
 
-#if defined( ICC )
-sal_Bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
-    return  rE1.aKey==rE2.aKey;
-}
-
-sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
-    return  rE1.aKey<rE2.aKey;
-}
-#endif
-
 sal_Bool SvxCSS1Parser::StyleParsed( const CSS1Selector * /*pSelector*/,
                                  SfxItemSet& /*rItemSet*/,
                                  SvxCSS1PropertyInfo& /*rPropInfo*/ )
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index bcd7a283e1f1..1512fd73c371 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -196,7 +196,6 @@ public:
                             const SvxCSS1MapEntry& rE2 );
 };
 
-#if !defined( ICC )
 inline sal_Bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
 {
     return  rE1.aKey==rE2.aKey;
@@ -206,7 +205,6 @@ inline sal_Bool operator<( const SvxCSS1MapEntry& rE1,  const SvxCSS1MapEntry& r
 {
     return  rE1.aKey<rE2.aKey;
 }
-#endif
 
 // Diese Klasse bereitet den Output des CSS1-Parsers auf,
 // indem die CSS1-Properties in SvxItem(Set)s umgewandelt werden.