loplugin:staticmethods

Change-Id: I4d19f868a618cb135aa7a949222972dc35b47d2a

40 files changed, 88 insertions, 110 deletions

diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 528dc0f003f1..a0d60997a274 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -181,11 +181,14 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
         return true;
     }
     // template magic
-    if (fqn == "ColumnBatch::getValue") {
+    if (fqn == "ColumnBatch::getValue" || startsWith(fqn, "TitleImpl::")
+        || fqn == "ooo::vba::DefaultReturnHelper::getDefaultPropertyName") {
         return true;
     }
     // depends on config options
-    if (fqn == "psp::PrintFontManager::autoInstallFontLangSupport") {
+    if (fqn == "psp::PrintFontManager::autoInstallFontLangSupport"
+        || fqn == "GtkSalFrame::AllocateFrame"
+        || fqn == "GtkSalFrame::TriggerPaintEvent") {
         return true;
     }
 
@@ -203,7 +206,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
     return true;
 }
 
-loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true);
+loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
 
 }
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index e6ca100f7690..0d990cab1024 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -256,11 +256,6 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits
 {
     SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     GetModel()->SetSortMode( SortAscending );
-
-    // Timer for the BallonHelp
-    aTimer.SetTimeout( 200 );
-    aTimer.SetTimeoutHdl(
-        LINK( this, SfxConfigFunctionListBox, TimerHdl ) );
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
@@ -289,16 +284,6 @@ void SfxConfigFunctionListBox::MouseMove( const MouseEvent& )
 {
 }
 
-IMPL_LINK_TYPED( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer, void)
-/*  Description
-    Timer-handler for showing a help-text. If the mouse pointer is
-    still on the currently selected entry after the timer has run out,
-    the entry's help-text is shown as a balloon-help.
-*/
-{
-    (void)pTimer; // unused
-}
-
 void SfxConfigFunctionListBox::ClearAll()
 /*  Description
     Deletes all entries in the FunctionListBox, all UserData and all
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c6c3ad9d9ea8..c6ba6eaaae21 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -93,21 +93,15 @@ struct SfxGroupInfo_Impl
                     nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {}
 };
 
-struct CuiMacroInfo
-{
-};
-
 typedef boost::ptr_vector<SfxGroupInfo_Impl> SfxGroupInfoArr_Impl;
 
 class SfxConfigFunctionListBox : public SvTreeListBox
 {
     friend class SfxConfigGroupListBox;
-    Timer                aTimer;
-    SvTreeListEntry*         pCurEntry;
+    SvTreeListEntry*     pCurEntry;
     SfxGroupInfoArr_Impl aArr;
     SfxStylesInfo_Impl*  pStylesInfo;
 
-    DECL_LINK_TYPED( TimerHdl, Timer*, void );
     virtual void  MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
 public:
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 21ab2f0b0916..98829878c088 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -154,7 +154,7 @@ class Desktop : public Application
 
         static void             EnableOleAutomation();
                                 DECL_LINK( ImplInitFilterHdl, ConvertData* );
-        DECL_LINK_TYPED( AsyncInitFirstRun, Timer*, void );
+        DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void );
         /** checks if the office is run the first time
             <p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
             respective flag in the configuration is reset.</p>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5be7223be8ab..971483dab7eb 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1864,7 +1864,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
 }
 
 
-IMPL_LINK_NOARG_TYPED(Desktop, AsyncInitFirstRun, Timer *, void)
+IMPL_STATIC_LINK_NOINSTANCE_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
 {
     DoFirstRunInitializations();
 }
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 5a63bbf066a6..46abda73bcaf 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -305,7 +305,7 @@ IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
 
 
-IMPL_LINK_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool )
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool )
 {
     return true;
 }
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 1ccd853bb5c2..cd835435bc54 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -46,7 +46,7 @@ private:
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
 
     DECL_LINK( ActivatePageHdl, TabControl * );
-    DECL_STATIC_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
+    DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool );
     DECL_LINK(OkHdl, void *);
 
     ResMgr& mrResMgr;
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index 6f7179311dd1..2c8d9c1b4416 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -33,7 +33,7 @@ class GlueEscDirLB : public ListBox
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 public:
-                GlueEscDirLB( vcl::Window* pParent,
+                 GlueEscDirLB( vcl::Window* pParent,
                               const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
                  virtual ~GlueEscDirLB();
 
@@ -48,7 +48,7 @@ public:
 class SdTbxCtlGlueEscDir: public SfxToolBoxControl
 {
 private:
-    sal_uInt16  GetEscDirPos( SdrEscapeDirection nEscDir );
+    static sal_uInt16  GetEscDirPos( SdrEscapeDirection nEscDir );
 
 public:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 876dfcf738f9..94eb6800ebfd 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -137,10 +137,10 @@ Any CacheConfiguration::GetValue (const OUString& rName)
     return aResult;
 }
 
-IMPL_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
 {
     CacheConfigSharedPtr &rInstancePtr = theInstance::get();
-    // Release out reference to the instance.
+    // Release our reference to the instance.
     rInstancePtr.reset();
 }
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 2ae271145510..2f55a20cae49 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -57,7 +57,7 @@ private:
 
     CacheConfiguration();
 
-    DECL_LINK_TYPED(TimerCallback, Timer *, void);
+    DECL_STATIC_LINK_TYPED(CacheConfiguration, TimerCallback, Timer *, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::cache
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 29c37c050d34..0d3c391ad88b 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -262,7 +262,7 @@ struct EventMultiplexerImpl
                           double                            nPriority,
                           RegisterFunction                  pRegisterListener );
 
-    bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer,
+    static bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer,
                                      AnimationNodeSharedPtr const& rNode );
 
     bool notifyMouseHandlers(
@@ -1110,14 +1110,14 @@ bool EventMultiplexer::notifySlideEndEvent()
 bool EventMultiplexer::notifyAnimationStart(
     const AnimationNodeSharedPtr& rNode )
 {
-    return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers,
+    return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers,
                                                rNode );
 }
 
 bool EventMultiplexer::notifyAnimationEnd(
     const AnimationNodeSharedPtr& rNode )
 {
-    return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers,
+    return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers,
                                                rNode );
 }
 
@@ -1130,7 +1130,7 @@ bool EventMultiplexer::notifySlideAnimationsEnd()
 bool EventMultiplexer::notifyAudioStopped(
     const AnimationNodeSharedPtr& rNode )
 {
-    return mpImpl->notifyAllAnimationHandlers(
+    return EventMultiplexerImpl::notifyAllAnimationHandlers(
         mpImpl->maAudioStoppedHandlers,
         rNode );
 }
@@ -1138,7 +1138,7 @@ bool EventMultiplexer::notifyAudioStopped(
 bool EventMultiplexer::notifyCommandStopAudio(
     const AnimationNodeSharedPtr& rNode )
 {
-    return mpImpl->notifyAllAnimationHandlers(
+    return EventMultiplexerImpl::notifyAllAnimationHandlers(
         mpImpl->maCommandStopAudioHandlers,
         rNode );
 }
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index ee0272750f0f..cc0828a13f40 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -672,7 +672,7 @@ namespace slideshow
 
         sal_Int32 DrawShapeSubsetting::implGetNumberOfTreeNodes( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin,
                                                                  const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd,
-                                                                 DocTreeNode::NodeType                                                eNodeType ) const
+                                                                 DocTreeNode::NodeType                                                eNodeType )
         {
             const IndexClassificator eRequestedClass(
                 mapDocTreeNode( eNodeType ) );
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
index cb1cc556b1c9..12b1f97e988c 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
@@ -204,9 +204,9 @@ namespace slideshow
             void initCurrentSubsets();
             void reset();
 
-            sal_Int32   implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator&   rBegin,
+            static sal_Int32   implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator&   rBegin,
                                                   const IndexClassificatorVector::const_iterator&   rEnd,
-                                                  DocTreeNode::NodeType                             eNodeType ) const;
+                                                  DocTreeNode::NodeType                             eNodeType );
             DocTreeNode implGetTreeNode( const IndexClassificatorVector::const_iterator&    rBegin,
                                          const IndexClassificatorVector::const_iterator&    rEnd,
                                          sal_Int32                                          nNodeIndex,
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index bb87b65534e6..2653c9753270 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -63,7 +63,7 @@ namespace slideshow
         bool ViewShape::prefetch( RendererCacheEntry&                   io_rCacheEntry,
                                   const ::cppcanvas::CanvasSharedPtr&   rDestinationCanvas,
                                   const GDIMetaFileSharedPtr&           rMtf,
-                                  const ShapeAttributeLayerSharedPtr&   rAttr ) const
+                                  const ShapeAttributeLayerSharedPtr&   rAttr )
         {
             ENSURE_OR_RETURN_FALSE( rMtf,
                                "ViewShape::prefetch(): no valid metafile!" );
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index 199fcfd63737..fcddf74c9884 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -236,10 +236,10 @@ namespace slideshow
 
             /** Prefetch Renderer for given canvas
              */
-            bool prefetch( RendererCacheEntry&                  io_rCacheEntry,
+            static bool prefetch( RendererCacheEntry&                  io_rCacheEntry,
                            const ::cppcanvas::CanvasSharedPtr&  rDestinationCanvas,
                            const GDIMetaFileSharedPtr&          rMtf,
-                           const ShapeAttributeLayerSharedPtr&  rAttr ) const;
+                           const ShapeAttributeLayerSharedPtr&  rAttr );
 
             /** Draw with prefetched Renderer to stored canvas
 
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 78725937ed90..7887ae2ad2eb 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -123,7 +123,7 @@ protected:
 
     ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const;
 
-    void renderBitmap( SlideBitmapSharedPtr const&                 pSlideBitmap,
+    static void renderBitmap( SlideBitmapSharedPtr const&                 pSlideBitmap,
                        boost::shared_ptr<cppcanvas::Canvas> const& pCanvas );
 
     /** Called on derived classes to perform actions before first run.
@@ -182,7 +182,7 @@ private:
         double                     nPrio ) const;
 
     void addSprites( ViewEntry& rEntry );
-    void clearViewEntry( ViewEntry& rEntry );
+    static void clearViewEntry( ViewEntry& rEntry );
 
     ViewsVecT::iterator lookupView( UnoViewSharedPtr const & pView );
     ViewsVecT::const_iterator lookupView( UnoViewSharedPtr const & pView ) const;
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index b226f871673e..e87a6a52f44e 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -33,8 +33,8 @@ struct EmptyBase
     struct EmptyClearableGuard
     {
         explicit EmptyClearableGuard(EmptyBase) {}
-        void clear() {}
-        void reset() {}
+        static void clear() {}
+        static void reset() {}
     };
 
     typedef EmptyGuard           Guard;
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 441a733bb21f..188c09843249 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -460,7 +460,7 @@ private:
     SmNode* Product();
     SmNode* Factor();
     SmNode* Postfix();
-    SmNode* Error();
+    static SmNode* Error();
 };
 
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index e208cf6dce55..c67190b250b5 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -226,7 +226,7 @@ class SmDistanceDialog : public ModalDialog
     DECL_LINK(CheckBoxClickHdl, CheckBox *);
 
     using   Window::SetHelpId;
-    void    SetHelpId(MetricField &rField, const OString& sHelpId);
+    static void SetHelpId(MetricField &rField, const OString& sHelpId);
     void    SetCategory(sal_uInt16 Category);
 
 public:
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index faa52b878313..3a052c16841c 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -165,8 +165,8 @@ public:
                 SmDocShell( SfxModelFlags i_nSfxCreationFlags );
     virtual     ~SmDocShell();
 
-    void        LoadSymbols();
-    void        SaveSymbols();
+    static void LoadSymbols();
+    static void SaveSymbols();
 
     void        ArrangeFormula();
 
@@ -207,7 +207,7 @@ public:
 
     virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE;
 
-    SfxItemPool& GetPool() const;
+    static SfxItemPool& GetPool();
 
     void        Execute( SfxRequest& rReq );
     void        GetState(SfxItemSet &);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b3864744e333..35557fb491b1 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -122,7 +122,7 @@ public:
     void                MarkError(const Point &rPos);
     void                SelNextMark();
     void                SelPrevMark();
-    bool                HasMark(const OUString &rText) const;
+    static bool         HasMark(const OUString &rText);
 
     void                Flush();
     void                DeleteEditView( SmViewShell &rView );
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 27b539a08ae8..540de952c9bf 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -819,9 +819,9 @@ public:
 class SmRootNode : public SmStructureNode
 {
 protected:
-    void   GetHeightVerOffset(const SmRect &rRect,
-                              long &rHeight, long &rVerOffset) const;
-    Point  GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra) const;
+    static void  GetHeightVerOffset(const SmRect &rRect,
+                              long &rHeight, long &rVerOffset);
+    static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra);
 
 public:
     SmRootNode(const SmToken &rNodeToken)
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 4b1c61c4e72c..59020d815280 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -76,13 +76,13 @@ public:
 
     const ResStringArray& GetUiSymbolNamesArray() const     { return aUiSymbolNamesAry; }
     const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
-    const OUString        GetUiSymbolName( const OUString &rExportName ) const;
-    const OUString        GetExportSymbolName( const OUString &rUiName ) const;
+    static const OUString GetUiSymbolName( const OUString &rExportName );
+    static const OUString GetExportSymbolName( const OUString &rUiName );
 
     const ResStringArray& GetUiSymbolSetNamesArray() const     { return aUiSymbolSetNamesAry; }
     const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
-    const OUString        GetUiSymbolSetName( const OUString &rExportName ) const;
-    const OUString        GetExportSymbolSetName( const OUString &rUiName ) const;
+    static const OUString GetUiSymbolSetName( const OUString &rExportName );
+    static const OUString GetExportSymbolSetName( const OUString &rUiName );
 };
 
 class SmModule : public SfxModule, utl::ConfigurationListener
@@ -93,7 +93,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener
     std::unique_ptr<SvtSysLocale> mpSysLocale;
     VclPtr<VirtualDevice>    mpVirtualDev;
 
-    void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
+    static void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
 
 public:
     TYPEINFO_OVERRIDE();
@@ -116,7 +116,7 @@ public:
 
     SmLocalizedSymbolData &   GetLocSymbolData();
 
-    void GetState(SfxItemSet&);
+    static void GetState(SfxItemSet&);
 
     const SvtSysLocale& GetSysLocale();
 
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 51515406cec8..c05ea47f1f16 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -41,24 +41,24 @@
 
 inline const OUString GetExportSymbolName( const OUString &rUiSymbolName )
 {
-    return SM_MOD()->GetLocSymbolData().GetExportSymbolName( rUiSymbolName );
+    return SmLocalizedSymbolData::GetExportSymbolName( rUiSymbolName );
 }
 
 
 inline const OUString GetUiSymbolName( const OUString &rExportSymbolName )
 {
-    return SM_MOD()->GetLocSymbolData().GetUiSymbolName( rExportSymbolName );
+    return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName );
 }
 
 inline const OUString GetExportSymbolSetName( const OUString &rUiSymbolSetName )
 {
-    return SM_MOD()->GetLocSymbolData().GetExportSymbolSetName( rUiSymbolSetName );
+    return SmLocalizedSymbolData::GetExportSymbolSetName( rUiSymbolSetName );
 }
 
 
 inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName )
 {
-    return SM_MOD()->GetLocSymbolData().GetUiSymbolSetName( rExportSymbolSetName );
+    return SmLocalizedSymbolData::GetUiSymbolSetName( rExportSymbolSetName );
 }
 
 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ccd83f72274c..0870e6e686aa 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -128,8 +128,8 @@ protected:
     sal_uInt16 nMaxItems;
     std::deque<vcl::Font> aFontVec;
 
-    bool     CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const;
-    OUString GetStringItem(const vcl::Font &rItem);
+    static bool     CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont);
+    static OUString GetStringItem(const vcl::Font &rItem);
 
 public:
     SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ddb59154f51d..1256044ac3b1 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -249,15 +249,15 @@ class SmViewShell: public SfxViewShell
     bool bInsertIntoEditWindow;
 protected:
 
-    Size GetTextLineSize(OutputDevice& rDevice,
+    static Size GetTextLineSize(OutputDevice& rDevice,
                          const OUString& rLine);
-    Size GetTextSize(OutputDevice& rDevice,
+    static Size GetTextSize(OutputDevice& rDevice,
                      const OUString& rText,
                      long          MaxWidth);
-    void DrawTextLine(OutputDevice& rDevice,
+    static void DrawTextLine(OutputDevice& rDevice,
                       const Point&  rPosition,
                       const OUString& rLine);
-    void DrawText(OutputDevice& rDevice,
+    static void DrawText(OutputDevice& rDevice,
                   const Point&  rPosition,
                   const OUString& rText,
                   sal_uInt16        MaxWidth);
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index bf5bb2edcdaa..25b4d17e9dc0 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -378,7 +378,7 @@ private:
     /** Clone children of pSource and give them to pTarget */
     void CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget );
     /** Clone attributes on a pNode */
-    void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
+    static void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
 };
 
 
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 5de607ce30b3..06208654cebc 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -187,7 +187,7 @@ void Test::editUndoRedo()
         CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText);
     }
 
-    SfxRequest aUndo(SID_UNDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
+    SfxRequest aUndo(SID_UNDO, SfxCallMode::SYNCHRON, SmDocShell::GetPool());
 
     {
         m_xDocShRef->Execute(aUndo);
@@ -203,7 +203,7 @@ void Test::editUndoRedo()
         CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength());
     }
 
-    SfxRequest aRedo(SID_REDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
+    SfxRequest aRedo(SID_REDO, SfxCallMode::SYNCHRON, SmDocShell::GetPool());
     {
         m_xDocShRef->Execute(aRedo);
         m_xDocShRef->UpdateText();
@@ -263,7 +263,7 @@ void Test::viewZoom()
     }
 
     {
-        SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+        SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SvxZoomType::OPTIMAL, 0));
         SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
@@ -309,7 +309,7 @@ void Test::viewZoom()
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom);
 
-        SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+        SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 50));
         SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
@@ -318,7 +318,7 @@ void Test::viewZoom()
     }
 
     {
-        SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+        SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 5));
         SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
@@ -327,7 +327,7 @@ void Test::viewZoom()
     }
 
     {
-        SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+        SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 1000));
         SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 150e748cf782..0ff0caa9b55f 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1272,7 +1272,7 @@ void SmDocShell::Draw(OutputDevice *pDevice,
     DrawFormula(*pDevice, atmppoint);
 }
 
-SfxItemPool& SmDocShell::GetPool() const
+SfxItemPool& SmDocShell::GetPool()
 {
     return SfxGetpApp()->GetPool();
 }
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 2f0ad530ad37..1167cf6e5a60 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -909,7 +909,7 @@ void SmEditWindow::SelPrevMark()
     }
 }
 
-bool SmEditWindow::HasMark(const OUString& rText) const
+bool SmEditWindow::HasMark(const OUString& rText)
     // returns true iff 'rText' contains a mark
 {
     return rText.indexOf("<?>") != -1;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index c7f38b364890..9d63eaa17911 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -50,7 +50,7 @@ public:
     bool Export(SfxMedium &rMedium);
     void SetFlat(bool bIn) {bFlat = bIn;}
 
-    bool WriteThroughComponent(
+    static bool WriteThroughComponent(
         ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
             xOutputStream,
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
@@ -61,7 +61,7 @@ public:
             ::com::sun::star::beans::XPropertySet > & rPropSet,
         const sal_Char* pComponentName );
 
-    bool WriteThroughComponent(
+    static bool WriteThroughComponent(
         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
         const sal_Char* pStreamName,
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 9254273c56bb..0629ce5927ed 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -48,7 +48,7 @@ public:
 
     sal_uLong Import(SfxMedium &rMedium);
 
-    sal_uLong ReadThroughComponent(
+    static sal_uLong ReadThroughComponent(
         ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
@@ -57,7 +57,7 @@ public:
         const sal_Char* pFilterName,
         bool bEncrypted );
 
-    sal_uLong ReadThroughComponent(
+    static sal_uLong ReadThroughComponent(
          const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
         const sal_Char* pStreamName,
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index e4bb10d06677..a5698320e5cb 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -141,12 +141,12 @@ private:
         sal_uInt8 nTag,sal_uInt8 nSelector,sal_uInt8 nVariation,
         bool bSilent);
     void HandleNudge();
-    int xfLMOVE(sal_uInt8 nTest) const {return nTest&0x80;}
-    int xfAUTO(sal_uInt8 nTest) const {return nTest&0x10;}
-    int xfEMBELL(sal_uInt8 nTest) const {return nTest&0x20;}
-    int xfNULL(sal_uInt8 nTest) const {return nTest&0x10;}
-    int xfLSPACE(sal_uInt8 nTest) const {return nTest&0x40;}
-    int xfRULER(sal_uInt8 nTest) const {return nTest&0x20;}
+    static int xfLMOVE(sal_uInt8 nTest) {return nTest&0x80;}
+    static int xfAUTO(sal_uInt8 nTest) {return nTest&0x10;}
+    static int xfEMBELL(sal_uInt8 nTest) {return nTest&0x20;}
+    static int xfNULL(sal_uInt8 nTest) {return nTest&0x10;}
+    static int xfLSPACE(sal_uInt8 nTest) {return nTest&0x40;}
+    static int xfRULER(sal_uInt8 nTest) {return nTest&0x20;}
 
     void HandleNodes(SmNode *pNode,int nLevel=0);
     int StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation=0);
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 70bc753c0f9b..311df24840ca 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -935,7 +935,7 @@ void SmUnHorNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 
 
 void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
-                                    long &rHeight, long &rVerOffset) const
+                                    long &rHeight, long &rVerOffset)
     // calculate height and vertical offset of root sign suitable for 'rRect'
 {
     rVerOffset = (rRect.GetBottom() - rRect.GetAlignB()) / 2;
@@ -947,7 +947,7 @@ void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
 
 
 Point SmRootNode::GetExtraPos(const SmRect &rRootSymbol,
-                              const SmRect &rExtra) const
+                              const SmRect &rExtra)
 {
     const Size &rSymSize = rRootSymbol.GetSize();
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5881c378c6f0..f8bdc5f13cc2 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2324,14 +2324,12 @@ void SmParser::Special()
     {
         if (IsImportSymbolNames())
         {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetUiSymbolName(rName.copy(1));
+            aNewName = SmLocalizedSymbolData::GetUiSymbolName(rName.copy(1));
             bReplace = true;
         }
         else if (IsExportSymbolNames())
         {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetExportSymbolName(rName.copy(1));
+            aNewName = SmLocalizedSymbolData::GetExportSymbolName(rName.copy(1));
             bReplace = true;
         }
     }
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index ab09940a38ae..a3c9dd478c0d 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -72,7 +72,7 @@ SmLocalizedSymbolData::~SmLocalizedSymbolData()
 }
 
 
-const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName ) const
+const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
 {
     OUString aRes;
 
@@ -93,7 +93,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
 }
 
 
-const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName ) const
+const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
 {
     OUString aRes;
 
@@ -114,7 +114,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
 }
 
 
-const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName ) const
+const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
 {
     OUString aRes;
 
@@ -135,7 +135,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
 }
 
 
-const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName ) const
+const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
 {
     OUString aRes;
 
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index d07bf42b6816..899380b7bd8a 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -258,8 +258,7 @@ void SmSymbolManager::Load()
     }
 
     // now add a %i... symbol to the 'iGreek' set for every symbol found in the 'Greek' set.
-    SmLocalizedSymbolData   aLocalizedData;
-    const OUString aGreekSymbolSetName(aLocalizedData.GetUiSymbolSetName(OUString("Greek")));
+    const OUString aGreekSymbolSetName(SmLocalizedSymbolData::GetUiSymbolSetName(OUString("Greek")));
     const SymbolPtrVec_t    aGreekSymbols( GetSymbolSet( aGreekSymbolSetName ) );
     OUString aSymbolSetName('i');
     aSymbolSetName += aGreekSymbolSetName;
@@ -287,9 +286,8 @@ void SmSymbolManager::Save()
         SmMathConfig &rCfg = *SM_MOD()->GetConfig();
 
         // prepare to skip symbols from iGreek on saving
-        SmLocalizedSymbolData   aLocalizedData;
         OUString aSymbolSetName('i');
-        aSymbolSetName += aLocalizedData.GetUiSymbolSetName(OUString("Greek"));
+        aSymbolSetName += SmLocalizedSymbolData::GetUiSymbolSetName(OUString("Greek"));
 
         SymbolPtrVec_t aTmp( GetSymbols() );
         std::vector< SmSym > aSymbols;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 74edb409a8a5..dbebc9b92786 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -636,7 +636,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
                         SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS,
                         0
                     };
-                    SfxItemSet *pItemSet = new SfxItemSet( pDocSh->GetPool(), nRange );
+                    SfxItemSet *pItemSet = new SfxItemSet( SmDocShell::GetPool(), nRange );
                     SmModule *pp = SM_MOD();
                     pp->GetConfig()->ConfigToItemSet(*pItemSet);
                     VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, pItemSet );
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 47fad4ebb097..0e54d8e7f606 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -75,7 +75,7 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const
     return nPos < aFontVec.size() ? aFontVec[nPos] : vcl::Font();
 }
 
-bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const
+bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont)
 {
   return rFirstFont.GetName() == rSecondFont.GetName() &&
         rFirstFont.GetFamily()  == rSecondFont.GetFamily()  &&
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a9ae7e1fa116..cb391ebe2103 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1738,7 +1738,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                 const SfxItemSet *pSet = rReq.GetArgs();
                 if ( !pSet )
                 {
-                    SfxItemSet aSet( GetDoc()->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+                    SfxItemSet aSet( SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
                     aSet.Put( SvxZoomItem( SvxZoomType::PERCENT, aGraphic->GetZoom()));
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)