13 files changed, 0 insertions, 170 deletions
diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index 45fef75641b5..0f94a0ed220a 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -48,8 +48,6 @@ public:
     SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxInsertStatusBarControl();
 
-    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
-
 private:
     sal_Bool    bInsert;
 
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index e1a17dc8d388..d563afbda6d1 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -248,7 +248,6 @@ public:
     sal_uInt16 GetRulerFlags() const { return nFlags; }
 
     void SetDefTabDist(long);
-    long GetDefTabDist() const;
 
     // set/get NullOffset in logic units
     void SetNullOffsetLogic(long lOff = 0);
diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 7ba8e19bd71d..42b30db720fb 100644
--- a/svx/inc/svx/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
@@ -47,8 +47,6 @@ public:
 
     SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
-
 private:
     sal_uInt16  nState;
 
diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index df6d9f7a603d..7de654cd09cf 100644
--- a/svx/inc/svx/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
@@ -53,7 +53,6 @@ public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void    Command( const CommandEvent& rCEvt );
-    static long     GetDefItemWidth( StatusBar& _rStatusBar );
 };
 
 #endif
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ad28264a2a96..e355f4ca9d47 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1102,18 +1102,6 @@ void SvxRuler::SetDefTabDist
 }
 
 
-long SvxRuler::GetDefTabDist() const
-
-/* [Description]
-
-   Get value for DefaultTab (is delivered in App-metrics)
-*/
-
-{
-    return lDefTabDist;
-}
-
-
 sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
 
 /* [Description]
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 0641de728065..8d4ad1908af9 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -114,16 +114,4 @@ void SvxInsertStatusBarControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
 }
 
-sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
-{
-    long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
-    long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
-
-    if(nWidth1<nWidth2)
-        nWidth1=nWidth2;
-
-    return nWidth1+PAINT_OFFSET;
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index c929d9da47f7..d0561d8d3570 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -129,24 +129,4 @@ void SvxSelectionModeControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), sTxt );
 }
 
-sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
-{
-    long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
-    long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
-    long nWidth3 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ERG));
-    long nWidth4 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_BLK));
-
-    if(nWidth1<nWidth2)
-        nWidth1=nWidth2;
-
-    if(nWidth1<nWidth3)
-        nWidth1=nWidth3;
-
-    if(nWidth1<nWidth4)
-        nWidth1=nWidth4;
-
-    return nWidth1+PAINT_OFFSET;
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index abe08b6e8b13..619f178c059f 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -170,9 +170,4 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
     pDev->SetFillColor( aOldFillColor );
 }
 
-long XmlSecStatusBarControl::GetDefItemWidth( StatusBar& )
-{
-    return 16;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index c2695f935a02..0fc70b8619f9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -1734,83 +1734,6 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
 }
 
 /*************************************************************************
- *                      SwContourCache::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
-    const Color& rClosedColor, const Color& rOpenColor )
-{
-    MSHORT nPos = 0; // Suche im Cache ...
-    while( nPos < POLY_CNT && pObj != pSdrObj[ nPos ] )
-        ++nPos;
-    if( POLY_CNT != nPos )
-    {
-        const PolyPolygon* pPol = pTextRanger[ nPos ]->GetLinePolygon();
-        if( !pPol )
-            pPol = &(pTextRanger[ nPos ]->GetPolyPolygon());
-        for( MSHORT i = 0; i < pPol->Count(); ++i )
-        {
-            pOut->SetLineColor( rOpenColor );
-            const Polygon& rPol = (*pPol)[ i ];
-            MSHORT nCount = rPol.GetSize();
-            if( nCount > 1 && rPol[ 0 ] == rPol[ nCount - 1 ] )
-                pOut->SetLineColor( rClosedColor );
-            pOut->DrawPolygon( rPol );
-        }
-        static KSHORT nRadius = 0;
-        if( nRadius )
-        {
-            KSHORT nHalf = nRadius / 2;
-            Size aSz( nRadius, nRadius );
-            for( MSHORT i = 0; i < pPol->Count(); ++i )
-            {
-                const Polygon& rPol = (*pPol)[ i ];
-                MSHORT nCount = rPol.GetSize();
-                for( MSHORT k = 0; k < nCount; ++k )
-                {
-                    Point aPt( rPol[ k ] );
-                    aPt.X() -= nHalf;
-                    aPt.Y() -= nHalf;
-                    Rectangle aTmp( aPt, aSz );
-                    pOut->DrawEllipse( aTmp );
-                }
-            }
-        }
-    }
-}
-#endif
-
-/*************************************************************************
- *                      SwTxtFly::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-void SwTxtFly::ShowContour( OutputDevice* pOut )
-{
-    MSHORT nFlyCount;
-    if( bOn && ( 0 != ( nFlyCount = static_cast<sal_uInt16>(GetAnchoredObjList()->size() ) ) ) )
-    {
-        Color aRedColor( COL_LIGHTRED );
-        Color aGreenColor( COL_LIGHTGREEN );
-        Color aSaveColor( pOut->GetLineColor() );
-        for( MSHORT j = 0; j < nFlyCount; ++j )
-        {
-            const SwAnchoredObject* pObj = (*mpAnchoredObjList)[ j ];
-            if( !pObj->GetFrmFmt().GetSurround().IsContour() )
-            {
-                Rectangle aRect = pObj->GetObjRectWithSpaces().SVRect();
-                pOut->DrawRect( aRect );
-                continue;
-            }
-            pContourCache->ShowContour( pOut, pObj->GetDrawObj(), aRedColor, aGreenColor );
-        }
-        pOut->SetLineColor( aSaveColor );
-    }
-}
-#endif
-
-/*************************************************************************
  *                      SwTxtFly::ForEach()
  *
  * sucht nach dem ersten Objekt, welches mit dem Rechteck ueberlappt
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 9b559bcb32d9..336b3dcf7d2f 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -89,10 +89,6 @@ public:
                                        const SwTxtFrm* pFrm,
                                        const long nXPos,
                                        const sal_Bool bRight );
-#ifdef DBG_UTIL
-    void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
-                      const Color& rClosedColor, const Color& rOpenColor );
-#endif
 };
 
 /*************************************************************************
@@ -189,10 +185,6 @@ public:
     {
         mbIgnoreObjsInHeaderFooter = _bNew;
     }
-
-#ifdef DBG_UTIL
-    void ShowContour( OutputDevice* pOut );
-#endif
 };
 
 // Wenn in das rRect (meist die aktuelle Zeile) kein freifliegender
diff --git a/unusedcode.easy b/unusedcode.easy
index 5dafe6532810..758f612eae6d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -228,7 +228,6 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
 SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
 SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
 SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
-SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
 SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
 SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
 SvtIconWindow_Impl::GetSelectedIconText() const
@@ -261,7 +260,6 @@ SvxDrawPage::SvxDrawPage()
 SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
 SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
 SvxIMapDlg::GetTargetList() const
-SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
 SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
 SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
 SvxMSDffManager::GetAutoForm(MSO_SPT) const
@@ -284,8 +282,6 @@ SvxPopupWindowListBox::StartSelection()
 SvxRectCtlAccessibleContext::CommitChange(com::sun::star::accessibility::AccessibleEventObject const&)
 SvxRelativeField::SvxRelativeField(Window*, long)
 SvxRubyChildWindow::GetChildWindowId()
-SvxRuler::GetDefTabDist() const
-SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
 SvxShapeText::SvxShapeText()
 SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
 SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
@@ -391,7 +387,6 @@ SwTabFrm::GetLeaf(MakePageType, unsigned char)
 SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
 SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
-SwTxtFly::ShowContour(OutputDevice*)
 SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
 SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
 SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
@@ -531,7 +526,6 @@ XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFo
 XclTokenArray::XclTokenArray(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, bool)
 XclTokenArrayIterator::Init()
 XclXFBase::HasUsedFlags() const
-XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
 ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)
 _CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
 _CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index e330dcbc469d..91bbff33de92 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -126,29 +126,6 @@ void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16
     Wakeup();
 }
 
-void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
-{
-    if( osl_acquireMutex( m_aEventGuard ) )
-    {
-        if( ! m_aUserEvents.empty() )
-        {
-            std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
-            do
-            {
-                if( it->m_pFrame    == pFrame   &&
-                    it->m_pData     == pData    &&
-                    it->m_nEvent    == nEvent )
-                {
-                    it = m_aUserEvents.erase( it );
-                }
-                else
-                    ++it;
-            } while( it != m_aUserEvents.end() );
-        }
-        osl_releaseMutex( m_aEventGuard );
-    }
-}
-
 void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 {
     m_aFrames.remove( pFrame );
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 92b989f80dc0..f20f7cd62ea1 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -105,7 +105,6 @@ public:
     virtual ~SvpSalInstance();
 
     void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
-    void CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
 
     void StartTimer( sal_uLong nMS );
     void StopTimer();