loplugin:staticmethods

Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0

26 files changed, 85 insertions, 86 deletions

diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 972f9a087d17..f19ecd3b3b8d 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -58,7 +58,7 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
     typedef std::map <OUString, sal_Int32> MapString2Int;
     MapString2Int   aURLIgnoreCounters;
 
-    Sequence< OUString > GetPropertyNames();
+    static Sequence< OUString > GetPropertyNames();
 
     virtual void    ImplCommit() SAL_OVERRIDE;
 
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 9e12ecfc39ce..e1363a5aa52d 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -57,8 +57,8 @@ class ItemHolder2 : private ItemHolderMutexBase
 
         void impl_addItem(EItem eItem);
         void impl_releaseAllItems();
-        void impl_newItem(TItemInfo& rItem);
-        void impl_deleteItem(TItemInfo& rItem);
+        static void impl_newItem(TItemInfo& rItem);
+        static void impl_deleteItem(TItemInfo& rItem);
 };
 
 } // namespace svtools
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 0dd13809f899..58fb45ae76e7 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -157,7 +157,7 @@ class SvtMiscOptions_Impl : public ConfigItem
 
         void SetSymbolsSize( sal_Int16 nSet );
 
-        OUString GetIconTheme() const;
+        static OUString GetIconTheme();
 
         enum SetModifiedFlag { SET_MODIFIED, DONT_SET_MODIFIED };
 
@@ -528,7 +528,7 @@ void SvtMiscOptions_Impl::SetSymbolsSize( sal_Int16 nSet )
     CallListeners();
 }
 
-OUString SvtMiscOptions_Impl::GetIconTheme() const
+OUString SvtMiscOptions_Impl::GetIconTheme()
 {
     return Application::GetSettings().GetStyleSettings().DetermineIconTheme();
 }
@@ -784,7 +784,7 @@ bool SvtMiscOptions::AreCurrentSymbolsLarge() const
 
 OUString SvtMiscOptions::GetIconTheme() const
 {
-    return m_pDataContainer->GetIconTheme();
+    return SvtMiscOptions_Impl::GetIconTheme();
 }
 
 void SvtMiscOptions::SetIconTheme(const OUString& iconTheme)
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 8ef7f1867411..8ec816f3af49 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -462,7 +462,7 @@ public:
 
     void                    OpenFolder_Impl();
     // #83004# -------
-    void                        ReplaceTabWithString( OUString& aValue );
+    static void             ReplaceTabWithString( OUString& aValue );
     void                    CreateDisplayText_Impl();
     void                    SortFolderContent_Impl();
 
@@ -1117,7 +1117,7 @@ Size SvtFileView::GetOptimalSize() const
 
 
 
-OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const
+OUString SvtFileView::GetURL( SvTreeListEntry* pEntry )
 {
     OUString aURL;
     if ( pEntry && pEntry->GetUserData() )
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 9e6b3bfcdae4..da249561ffe4 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -235,7 +235,7 @@ class SvxIconChoiceCtrl_Impl
 
     void                AdjustScrollBars( bool bVirtSizeGrowedOnly = false);
     void                PositionScrollBars( long nRealWidth, long nRealHeight );
-    long                GetScrollBarPageSize( long nVisibleRange ) const
+    static long         GetScrollBarPageSize( long nVisibleRange )
                         {
                             return ((nVisibleRange*75)/100);
                         }
@@ -397,7 +397,7 @@ public:
 
     SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false );
 
-    Point               GetEntryPos( SvxIconChoiceCtrlEntry* );
+    static Point        GetEntryPos( SvxIconChoiceCtrlEntry* );
     void                MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound = true );
 
     void                Arrange(
@@ -432,7 +432,7 @@ public:
                             rRect.Right() = LONG_MAX;
                             bBoundRectsDirty = true;
                         }
-    bool            IsBoundingRectValid( const Rectangle& rRect ) const { return ( rRect.Right() != LONG_MAX ); }
+    static bool         IsBoundingRectValid( const Rectangle& rRect ) { return ( rRect.Right() != LONG_MAX ); }
 
     void                PaintEmphasis(
                             const Rectangle& rRect1,
@@ -469,10 +469,10 @@ public:
 
     void                HideDDIcon();
 
-    bool                IsOver(
+    static bool         IsOver(
                             std::vector<Rectangle*>* pSelectedRectList,
                             const Rectangle& rEntryBoundRect
-                        ) const;
+                        );
 
     void                SelectRect(
                             const Rectangle&,
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 0e3d008cdce7..c46df0507255 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1628,7 +1628,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
     {
         OUString aText;
         if( !pStr )
-            aText = pView->GetEntryText( pEntry, false );
+            aText = SvtIconChoiceCtrl::GetEntryText( pEntry, false );
         else
             aText = *pStr;
 
@@ -1672,7 +1672,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
             aPos.X() += (rRect.GetWidth() - aImageSize.Width() ) / 2;
         if( nPaintFlags & PAINTFLAG_VER_CENTERED )
             aPos.Y() += (rRect.GetHeight() - aImageSize.Height() ) / 2;
-        pView->DrawEntryImage( pEntry, aPos, *pOut );
+        SvtIconChoiceCtrl::DrawEntryImage( pEntry, aPos, *pOut );
     }
 }
 
@@ -1740,7 +1740,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
     }
     */
 
-    OUString aEntryText( pView->GetEntryText( pEntry, false ) );
+    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) );
     Rectangle aTextRect( CalcTextRect(pEntry,&rPos,false,&aEntryText));
     Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
 
@@ -1982,7 +1982,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry,
 {
     OUString aEntryText;
     if( !pStr )
-        aEntryText = pView->GetEntryText( pEntry, bEdit );
+        aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry, bEdit );
     else
         aEntryText = *pStr;
 
@@ -2811,7 +2811,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
     }
 }
 
-bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<Rectangle*>* pRectList, const Rectangle& rBoundRect ) const
+bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<Rectangle*>* pRectList, const Rectangle& rBoundRect )
 {
     const sal_uInt16 nCount = pRectList->size();
     for( sal_uInt16 nCur = 0; nCur < nCount; nCur++ )
@@ -3127,7 +3127,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
     SetNoSelection();
 
     pCurEditedEntry = pEntry;
-    OUString aEntryText( pView->GetEntryText( pEntry, true ) );
+    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, true ) );
     Rectangle aRect( CalcTextRect( pEntry, 0, true, &aEntryText ) );
     MakeVisible( aRect );
     Point aPos( aRect.TopLeft() );
@@ -3585,7 +3585,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
         return false;
 
     OUString sQuickHelpText = pEntry->GetQuickHelpText();
-    OUString aEntryText( pView->GetEntryText( pEntry, false ) );
+    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) );
     Rectangle aTextRect( CalcTextRect( pEntry, 0, false, &aEntryText ) );
     if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
         return false;
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 88d6f0ad7714..659be51ba254 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -713,7 +713,7 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( bool bOccupyFound )
 // lead to small overlaps.
 void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, bool bOccupy )
 {
-    if( !_pGridMap || !_pView->IsBoundingRectValid( pEntry->aRect ))
+    if( !_pGridMap || !SvxIconChoiceCtrl_Impl::IsBoundingRectValid( pEntry->aRect ))
         return;
     OccupyGrid( GetGrid( pEntry->aRect.Center()), bOccupy );
 }
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index c069bef5b569..39eb1dc3ac88 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1104,7 +1104,7 @@ void SvImpLBox::DrawNet()
 
             pChild = pView->FirstChild( pEntry );
             DBG_ASSERT(pChild,"Child?");
-            pChild = pTree->LastSibling( pChild );
+            pChild = SvTreeList::LastSibling( pChild );
             nDistance = (sal_uInt16)(pView->GetVisiblePos(pChild) -
                                  pView->GetVisiblePos(pEntry));
             aPos2 = aPos1;
@@ -1145,7 +1145,7 @@ void SvImpLBox::DrawNet()
         aPos1.X() -=  pView->GetIndent();
         aPos1.Y() = GetEntryLine( pEntry );
         aPos1.Y() += nEntryHeightDIV2;
-        pChild = pTree->LastSibling( pEntry );
+        pChild = SvTreeList::LastSibling( pEntry );
         aPos2.X() = aPos1.X();
         aPos2.Y() = GetEntryLine( pChild );
         aPos2.Y() += nEntryHeightDIV2;
@@ -1689,7 +1689,7 @@ void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry )
             pView->Select( pCursor, false );
         ShowCursor( false );    // focus rectangle gone
         // NextSibling, because we also delete the children of the cursor
-        pTemp = pView->NextSibling( pCursor );
+        pTemp = SvTreeListBox::NextSibling( pCursor );
         if( !pTemp )
             pTemp = pView->PrevVisible(pCursor);
 
@@ -1697,7 +1697,7 @@ void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry )
     }
     if( pStartEntry && pStartEntry == pEntry )
     {
-        pTemp = pView->NextSibling( pStartEntry );
+        pTemp = SvTreeListBox::NextSibling( pStartEntry );
         if( !pTemp )
             pTemp = pView->PrevVisible(pStartEntry);
         pStartEntry = pTemp;
@@ -1787,9 +1787,9 @@ void SvImpLBox::MovingEntry( SvTreeListEntry* pEntry )
         }
         else
         {
-            pNew = pTree->NextSibling( pEntry );
+            pNew = SvTreeList::NextSibling( pEntry );
             if( !pNew )
-                pNew = pTree->PrevSibling( pEntry );
+                pNew = SvTreeList::PrevSibling( pEntry );
         }
         pStartEntry = pNew;
     }
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 00e65e34cc56..b63059251b62 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -111,7 +111,7 @@ void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, SvItemState
     eState = ConvertToButtonState( nItemFlags );
 }
 
-SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) const
+SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags )
 {
     nItemFlags &= (SvItemStateFlags::UNCHECKED |
                    SvItemStateFlags::CHECKED |
@@ -342,7 +342,7 @@ void SvLBoxButton::Paint(
     const SvTreeListEntry* /*pEntry*/)
 {
     SvBmp nIndex = eKind == SvLBoxButtonKind_staticImage
-        ? SvBmp::STATICIMAGE : pData->GetIndex( nItemFlags );
+        ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex( nItemFlags );
     sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox &&
         rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
 
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 94e237df5545..b078a9c559a2 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -250,7 +250,7 @@ OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry ) const
     return GetEntryText( pEntry, 0xffff );
 }
 
-OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
+OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol )
 {
     DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
     OUString aResult;
@@ -547,7 +547,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
 
 
 
-bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
+bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol )
 {
     SvButtonState eState = SV_BUTTON_UNCHECKED;
     SvLBoxButton* pItem = static_cast<SvLBoxButton*>( pEntry->GetItem( nCol + 1 ) );
@@ -555,7 +555,7 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol
     if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
-        eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
+        eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
     return ( eState == SV_BUTTON_CHECKED );
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index d684e4b3fd7b..dcc622edaadb 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -359,7 +359,7 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const
     return pEntry;
 }
 
-SvTreeListEntry* SvTreeList::CreateEntry() const
+SvTreeListEntry* SvTreeList::CreateEntry()
 {
     return new SvTreeListEntry;
 }
@@ -807,7 +807,7 @@ SvTreeListEntry* SvTreeList::FirstChild( SvTreeListEntry* pParent ) const
     return pResult;
 }
 
-SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry )
 {
     DBG_ASSERT(pEntry,"Entry?");
     if( !pEntry )
@@ -819,7 +819,7 @@ SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const
     return nPos < rList.size() ? &rList[nPos] : NULL;
 }
 
-SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry )
 {
     DBG_ASSERT(pEntry,"Entry?");
     if( !pEntry )
@@ -835,7 +835,7 @@ SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const
 }
 
 
-SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry )
 {
     DBG_ASSERT(pEntry,"LastSibling:Entry?");
     if( !pEntry )
@@ -915,7 +915,7 @@ sal_uLong SvTreeList::GetAbsPos( const SvTreeListEntry* pEntry) const
     return pEntry->nAbsPos;
 }
 
-sal_uLong SvTreeList::GetRelPos( const SvTreeListEntry* pChild ) const
+sal_uLong SvTreeList::GetRelPos( const SvTreeListEntry* pChild )
 {
     return pChild->GetChildListPos();
 }
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 1e31187cfd1b..447b9f87d72c 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -347,7 +347,7 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
     return pViewData->maSize;
 }
 
-const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
+const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos)
 {
     const SvViewDataItem* pIData = pData->GetItem(nItemPos);
     return pIData->maSize;
@@ -607,7 +607,7 @@ TriState SvTreeListBox::NotifyMoving(
     {
         // case 1
         rpNewParent = GetParent( pTarget );
-        rNewChildPos = pModel->GetRelPos( pTarget ) + 1;
+        rNewChildPos = SvTreeList::GetRelPos( pTarget ) + 1;
         rNewChildPos += nCurEntrySelPos;
         nCurEntrySelPos++;
     }
@@ -638,14 +638,14 @@ SvTreeListEntry* SvTreeListBox::FirstChild( SvTreeListEntry* pParent ) const
     return pModel->FirstChild(pParent);
 }
 
-SvTreeListEntry* SvTreeListBox::NextSibling( SvTreeListEntry* pEntry ) const
+SvTreeListEntry* SvTreeListBox::NextSibling( SvTreeListEntry* pEntry )
 {
-    return pModel->NextSibling(pEntry);
+    return SvTreeList::NextSibling(pEntry);
 }
 
-SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry ) const
+SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry )
 {
-    return pModel->PrevSibling(pEntry);
+    return SvTreeList::PrevSibling(pEntry);
 }
 
 // return: all entries copied
@@ -786,7 +786,7 @@ void SvTreeListBox::RemoveSelection()
         pModel->Remove(*it);
 }
 
-SvTreeListBox* SvTreeListBox::GetSourceView() const
+SvTreeListBox* SvTreeListBox::GetSourceView()
 {
     return pDDSource;
 }
@@ -1782,7 +1782,7 @@ OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
     return pItem->GetText();
 }
 
-const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) const
+const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry)
 {
     DBG_ASSERT(pEntry,"Entry?");
     const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
@@ -1790,7 +1790,7 @@ const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) c
     return pItem->GetBitmap2( );
 }
 
-const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry ) const
+const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry )
 {
     DBG_ASSERT(pEntry,"Entry?");
     const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
@@ -2005,7 +2005,7 @@ SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) cons
         if(!pItem)
             return SV_BUTTON_TRISTATE;
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
-        eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
+        eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
     return eState;
 }
@@ -2305,8 +2305,7 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
     SvViewDataEntry* pViewData = GetViewDataEntry( pEntry );
     while( nCur < nCount )
     {
-        SvLBoxItem* pItem = pEntry->GetItem( nCur );
-        short nHeight = (short)(pItem->GetSize( pViewData, nCur ).Height());
+        short nHeight = (short)(SvLBoxItem::GetSize( pViewData, nCur ).Height());
         if( nHeight > nHeightMax )
             nHeightMax = nHeight;
         nCur++;
@@ -2932,7 +2931,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT
         SvLBoxItem* pItem = nCurItem < nItemCount ? pEntry->GetItem(nCurItem) : 0;
 
         sal_uInt16 nFlags = pTab->nFlags;
-        Size aSize( pItem->GetSize( pViewDataEntry, nCurItem ));
+        Size aSize( SvLBoxItem::GetSize( pViewDataEntry, nCurItem ));
         long nTabPos = GetTabPos( pEntry, pTab );
 
         long nNextTabPos;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 60874a7a7739..f0767ff83d87 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1380,7 +1380,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
         vcl::FontInfo    aInfo;
         while ( hFontInfo )
         {
-            aInfo = pList->GetFontInfo( hFontInfo );
+            aInfo = FontList::GetFontInfo( hFontInfo );
 
             FontWeight  eWeight = aInfo.GetWeight();
             FontItalic  eItalic = aInfo.GetItalic();
@@ -1445,7 +1445,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
             else if ( !bBoldItalic && (aStyleText == pList->GetBoldItalicStr()) )
                 bBoldItalic = true;
 
-            hFontInfo = pList->GetNextFontInfo( hFontInfo );
+            hFontInfo = FontList::GetNextFontInfo( hFontInfo );
         }
 
         if ( bInsert )
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 5ba069f8b946..7babd84d5fbf 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -701,13 +701,13 @@ sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const
         return (sal_Handle)pData->mpFirst;
 }
 
-sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
+sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo )
 {
     ImplFontListFontInfo* pInfo = static_cast<ImplFontListFontInfo*>((void*)hFontInfo);
     return (sal_Handle)(pInfo->mpNext);
 }
 
-const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
+const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo )
 {
     ImplFontListFontInfo* pInfo = static_cast<ImplFontListFontInfo*>((void*)hFontInfo);
     return *pInfo;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 3e7f1357c564..f75c82c98d9a 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -113,7 +113,7 @@ class SvtMatchContext_Impl: public salhelper::Thread
     void                            doExecute();
     void                            Insert( const OUString& rCompletion, const OUString& rURL, bool bForce = false);
     void                            ReadFolder( const OUString& rURL, const OUString& rMatch, bool bSmart );
-    void                            FillPicklist(std::vector<OUString>& rPickList);
+    static void                     FillPicklist(std::vector<OUString>& rPickList);
 
 public:
                                     SvtMatchContext_Impl( SvtURLBox* pBoxP, const OUString& rText );
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 64126d7f3225..aa9fb5c0843d 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -75,11 +75,11 @@ namespace svt
         }
 
         /// returns the index of the current state in given path, or -1
-        sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath );
+        static sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath );
         /// returns the index of the current state in the path with the given id, or -1
         sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId );
         /// returns the index of the first state in which the two given paths differ
-        sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS );
+        static sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS );
     };
 
 
@@ -250,7 +250,7 @@ namespace svt
         Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath );
         if ( aActivePathPos != m_pImpl->aPaths.end() )
         {
-            if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex )
+            if ( RoadmapWizardImpl::getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex )
             {
                 OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
                 return;
@@ -271,7 +271,7 @@ namespace svt
             "RoadmapWizard::implUpdateRoadmap: there is no such path!" );
         const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] );
 
-        sal_Int32 nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), rActivePath );
+        sal_Int32 nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
         if (nCurrentStatePathIndex < 0)
             return;
 
@@ -289,7 +289,7 @@ namespace svt
                     // it's the path we are just activating -> no need to check anything
                     continue;
                 // the index from which on both paths differ
-                sal_Int32 nDivergenceIndex = m_pImpl->getFirstDifferentIndex( rActivePath, aPathPos->second );
+                sal_Int32 nDivergenceIndex = RoadmapWizardImpl::getFirstDifferentIndex( rActivePath, aPathPos->second );
                 if ( nDivergenceIndex <= nCurrentStatePathIndex )
                     // they differ in an index which we have already left behind us
                     // -> this is no conflict anymore
@@ -379,7 +379,7 @@ namespace svt
 
         Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath );
         if ( aActivePathPos != m_pImpl->aPaths.end() )
-            nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( _nCurrentState, aActivePathPos->second );
+            nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( _nCurrentState, aActivePathPos->second );
 
         DBG_ASSERT( nCurrentStatePathIndex != -1, "RoadmapWizard::determineNextState: ehm - how can we travel if there is no (valid) active path?" );
         if ( nCurrentStatePathIndex == -1 )
@@ -408,7 +408,7 @@ namespace svt
         {
             // check how many paths are still allowed
             const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] );
-            sal_Int32 nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), rActivePath );
+            sal_Int32 nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
 
             size_t nPossiblePaths(0);
             for (   Paths::const_iterator aPathPos = m_pImpl->aPaths.begin();
@@ -417,7 +417,7 @@ namespace svt
                 )
             {
                 // the index from which on both paths differ
-                sal_Int32 nDivergenceIndex = m_pImpl->getFirstDifferentIndex( rActivePath, aPathPos->second );
+                sal_Int32 nDivergenceIndex = RoadmapWizardImpl::getFirstDifferentIndex( rActivePath, aPathPos->second );
 
                 if ( nDivergenceIndex > nCurrentStatePathIndex )
                     // this path is still a possible path
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index d7cb0f71a595..3cc1cd6968b4 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -161,7 +161,7 @@ private:
 
                         void GetGraphicSource();
                         bool GetGraphicStream();
-                        Bitmap GetGraphicBitmap( SvStream& rStream );
+                        static Bitmap GetGraphicBitmap( SvStream& rStream );
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
                             GetFilterData( bool bUpdateConfig );
 
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 5a224189b3ab..1229ba122c4c 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -102,7 +102,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
 
 
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     if( rResourceURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) )
@@ -121,7 +121,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co
     return xRet;
 }
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     sal_Int32                               nIndex = 0;
@@ -144,7 +144,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS
 
 
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     sal_Int32                               nIndex = 0;
@@ -165,7 +165,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage(
 
 
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     sal_Int32                               nIndex = 0;
@@ -195,7 +195,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co
 
 
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm )
 {
     uno::Reference< ::graphic::XGraphic > xRet;
     uno::Sequence< sal_Int8 > aBmpSeq( xBtm->getDIB() );
@@ -229,7 +229,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
 
 
 
-uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const
+uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     sal_Int32                               nIndex = 0;
diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx
index 416abbf17d45..69ab382630cd 100644
--- a/svtools/source/inc/provider.hxx
+++ b/svtools/source/inc/provider.hxx
@@ -53,12 +53,12 @@ protected:
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ) const;
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL );
 };
 
 }
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 684c96457022..187956adf699 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -247,7 +247,7 @@ private:
     ItemListenerMultiplexer     maItemListeners;
 
     RMItemData CurRMItemData;
-    RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent );
+    static RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent );
 
 protected:
     ::svt::ORoadmap*                GetRoadmap() const;
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 5edf20315975..0ac0804d5675 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -39,7 +39,7 @@
 
 TYPEINIT0_AUTOFACTORY( ImageMap );
 
-void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const
+void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100)
 {
     const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
@@ -50,7 +50,7 @@ void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) c
     rBuf.append(") ");
 }
 
-void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const
+void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100)
 {
     const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 399a31562760..86fa6fb4a269 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -451,7 +451,7 @@ namespace svt
         /// read the current state of the dirs
         bool        readCurrentState();
 
-        OUString    implParseSmart( const OUString& _rPath );
+        static OUString    implParseSmart( const OUString& _rPath );
 
         bool        implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot );
 
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index d490e479e2bf..5fef6fdd4062 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -197,7 +197,7 @@ namespace svt { namespace table
         OUString getCellContentAsString( RowPos const i_row, ColPos const i_col );
 
         /** returns the position of the current row in the selection vector */
-        int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current);
+        static int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current);
 
         void invalidateRect(const Rectangle &rInvalidateRect);
 
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index cc32eb4851dd..c4a04f9ecc78 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1121,13 +1121,13 @@ void TreeControlPeer::updateChildNodes( UnoTreeListBoxImpl& rTree, const Referen
                 updateEntry( pCurrentChild );
             }
 
-            pCurrentChild = dynamic_cast< UnoTreeListEntry* >( rTree.NextSibling( pCurrentChild ) );
+            pCurrentChild = dynamic_cast< UnoTreeListEntry* >( SvTreeListBox::NextSibling( pCurrentChild ) );
         }
 
         // check if we have entries without nodes left, we need to remove them
         while( pCurrentChild )
         {
-            UnoTreeListEntry* pNextChild = dynamic_cast< UnoTreeListEntry* >( rTree.NextSibling( pCurrentChild ) );
+            UnoTreeListEntry* pNextChild = dynamic_cast< UnoTreeListEntry* >( SvTreeListBox::NextSibling( pCurrentChild ) );
             rTree.GetModel()->Remove( pCurrentChild );
             pCurrentChild = pNextChild;
         }
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 613d255732c4..870a34fcbc7c 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -134,7 +134,7 @@ private:
     void updateNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bRecursive );
     void updateChildNodes( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );
 
-    OUString getEntryString( const ::com::sun::star::uno::Any& rValue );
+    static OUString getEntryString( const ::com::sun::star::uno::Any& rValue );
 
     UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (::com::sun::star::uno::RuntimeException );
     void ChangeNodesSelection( const ::com::sun::star::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index a368c9c0046e..ba7be37d2020 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -527,7 +527,7 @@ public:
     virtual ~SvUnoImageMap();
 
     bool fillImageMap( ImageMap& rMap ) const;
-    SvUnoImageMapObject* getObject( const Any& aElement ) const throw( IllegalArgumentException );
+    static SvUnoImageMapObject* getObject( const Any& aElement ) throw( IllegalArgumentException );
 
     UNO3_GETIMPLEMENTATION_DECL( SvUnoImageMap )
 
@@ -587,7 +587,7 @@ SvUnoImageMap::~SvUnoImageMap()
     }
 }
 
-SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) const
+SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement )
     throw( IllegalArgumentException )
 {
     Reference< XInterface > xObject;