bin some unused code

sw/source/core/text/inftxt.cxx

@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-
-
 #include <com/sun/star/uno/Sequence.h>
 #include <unotools/linguprops.hxx>
 #include <unotools/lingucfg.hxx>
@@ -113,17 +111,7 @@ static bool g_bDbgLow = false;
 #endif
 
 #ifdef DBG_UTIL
-sal_Bool SwTxtSizeInfo::IsOptCalm() const { return !GetOpt().IsTest3(); }
-sal_Bool SwTxtSizeInfo::IsOptLow() const { return g_bDbgLow; }
 sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
-sal_Bool SwTxtSizeInfo::IsOptTest1() const { return GetOpt().IsTest1(); }
-sal_Bool SwTxtSizeInfo::IsOptTest2() const { return GetOpt().IsTest2(); }
-sal_Bool SwTxtSizeInfo::IsOptTest3() const { return GetOpt().IsTest3(); }
-sal_Bool SwTxtSizeInfo::IsOptTest4() const { return GetOpt().IsTest4(); }
-sal_Bool SwTxtSizeInfo::IsOptTest5() const { return GetOpt().IsTest5(); }
-sal_Bool SwTxtSizeInfo::IsOptTest6() const { return GetOpt().IsTest6(); }
-sal_Bool SwTxtSizeInfo::IsOptTest7() const { return GetOpt().IsTest7(); }
-sal_Bool SwTxtSizeInfo::IsOptTest8() const { return GetOpt().IsTest8(); }
 #endif
 
 /*************************************************************************

sw/source/core/text/inftxt.hxx

@@ -75,12 +75,8 @@ class SwWrongList;
 #define DIR_TOP2BOTTOM 3
 
 #ifdef DBG_UTIL
-#define OPTCALM( rInf )  (rInf).IsOptCalm()
-#define OPTLOW( rInf )   (rInf).IsOptLow()
 #define OPTDBG( rInf )   (rInf).IsOptDbg()
 #else
-#define OPTCALM( rInf )  sal_True
-#define OPTLOW( rInf )   sal_False
 #define OPTDBG( rInf )   sal_False
 #endif
 
@@ -107,8 +103,6 @@ class SwLineInfo
     SwLineInfo();
     ~SwLineInfo();
 public:
-//        const SvxTabStop *GetTabStop( const SwTwips nLinePos,
-//                                        const SwTwips nLeft,
     // #i24363# tab stops relative to indent - returns the tab stop following nSearchPos or NULL
     const SvxTabStop *GetTabStop( const SwTwips nSearchPos,
                                  const SwTwips nRight ) const;
@@ -136,7 +130,6 @@ public:
         return nListTabStopPosition;
     }
 
-//  friend ostream &operator<<( ostream &rOS, const SwLineInfo &rInf );
     friend SvStream &operator<<( SvStream &rOS, const SwLineInfo &rInf );
 };
 
@@ -377,17 +370,7 @@ public:
                    ? (*pKanaComp)[nKanaIdx] : 0; }
 
 #ifdef DBG_UTIL
-    sal_Bool IsOptCalm() const;
-    sal_Bool IsOptLow() const;
     sal_Bool IsOptDbg() const;
-    sal_Bool IsOptTest1() const;
-    sal_Bool IsOptTest2() const;
-    sal_Bool IsOptTest3() const;
-    sal_Bool IsOptTest4() const;
-    sal_Bool IsOptTest5() const;
-    sal_Bool IsOptTest6() const;
-    sal_Bool IsOptTest7() const;
-    sal_Bool IsOptTest8() const;
 #endif
 };
 
@@ -738,7 +721,6 @@ public:
     // Return: gefundene Position, setzt ggf. cHookChar
     xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd );
 
-//  friend ostream &operator<<( ostream &rOS, const SwTxtFormatInfo &rInf );
     friend SvStream &operator<<( SvStream &rOS, const SwTxtFormatInfo &rInf );
 
     inline void SetTabOverflow( sal_Bool bOverflow ) { bTabOverflow = bOverflow; }

sw/source/core/text/porlay.hxx

@@ -257,13 +257,6 @@ public:
                            const SwLinePortion* _pDontConsiderPortion = NULL,
                            const bool _bNoFlyCntPorAndLinePor = false ) const;
 
-#ifdef DBG_UTIL
-    void DebugPortions( SvStream &rOs, const XubString &rTxt,
-                        const xub_StrLen nStart ); //$ ostream
-
-    void dumpLineAsXml(xmlTextWriter* writer, sal_uInt16& ofs, String& aText);
-#endif
-
     OUTPUT_OPERATOR
     DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
 };

sw/source/core/text/txtftn.cxx

@@ -45,7 +45,7 @@
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hdl>
 #include <tabfrm.hxx>
-// OD 2004-05-24 #i28701#
+// #i28701#
 #include <sortedobjs.hxx>
 
 #include "swfont.hxx"   // new SwFont
@@ -1278,14 +1278,6 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
     // einen kleineren Font eingestellt als der vom QuoVadis-Text ...
     CalcAdjustLine( pCurr );
 
-#ifdef DBG_UTIL
-    if( OPTDBG( rInf ) )
-    {
-//        aDbstream << "FormatQuoVadis:" << endl;
-//        pCurr->DebugPortions( aDbstream, rInf.GetTxt(), nStart );
-    }
-#endif
-
     // Uff...
     return nRet;
 }

sw/source/core/text/txtio.cxx

@@ -143,11 +143,6 @@ const char *GetPrepName( const PrepareHint )
     return 0;
 }
 
-void SwLineLayout::DebugPortions( SvStream &, const XubString &, //$ ostream
-                                                const xub_StrLen  )
-{
-}
-
 #else
 #include <limits.h>
 #include <stdlib.h>
@@ -240,48 +235,6 @@ const char *GetPrepName( const PrepareHint ePrep )
     return( ppNameArr[ePrep] );
 }
 
-/*************************************************************************
- *                    SwLineLayout::DebugPortions()
- *
- * DebugPortion() iteriert ueber alle Portions einer Zeile und deckt die
- * internen Strukturen auf.
- * Im Gegensatz zum Ausgabe-Operator werden auch die Textteile ausgegeben.
- *************************************************************************/
-
-void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &/*rTxt*/, //$ ostream
-                                                const xub_StrLen /*nStart*/ )
-{
-    SwLinePortion *pPortion2 = GetPortion();
-
-    xub_StrLen nPos = 0;
-    MSHORT nNr = 0;
-    KSHORT nPrtWidth, nLastPrt;
-    nPrtWidth = nLastPrt = 0;
-
-    SwLinePortion::operator<<( rOs );
-    rOs << '\"' << endl;
-
-    while( pPortion2 )
-    {
-        SwTxtPortion *pTxtPor = pPortion2->InTxtGrp() ?
-                                (SwTxtPortion *)pPortion2 : NULL ;
-        (void)pTxtPor;
-        ++nNr;
-        nLastPrt = nPrtWidth;
-        nPrtWidth = nPrtWidth + pPortion2->PrtWidth();
-        rOs << "\tNr:"  << nNr
-            << " Pos:" << nPos
-            << " Org:" << nLastPrt
-            << endl;
-
-        rOs << "\t";
-        pPortion2->operator<<( rOs );
-        rOs << endl;
-        nPos = nPos + pPortion2->GetLen();
-        pPortion2 = pPortion2->GetPortion();
-    }
-}
-
 SvStream &SwLinePortion::operator<<( SvStream &rOs ) const //$ ostream
 {
     rOs << " {";

unusedcode.easy

@@ -652,7 +652,6 @@ SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short
 SwLRects::Replace(SwLineRect const&, unsigned short)
 SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
 SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*)
-SwLineLayout::DebugPortions(SvStream&, String const&, unsigned short)
 SwMailMergeChildWindow::GetChildWindowId()
 SwModify::GetClientCount() const
 SwModule::SetCompareMode(SvxCompareMode)
@@ -704,16 +703,6 @@ SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
 SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
 SwTxtFly::ShowContour(OutputDevice*)
-SwTxtSizeInfo::IsOptCalm() const
-SwTxtSizeInfo::IsOptLow() const
-SwTxtSizeInfo::IsOptTest1() const
-SwTxtSizeInfo::IsOptTest2() const
-SwTxtSizeInfo::IsOptTest3() const
-SwTxtSizeInfo::IsOptTest4() const
-SwTxtSizeInfo::IsOptTest5() const
-SwTxtSizeInfo::IsOptTest6() const
-SwTxtSizeInfo::IsOptTest7() const
-SwTxtSizeInfo::IsOptTest8() const
 SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com::sun::star::text::TableColumnSeparator> const&, double*)
 SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
 SwVbaStyle::getOOoStyleTypeFromMSWord(int)