loplugin:staticmethods

Change-Id: Iea68c4e466dd8e1cb7164959a680e5e52542166b

4 files changed, 24 insertions, 28 deletions

diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 75a4752f9027..4e3f8d7b7456 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -578,7 +578,7 @@ struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
                                             maPointB    ( rPB ),
                                             mXConnectToB( rSB ) {}
 
-    sal_uInt32      GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
+    static sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
 };
 
 struct MSFILTER_DLLPUBLIC EscherExContainer
@@ -782,7 +782,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
     bool                    bHasComplexData;
 
 
-    sal_uInt32  ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
+    static sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
     void        ImplCreateGraphicAttributes(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
                     sal_uInt32 nBlibId,
@@ -1272,8 +1272,8 @@ public:
 
     virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect);
 
-    sal_uInt32  GetColor( const sal_uInt32 nColor, bool bSwap = true );
-    sal_uInt32  GetColor( const Color& rColor, bool bSwap = true );
+    static sal_uInt32  GetColor( const sal_uInt32 nColor, bool bSwap = true );
+    static sal_uInt32  GetColor( const Color& rColor, bool bSwap = true );
 
                 // ...Sdr... implemented in eschesdo.cxx
 
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 94db141ac20d..6c8d0625fbf4 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -88,7 +88,7 @@ public:
 
     explicit DffPropertyReader( const SvxMSDffManager& rManager );
     ~DffPropertyReader();
-    sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const;
+    static sal_Int32 Fix16ToAngle( sal_Int32 nAngle );
 
 #ifdef DBG_CUSTOMSHAPE
     void ReadPropSet( SvStream& rIn, void* pClientData, sal_uInt32 nShapeType = 0 ) const;
@@ -482,17 +482,17 @@ protected :
                 const Rectangle& rVisArea );
 
 // the following methods need to be overridden for Excel imports
-    bool ProcessClientAnchor( SvStream& rStData,
+    static bool ProcessClientAnchor( SvStream& rStData,
                                           sal_uInt32 nDatLen,
                                           char*& rpBuff,
-                                          sal_uInt32& rBuffLen ) const;
+                                          sal_uInt32& rBuffLen );
     virtual void ProcessClientAnchor2( SvStream& rStData,
                                        DffRecordHeader& rHd,
                                        void* pData, DffObjData& );
-    bool ProcessClientData( SvStream& rStData,
+    static bool ProcessClientData( SvStream& rStData,
                                         sal_uInt32 nDatLen,
                                         char*& rpBuff,
-                                        sal_uInt32& rBuffLen ) const;
+                                        sal_uInt32& rBuffLen );
     virtual SdrObject* ProcessObj( SvStream& rSt,
                                    DffObjData& rData,
                                    void* pData,
@@ -534,11 +534,11 @@ public:
     virtual bool SeekToShape( SvStream& rSt,
                                   void* pClientData,
                                   sal_uInt32 nId ) const;
-    bool SeekToRec( SvStream& rSt,
+    static bool SeekToRec( SvStream& rSt,
                     sal_uInt16 nRecId,
                     sal_uLong nMaxFilePos,
                     DffRecordHeader* pRecHd = NULL,
-                    sal_uLong nSkipCount = 0 ) const;
+                    sal_uLong nSkipCount = 0 );
     bool SeekToRec2( sal_uInt16 nRecId1,
                      sal_uInt16 nRecId2,
                      sal_uLong nMaxFilePos,
@@ -639,7 +639,7 @@ public:
 
         @return true if successful, false otherwise
     */
-    bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL ) const;
+    static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL );
 
     bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData);
 
@@ -721,7 +721,7 @@ public:
         @param rSolver contains necessary data that is collected during the
                        import of each shape
     */
-    void SolveSolver( const SvxMSDffSolverContainer& rSolver );
+    static void SolveSolver( const SvxMSDffSolverContainer& rSolver );
 
     static bool SetPropValue(
         const ::com::sun::star::uno::Any& rAny,
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 2705df3bc343..227f97ca6b8d 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -47,7 +47,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper
     css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
     css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
     SfxObjectShell& mrDocSh;
-    void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
+    static void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
 public:
     CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
 
@@ -56,7 +56,7 @@ public:
     css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() { return m_xAppCfgMgr;}
 
 
-    css::uno::Any createCommandFromMacro( const OUString& sCmd );
+    static css::uno::Any createCommandFromMacro( const OUString& sCmd );
 
     void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const OUString& sString );
     void applyIcons();
@@ -71,7 +71,7 @@ class MSFILTER_DLLPUBLIC TBBase
 friend class Indent;
     static int nIndent; // num spaces to indent before printing
 protected:
-    void indent_printf(FILE* fp, const char* format, ... );
+    static void indent_printf(FILE* fp, const char* format, ... );
     sal_uInt32 nOffSet; // usually for debug we can store the offset in the stream to this record
 public:
     TBBase() : nOffSet( 0 ) {}
@@ -95,7 +95,7 @@ public:
             TBBase::nIndent = TBBase::nIndent + 2;
     }
     ~Indent() { TBBase::nIndent = TBBase::nIndent - 2; }
-    void init() { TBBase::nIndent = 0; }
+    static void init() { TBBase::nIndent = 0; }
 };
 
 
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 8f319261188d..d820b17c6cad 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -187,9 +187,9 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom
 
 public:
 
-    Size    GetPageSize( const Size& rSiz ) const;
-    Size    GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); }
-    Size    GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); }
+    static Size GetPageSize( const Size& rSiz );
+    Size        GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); }
+    Size        GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); }
 
     friend SvStream& ReadPptDocumentAtom( SvStream& rIn, PptDocumentAtom& rAtom );
 };
@@ -496,7 +496,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
     OUString            pPlaceholder[ 4 ];
     sal_uInt32          nAtom;
 
-    sal_uInt32          GetMaskForInstance( sal_uInt32 nInstance );
+    static sal_uInt32   GetMaskForInstance( sal_uInt32 nInstance );
     sal_uInt32          IsToDisplay( sal_uInt32 nInstance );
     sal_uInt32          NeedToImportInstance(
                             const sal_uInt32 nInstance,
@@ -560,7 +560,7 @@ protected:
 
     bool                    SeekToAktPage(DffRecordHeader* pRecHd=NULL) const;
     bool                    SeekToDocument(DffRecordHeader* pRecHd=NULL) const;
-    bool                    SeekToContentOfProgTag(
+    static bool             SeekToContentOfProgTag(
                                 sal_Int32 nVersion,
                                 SvStream& rSt,
                                 const DffRecordHeader& rProgTagBinaryDataHd,
@@ -593,7 +593,7 @@ protected:
     sal_uInt32              GetAktPageId();
     sal_uInt32              GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
     sal_uInt32              GetNotesPageId(sal_uInt16 nPageNum ) const;
-    SdrOutliner*            GetDrawOutliner( SdrTextObj* pSdrText ) const;
+    static SdrOutliner*     GetDrawOutliner( SdrTextObj* pSdrText );
     void                    SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions );
 
     void                    ApplyTextAnchorAttributes( PPTTextObj& rTextObj, SfxItemSet& rSet ) const;
@@ -1014,7 +1014,6 @@ struct PPTTextRulerInterpreter
                     PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler );
                     PPTTextRulerInterpreter(
                         sal_uInt32 nFileOfs,
-                        SdrPowerPointImport&,
                         DffRecordHeader& rHd,
                         SvStream& rIn
                     );
@@ -1077,7 +1076,6 @@ struct PPTStyleTextPropReader
 
             PPTStyleTextPropReader(
                 SvStream& rIn,
-                SdrPowerPointImport&,
                 const DffRecordHeader& rClientTextBoxHd,
                 PPTTextRulerInterpreter& rInterpreter,
                 const DffRecordHeader& rExtParaHd,
@@ -1087,7 +1085,6 @@ struct PPTStyleTextPropReader
 
     void    Init(
                 SvStream& rIn,
-                SdrPowerPointImport&,
                 const DffRecordHeader& rClientTextBoxHd,
                 PPTTextRulerInterpreter& rInterpreter,
                 const DffRecordHeader& rExtParaHd,
@@ -1095,14 +1092,13 @@ struct PPTStyleTextPropReader
             );
     void    ReadParaProps(
                 SvStream& rIn,
-                SdrPowerPointImport& rMan,
                 const DffRecordHeader& rTextHeader,
                 const OUString& aString,
                 PPTTextRulerInterpreter& rRuler,
                 sal_uInt32& nCharCount,
                 bool& bTextPropAtom
             );
-    void    ReadCharProps(
+    static void ReadCharProps(
                 SvStream& rIn,
                 PPTCharPropSet& aCharPropSet,
                 const OUString& aString,