[Libreoffice-commits] .: 2 commits - svl/inc svl/source svx/inc svx/source sw/inc sw/source toolkit/inc toolkit/source unusedcode.easy vcl/inc vcl/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Wed Jan 18 11:45:53 PST 2012


 svl/inc/svl/srchitem.hxx                    |    3 
 svl/source/items/srchitem.cxx               |   64 ------------------
 svx/inc/svx/ctredlin.hxx                    |    6 -
 svx/inc/svx/simptabl.hxx                    |    3 
 svx/inc/svx/unoshape.hxx                    |    3 
 svx/source/dialog/_contdlg.cxx              |   44 ------------
 svx/source/dialog/contimp.hxx               |    3 
 svx/source/dialog/ctredlin.cxx              |   95 ----------------------------
 svx/source/dialog/simptabl.cxx              |   10 --
 svx/source/unodraw/unoshape.cxx             |   16 ----
 sw/inc/pam.hxx                              |    4 -
 sw/source/core/crsr/pam.cxx                 |   10 --
 sw/source/core/text/inftxt.cxx              |   18 -----
 sw/source/core/text/inftxt.hxx              |   18 -----
 sw/source/core/text/porlay.hxx              |    7 --
 sw/source/core/text/txtftn.cxx              |   10 --
 sw/source/core/text/txtio.cxx               |   47 -------------
 sw/source/ui/vba/vbacolumn.cxx              |   55 ----------------
 sw/source/ui/vba/vbacolumn.hxx              |    4 -
 sw/source/ui/vba/vbastyle.cxx               |   27 -------
 sw/source/ui/vba/vbastyle.hxx               |    1 
 toolkit/inc/toolkit/helper/vclunohelper.hxx |    1 
 toolkit/source/helper/vclunohelper.cxx      |   70 --------------------
 unusedcode.easy                             |   34 ----------
 vcl/inc/vcl/window.hxx                      |    3 
 vcl/source/window/window.cxx                |    7 --
 26 files changed, 1 insertion(+), 562 deletions(-)

New commits:
commit 105546f7f11ccee50f8066bfb7c753fabb177fc8
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Jan 18 19:48:19 2012 +0100

    remove unused code

diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7a0be71..c832bac 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -171,9 +171,6 @@ public:
     inline  sal_uInt16      GetLEVLonger() const;
     inline  void            SetLEVLonger(sal_uInt16 nSet);
 
-            void            GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
-            void            SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
-
     inline const com::sun::star::util::SearchOptions &
                 GetSearchOptions() const;
     inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0e01172..57f1f1d 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -280,70 +280,6 @@ SfxItemPresentation SvxSearchItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& rDescr )
-{
-    SetSearchString( rDescr->getSearchString() );
-    ::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) );
-    sal_Bool bTemp = false;
-    aAny >>= bTemp ;
-    SetWordOnly( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) );
-    aAny >>= bTemp ;
-    SetExact( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) );
-    aAny >>= bTemp ;
-    SetBackward( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ) );
-    aAny >>= bTemp ;
-    SetSelection( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) );
-    aAny >>= bTemp ;
-    SetRegExp( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) );
-    aAny >>= bTemp ;
-    SetLevenshtein( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) );
-    aAny >>= bTemp ;
-    SetLEVRelaxed( bTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ) );
-    sal_Int16 nTemp = 0;
-    aAny >>= nTemp ;
-    SetLEVOther( nTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ) );
-    aAny >>= nTemp ;
-    SetLEVShorter( nTemp );
-    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ) );
-    aAny >>= nTemp ;
-    SetLEVLonger( nTemp );
-}
-
-void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr )
-{
-    rDescr->setSearchString( GetSearchString() );
-    ::com::sun::star::uno::Any aAny;
-    aAny <<= GetWordOnly() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), aAny );
-    aAny <<= GetExact() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), aAny );
-    aAny <<= GetBackward() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), aAny );
-    aAny <<= GetSelection() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ), aAny );
-    aAny <<= GetRegExp() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), aAny );
-    aAny <<= IsLevenshtein() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), aAny );
-    aAny <<= IsLEVRelaxed() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), aAny );
-    aAny <<= GetLEVOther() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ), aAny );
-    aAny <<= GetLEVShorter() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ), aAny );
-    aAny <<= GetLEVLonger() ;
-    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ), aAny );
-}
-
-
 void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
 {
     // applies transliteration changes in the configuration database
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 18089c7..74e92bc 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -122,7 +122,6 @@ protected:
 public:
 
     SvxRedlinTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
-    SvxRedlinTable(SvxSimpleTableContainer& rParent, const ResId& rResId);
     ~SvxRedlinTable();
 
     // For FilterPage only {
@@ -141,8 +140,6 @@ public:
     // } For FilterPage only
 
     void            SetCalcView(sal_Bool bFlag=sal_True);
-    sal_Bool            IsValidCalcEntry(const String& ,RedlinData *pUserData);
-    sal_Bool            IsValidWriterEntry(const String& ,RedlinData *pUserData);
 
     // no NULL-pointer checking {
     sal_Bool            IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
@@ -239,7 +236,6 @@ public:
 
     void            ClearAuthors();
     void            InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND );
-    sal_uInt16          GetSelectedAuthorPos();
     String          GetSelectedAuthor()const;
     void            SelectedAuthorPos(sal_uInt16 nPos);
     sal_uInt16          SelectAuthor(const String& aString);
@@ -251,11 +247,9 @@ public:
     void            SetRange(const String& rString);
     String          GetRange() const;
     void            HideRange(sal_Bool bHide=sal_True);
-    void            DisableRange(sal_Bool bFlag=sal_True);
     void            SetFocusToRange();
     // } Methods for Calc
 
-    void            HideClocks(sal_Bool bHide=sal_True);
     void            DisableRef(sal_Bool bFlag);
 
     sal_Bool            IsDate();
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index c192458..b15a485 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -112,7 +112,6 @@ public:
 
     void            SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
 
-    void            ClearAll();
     void            ClearHeader();
 
     // to be removed all calls of the related methods are redirected to *Table() methods
@@ -138,8 +137,6 @@ public:
     void            DisableTable();
     sal_Bool            IsEnabled() const;
 
-    void            TableToTop();
-
     sal_uInt16          GetSelectedCol();
     void            SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
     sal_Bool            GetSortDirection(){ return bSortDirection;}
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index beb5102..f22468f 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -191,7 +191,6 @@ public:
     SdrObject* GetSdrObject() const {return mpObj.get();}
     void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; }
     ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw ();
-    static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw ();
 
     ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
 
@@ -223,8 +222,6 @@ public:
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL _getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
 
     void setMaster( SvxShapeMaster* pMaster );
-    const SvxShapeMaster* getMaster() const;
-    SvxShapeMaster* getMaster();
 
     // SfxListener
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw ();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a49fa0d..576d06e 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -501,50 +501,6 @@ sal_Bool SvxSuperContourDlg::IsRedoPossible() const
     return aRedoGraphic.GetType() != GRAPHIC_NONE;
 }
 
-void SvxSuperContourDlg::DoAutoCreate()
-{
-    aCreateTimer.Start();
-}
-
-void SvxSuperContourDlg::ReducePoints( const long nTol )
-{
-    PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) );
-
-    if ( aPolyPoly.Count() )
-    {
-        const MapMode   aMapMode( MAP_100TH_MM );
-        const long      nTol2 = nTol * nTol;
-        Polygon&        rPoly = aPolyPoly[ 0 ];
-        OutputDevice*   pOutDev = Application::GetDefaultDevice();
-        Point           aPtPix;
-        const sal_uInt16    nSize = rPoly.GetSize();
-        sal_uInt16          nCounter = 0;
-
-        if ( nSize )
-            aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode );
-
-        for( sal_uInt16 i = 1; i < nSize; i++ )
-        {
-            const Point&    rNewPt = rPoly[ i ];
-            const Point     aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) );
-
-            const long nDistX = aNewPtPix.X() - aPtPix.X();
-            const long nDistY = aNewPtPix.Y() - aPtPix.Y();
-
-            if( ( nDistX * nDistX + nDistY * nDistY ) >= nTol2 )
-            {
-                rPoly[ ++nCounter ] = rNewPt;
-                aPtPix = aNewPtPix;
-            }
-        }
-
-        rPoly.SetSize( nCounter );
-        aContourWnd.SetPolyPolygon( aPolyPoly );
-        aContourWnd.GetSdrModel()->SetChanged( sal_True );
-    }
-}
-
-
 // Click handler for ToolBox
 
 IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index bf40b98..9a7c8de 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -65,9 +65,6 @@ class SvxSuperContourDlg : public SvxContourDlg
     virtual void        Resize();
     virtual sal_Bool        Close();
 
-    void                DoAutoCreate();
-    void                ReducePoints( const long nTol = 8 );
-
                         DECL_LINK( Tbx1ClickHdl, ToolBox* );
                         DECL_LINK( MousePosHdl, ContourWindow* );
                         DECL_LINK( GraphSizeHdl, ContourWindow* );
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index a7ba956..ba85871 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -163,22 +163,6 @@ SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,WinBits nBits)
     SetNodeDefaultImages();
 }
 
-SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,const ResId& rResId)
-    : SvxSimpleTable(rParent,rResId),
-    aDaTiFirst( DateTime::EMPTY ),
-    aDaTiLast( DateTime::EMPTY ),
-    aDaTiFilterFirst( DateTime::EMPTY ),
-    aDaTiFilterLast( DateTime::EMPTY )
-{
-    bAuthor=sal_False;
-    bDate=sal_False;
-    bIsCalc=sal_False;
-    bComment=sal_False;
-    nDatePos=WRITER_DATE;
-    pCommentSearcher=NULL;
-    SetNodeDefaultImages();
-}
-
 SvxRedlinTable::~SvxRedlinTable()
 {
     if(pCommentSearcher!=NULL)
@@ -339,50 +323,6 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
     }
 }
 
-sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
-{
-    sal_Bool nTheFlag=sal_True;
-    String aString=rString.GetToken(WRITER_AUTHOR,'\t');
-    if(pUserData==NULL)
-    {
-        if(bAuthor)
-        {
-            if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=sal_True;
-            else
-                nTheFlag=sal_False;
-        }
-    }
-    else
-    {
-        DateTime aDateTime=pUserData->aDateTime;
-        nTheFlag=IsValidEntry(&aString,&aDateTime);
-    }
-    return nTheFlag;
-}
-
-sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
-{
-    sal_Bool nTheFlag=sal_True;
-    String aString=rString.GetToken(CALC_AUTHOR,'\t');
-    if(pUserData==NULL)
-    {
-        if(bAuthor)
-        {
-            if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=sal_True;
-            else
-                nTheFlag=sal_False;
-        }
-    }
-    else
-    {
-        DateTime aDateTime=pUserData->aDateTime;
-        nTheFlag=IsValidEntry(&aString,&aDateTime);
-    }
-    return nTheFlag;
-}
-
 sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
                                   const DateTime *pDateTime,const String* pCommentStr)
 {
@@ -837,22 +777,6 @@ String SvxTPFilter::GetMyName() const
     return aStrMyName;
 }
 
-void SvxTPFilter::DisableRange(sal_Bool bFlag)
-{
-    if(bFlag)
-    {
-        aCbRange.Disable();
-        aEdRange.Disable();
-        aBtnRange.Disable();
-    }
-    else
-    {
-        aCbRange.Enable();
-        aEdRange.Enable();
-        aBtnRange.Enable();
-    }
-}
-
 void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
 {
     String aEmpty;
@@ -991,11 +915,6 @@ String SvxTPFilter::GetSelectedAuthor() const
     return aLbAuthor.GetSelectEntry();
 }
 
-sal_uInt16  SvxTPFilter::GetSelectedAuthorPos()
-{
-    return (sal_uInt16) aLbAuthor.GetSelectEntryPos();
-}
-
 void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
 {
     aLbAuthor.SelectEntryPos(nPos);
@@ -1040,20 +959,6 @@ void SvxTPFilter::HideRange(sal_Bool bHide)
     }
 }
 
-void SvxTPFilter::HideClocks(sal_Bool bHide)
-{
-    if(bHide)
-    {
-        aIbClock. Hide();
-        aIbClock2.Hide();
-    }
-    else
-    {
-        aIbClock. Show();
-        aIbClock2.Show();
-    }
-}
-
 void SvxTPFilter::SetComment(const String &rComment)
 {
     aEdComment.SetText(rComment);
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index c9fae16..e3b0aa5 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -250,11 +250,6 @@ void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText,
     SetTabs();
 }
 
-void SvxSimpleTable::ClearAll()
-{
-    aHeaderBar.Clear();
-    Clear();
-}
 void SvxSimpleTable::ClearHeader()
 {
     aHeaderBar.Clear();
@@ -290,11 +285,6 @@ sal_Bool SvxSimpleTable::IsEnabled() const
     return m_rParentTableContainer.IsEnabled();
 }
 
-void SvxSimpleTable::TableToTop()
-{
-    m_rParentTableContainer.ToTop();
-}
-
 sal_uInt16 SvxSimpleTable::GetSelectedCol()
 {
     return (aHeaderBar.GetCurItemId()-1);
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2b57510..6a15396 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -310,16 +310,6 @@ void SvxShape::setMaster( SvxShapeMaster* pMaster )
     mpImpl->mpMaster = pMaster;
 }
 
-SvxShapeMaster* SvxShape::getMaster()
-{
-    return mpImpl->mpMaster;
-}
-
-const SvxShapeMaster* SvxShape::getMaster() const
-{
-    return mpImpl->mpMaster;
-}
-
 //----------------------------------------------------------------------
 
 uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException)
@@ -368,12 +358,6 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence
 }
 
 //----------------------------------------------------------------------
-SvxShape* SvxShape::GetShapeForSdrObj( SdrObject* pObj ) throw()
-{
-    return getImplementation( pObj->getUnoShape() );
-}
-
-//----------------------------------------------------------------------
 ::svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier()
 {
     return mpImpl->maPropertyNotifier;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 456d8ff..53d1486 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -299,10 +299,6 @@ public:
     sal_Bool ContainsPosition(const SwPosition & rPos)
     { return *Start() <= rPos && rPos <= *End(); }
 
-    static sal_Bool Overlap(const SwPaM & a, const SwPaM & b);
-
-    static sal_Bool LessThan(const SwPaM & a, const SwPaM & b);
-
     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
     String GetTxt() const;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 4ef51b4..0d9211b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1141,11 +1141,6 @@ String SwPaM::GetTxt() const
     return aResult;
 }
 
-sal_Bool SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
-{
-    return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
-}
-
 void SwPaM::InvalidatePaM()
 {
     const SwNode *_pNd=this->GetNode();
@@ -1160,9 +1155,4 @@ void SwPaM::InvalidatePaM()
     }
 }
 
-sal_Bool SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
-{
-    return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End());
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 46088d7..96d596c 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -105,12 +105,6 @@ namespace numfunc
 }
 
 #ifdef DBG_UTIL
-// Test2: WYSIWYG++
-// Test4: WYSIWYG debug
-static bool g_bDbgLow = false;
-#endif
-
-#ifdef DBG_UTIL
 sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
 #endif
 
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index 0e1718c..e5abefd 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -50,61 +50,6 @@ SwVbaColumn::~SwVbaColumn()
 {
 }
 
-void SwVbaColumn::calculateAbsoluteColumnWidth( sal_Int32 nTableWidth, const css::uno::Sequence< css::text::TableColumnSeparator >& aSeparators, double* pAbsWidth )
-{
-    const text::TableColumnSeparator* pArray = aSeparators.getConstArray();
-    sal_Int32 nSepCount = aSeparators.getLength();
-    for( sal_Int32 i = 0; i <= nSepCount; i++ )
-    {
-        sal_Int32 nRelColWidth = 0;
-        if( i == 0 )
-        {
-            if( nSepCount != 0 )
-            {
-                nRelColWidth = pArray[0].Position;
-            }
-            else
-            {
-                nRelColWidth = RELATIVE_TABLE_WIDTH;
-            }
-        }
-        else
-        {
-            if( i == nSepCount )
-            {
-                nRelColWidth = RELATIVE_TABLE_WIDTH - pArray[i-1].Position;
-            }
-            else
-            {
-                nRelColWidth = pArray[i].Position - pArray[i-1].Position;
-            }
-        }
-        pAbsWidth[i] = ( (double)nRelColWidth / RELATIVE_TABLE_WIDTH ) * (double) nTableWidth;
-    }
-}
-
-void SwVbaColumn::calculateRelativeColumnWidth( const double* pAbsWidth, double* pRelWidth, sal_Int32 nCount )
-{
-    double tableWidth = 0.0;
-    for( sal_Int32 i = 0; i < nCount; i++ )
-    {
-        tableWidth += pAbsWidth[i];
-    }
-
-    pRelWidth[ nCount - 1 ] = tableWidth;
-    for( sal_Int32 i = 0; i < nCount - 1; i++ )
-    {
-        if( i == 0 )
-        {
-            pRelWidth[i] = ( pAbsWidth[i] * RELATIVE_TABLE_WIDTH ) / tableWidth;
-        }
-        else
-        {
-            pRelWidth[i] = pRelWidth[i-1] + ( pAbsWidth[i] * RELATIVE_TABLE_WIDTH ) / tableWidth;
-        }
-    }
-}
-
 sal_Int32 SAL_CALL
 SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException )
 {
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index 3ab42d6..fe7926f 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -44,10 +44,6 @@ private:
     css::uno::Reference< css::table::XTableColumns > mxTableColumns;
     sal_Int32 mnIndex;
 
-private:
-    void calculateAbsoluteColumnWidth( sal_Int32 nTableWidth, const css::uno::Sequence< css::text::TableColumnSeparator >& aSeparators, double* pAbsWidth );
-    void calculateRelativeColumnWidth( const double* pAbsWidth, double* pRelWidth, sal_Int32 nCount );
-
 public:
     SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
     virtual ~SwVbaColumn();
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 4c966e3..9b037b0 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -127,33 +127,6 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro
     throw uno::RuntimeException();
 }
 
-rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType )
-{
-    rtl::OUString aStyleType;
-    switch( _wdStyleType )
-    {
-        case word::WdStyleType::wdStyleTypeParagraph:
-        case word::WdStyleType::wdStyleTypeTable:
-        {
-            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") );
-            break;
-        }
-        case word::WdStyleType::wdStyleTypeCharacter:
-        {
-            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") );
-            break;
-        }
-        case word::WdStyleType::wdStyleTypeList:
-        {
-            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName") );
-            break;
-        }
-        default:
-            DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-    }
-    return aStyleType;
-}
-
 ::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException)
 {
     rtl::OUString sNameLocal;
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 4052a6b..b6a2867 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -50,7 +50,6 @@ public:
     virtual ~SwVbaStyle(){}
 
     static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ) throw (css::uno::RuntimeException);
-    static rtl::OUString getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType );
     static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException);
     static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
 
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index ba8844e..bb6e1eb 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx
@@ -136,7 +136,6 @@ public:
     static FieldUnit                                ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor );
 
     static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (::com::sun::star::lang::IllegalArgumentException);
-    static sal_Int16 /* com.sun.star.util.MeasureUnit.* */ ConvertToMeasurementUnit(MapUnit /* MapModeUnit */ _nMapModeUnit) throw (::com::sun::star::lang::IllegalArgumentException);
 
     static ::Size /* VCLSize */ ConvertToVCLSize(::com::sun::star::awt::Size const& _aSize);
     static ::com::sun::star::awt::Size ConvertToAWTSize(::Size /* VCLSize */ const& _aSize);
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 4a38bf8..7fce9f1 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -642,76 +642,6 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
     return eMode;
 }
 
-sal_Int16 /* com.sun.star.util.MeasureUnit.* */ VCLUnoHelper::ConvertToMeasurementUnit(MapUnit /* MapModeUnit */ _eMapModeUnit)  throw (::com::sun::star::lang::IllegalArgumentException)
-{
-    sal_Int16 nMeasureUnit = 0;
-    switch (_eMapModeUnit)
-    {
-    case MAP_100TH_MM:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::MM_100TH;
-        break;
-
-    case MAP_10TH_MM:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::MM_10TH;
-        break;
-
-    case MAP_MM:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::MM;
-        break;
-
-    case MAP_CM:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::CM;
-        break;
-
-    case MAP_1000TH_INCH:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_1000TH;
-        break;
-
-    case MAP_100TH_INCH:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_100TH;
-        break;
-
-    case MAP_10TH_INCH:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_10TH;
-        break;
-
-    case MAP_INCH:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::INCH;
-        break;
-
-    case MAP_POINT:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::POINT;
-        break;
-
-    case MAP_TWIP:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::TWIP;
-        break;
-
-    case MAP_PIXEL:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::PIXEL;
-        break;
-
-    case MAP_APPFONT:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::APPFONT;
-        break;
-
-    case MAP_SYSFONT:
-        nMeasureUnit = com::sun::star::util::MeasureUnit::SYSFONT;
-        break;
-
-/*
-    case MAP_RELATIVE:
-        break;
-
-    case MAP_REALAPPFONT:
-        break;
-*/
-    default:
-        throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported MapMode unit.")), NULL, 1 );
-    }
-    return nMeasureUnit;
-}
-
 ::Size VCLUnoHelper::ConvertToVCLSize(com::sun::star::awt::Size const& _aSize)
 {
     ::Size aVCLSize(_aSize.Width, _aSize.Height);
diff --git a/unusedcode.easy b/unusedcode.easy
index 564d2d7..2a6c2fc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -562,9 +562,6 @@ SvxPositionSizeTabPage::LinkStubChangePosXHdl(void*, void*)
 SvxPositionSizeTabPage::LinkStubChangePosYHdl(void*, void*)
 SvxRectCtlAccessibleContext::setDescription(rtl::OUString const&)
 SvxRectCtlAccessibleContext::setName(rtl::OUString const&)
-SvxRedlinTable::IsValidCalcEntry(String const&, RedlinData*)
-SvxRedlinTable::IsValidWriterEntry(String const&, RedlinData*)
-SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer&, ResId const&)
 SvxRelativeField::SvxRelativeField(Window*, long)
 SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
 SvxRubyChildWindow::GetChildWindowId()
@@ -572,22 +569,9 @@ SvxRuler::GetDefTabDist() const
 SvxSearchDialog::GetReplaceItems(SfxItemSet&)
 SvxSearchDialog::GetSearchItems(SfxItemSet&)
 SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
-SvxSearchItem::GetFromDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor> const&)
-SvxSearchItem::SetToDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor>&)
 SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
-SvxShape::GetShapeForSdrObj(SdrObject*)
-SvxShape::getMaster()
-SvxShape::getMaster() const
 SvxShapePolyPolygonBezier::GetPolygonKind() const
 SvxShapeText::SvxShapeText()
-SvxSimpleTable::ClearAll()
-SvxSimpleTable::TableToTop()
-SvxSuperContourDlg::DoAutoCreate()
-SvxSuperContourDlg::ReducePoints(long)
-SvxTPFilter::DisableRange(unsigned char)
-SvxTPFilter::GetSelectedAuthorPos()
-SvxTPFilter::HideClocks(unsigned char)
-SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
 SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
 SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
 SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
@@ -661,8 +645,6 @@ SwModule::SetUseRsid(unsigned char)
 SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
 SwOutlineNodes::Insert(SwNode* const*, unsigned short)
 SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
-SwPaM::LessThan(SwPaM const&, SwPaM const&)
-SwPaM::Overlap(SwPaM const&, SwPaM const&)
 SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
 SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
 SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
@@ -703,9 +685,6 @@ SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
 SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
 SwTxtFly::ShowContour(OutputDevice*)
-SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com::sun::star::text::TableColumnSeparator> const&, double*)
-SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
-SwVbaStyle::getOOoStyleTypeFromMSWord(int)
 SwVbaTableHelper::setTableWidth(int)
 SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
 SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
@@ -774,7 +753,6 @@ UnoDialog::getMapsFromPixels(int) const
 UnoListBoxControl::getActionListeners()
 UnoListBoxControl::getItemListeners()
 UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int)
-VCLUnoHelper::ConvertToMeasurementUnit(MapUnit)
 VCLUnoHelper::CreatePointer()
 VCLXDevice::IsCreatedWithToolkit() const
 VCLXPrinterServer::getImplementationId()
@@ -812,7 +790,6 @@ WW8OleMaps::Remove(unsigned short, unsigned short)
 WinMtfOutput::DrawLine(Point const&, Point const&)
 WinMtfOutput::GetTextLayoutMode() const
 WinMtfOutput::SetFont(Font const&)
-Window::GetFullscreenSpriteCanvas(Size const&) const
 Window::PostUserEvent(unsigned long&, unsigned long, void*)
 X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
 X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 3354499..ad445b7 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1029,9 +1029,6 @@ public:
     /// request XSpriteCanvas render interface for this window
     ::com::sun::star::uno::Reference<
         ::com::sun::star::rendering::XSpriteCanvas > GetSpriteCanvas() const;
-    /// request fullscreen XSpriteCanvas render interface for this window
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::rendering::XSpriteCanvas > GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const;
 
     /*  records all DrawText operations within the passed rectangle;
      *  a synchronous paint is sent to achieve this
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 54ac8b2..06f1efc 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9441,13 +9441,6 @@ uno::Reference< rendering::XSpriteCanvas > Window::GetSpriteCanvas() const
     return xSpriteCanvas;
 }
 
-uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > Window::GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const
-{
-    uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas(
-        ImplGetCanvas( rFullscreenSize, true, true ), uno::UNO_QUERY );
-    return xSpriteCanvas;
-}
-
 void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rPos )
 {
     sal_Bool bRVisible = mpWindowImpl->mbReallyVisible;
commit 051e60ff36da9b1b7d0ee5268f74fcd34c4ef059
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Jan 18 17:16:59 2012 +0100

    bin some unused code

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ca9d179..46088d7 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/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
 
 /*************************************************************************
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 0dc05d0..a0fbb82 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/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; }
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index e627dc2..e81769b 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/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)
 };
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index c9b512b..3769aff 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/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;
 }
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 23c7eff..c55a166 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/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 << " {";
diff --git a/unusedcode.easy b/unusedcode.easy
index 6aea66a..564d2d7 100644
--- a/unusedcode.easy
+++ b/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)


More information about the Libreoffice-commits mailing list