loplugin:staticmethods

Change-Id: I64fdb27a7f83f6417a9cd67ed5d2c44072ec7f2e

writerfilter/source/dmapper/DomainMapper.hxx

@@ -162,13 +162,13 @@ private:
     // Table
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
 
-    void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap>& rContext);
+    static void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap>& rContext);
     void handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr<PropertyMap>& rContext, const bool bExchangeLeftRight);
-    bool getColorFromId(const Id, sal_Int32 &nColor);
-    sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
-    OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
-    css::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue);
-    sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
+    static bool getColorFromId(const Id, sal_Int32 &nColor);
+    static sal_Int16 getEmphasisValue(const sal_Int32 nIntValue);
+    static OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
+    static css::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue);
+    static sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
     bool mbIsSplitPara;
     boost::scoped_ptr< GraphicZOrderHelper > zOrderHelper;
 };

writerfilter/source/dmapper/DomainMapper_Impl.hxx

@@ -475,7 +475,7 @@ public:
     }
     void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue );
 
-    void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, RedlineParamsPtr pRedline);
+    static void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, RedlineParamsPtr pRedline);
 
     void CheckParaMarkerRedline(css::uno::Reference<css::text::XTextRange> const& xRange);
 
@@ -629,7 +629,7 @@ public:
         PropertyNameSupplier& rPropNameSupplier,
         css::uno::Reference< css::uno::XInterface > & xFieldInterface,
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
-    void handleAuthor
+    static void handleAuthor
         (OUString const& rFirstParam,
         PropertyNameSupplier& rPropNameSupplier,
         css::uno::Reference< css::uno::XInterface > & xFieldInterface,

writerfilter/source/dmapper/PropertyMap.hxx

@@ -241,13 +241,13 @@ class SectionPropertyMap : public PropertyMap
     css::uno::Reference<css::text::XTextColumns> ApplyColumnProperties(css::uno::Reference<css::beans::XPropertySet> const& xFollowPageStyle,
                                                                        DomainMapper_Impl& rDM_Impl);
     void CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl );
-    void CopyHeaderFooter(css::uno::Reference<css::beans::XPropertySet> xPrevStyle,
+    static void CopyHeaderFooter(css::uno::Reference<css::beans::XPropertySet> xPrevStyle,
                           css::uno::Reference<css::beans::XPropertySet> xStyle);
     void PrepareHeaderFooterProperties( bool bFirstPage );
     bool HasHeader( bool bFirstPage ) const;
     bool HasFooter( bool bFirstPage ) const;
 
-    void SetBorderDistance(css::uno::Reference<css::beans::XPropertySet> const& xStyle,
+    static void SetBorderDistance(css::uno::Reference<css::beans::XPropertySet> const& xStyle,
                            PropertyIds eMarginId,
                            PropertyIds eDistId,
                            sal_Int32 nDistance,

writerfilter/source/dmapper/ThemeTable.hxx

@@ -53,8 +53,8 @@ public:
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
 
     // Helper methods
-    OUString fromLocaleToScriptTag(const OUString& sLocale);
-    OUString fromLCIDToScriptTag(LanguageType lang);
+    static OUString fromLocaleToScriptTag(const OUString& sLocale);
+    static OUString fromLCIDToScriptTag(LanguageType lang);
 };
 typedef std::shared_ptr< ThemeTable >          ThemeTablePtr;
 }}

writerfilter/source/ooxml/OOXMLDocumentImpl.hxx

@@ -69,9 +69,9 @@ protected:
     void resolveFastSubStream(Stream & rStream,
                                       OOXMLStream::StreamType_t nType);
 
-    void resolveFastSubStreamWithId(Stream & rStream,
-                                      writerfilter::Reference<Stream>::Pointer_t pStream,
-                      sal_uInt32 nId);
+    static void resolveFastSubStreamWithId(Stream & rStream,
+                                           writerfilter::Reference<Stream>::Pointer_t pStream,
+                                           sal_uInt32 nId);
 
     css::uno::Reference<css::xml::dom::XDocument> importSubStream(OOXMLStream::StreamType_t nType);
 

writerfilter/source/ooxml/OOXMLFastContextHandler.hxx

@@ -171,7 +171,7 @@ public:
     void endOfParagraph();
     void text(const OUString & sText);
     void positionOffset(const OUString & sText);
-    void ignore();
+    static void ignore();
     void alignH(const OUString & sText);
     void alignV(const OUString & sText);
     void positivePercentage(const OUString& rText);
@@ -404,7 +404,7 @@ public:
 
     virtual std::string getType() const SAL_OVERRIDE { return "TextTableCell"; }
 
-    void startCell();
+    static void startCell();
     void endCell();
 };
 
@@ -416,11 +416,11 @@ public:
 
     virtual std::string getType() const SAL_OVERRIDE { return "TextTableRow"; }
 
-    void startRow();
+    static void startRow();
     void endRow();
     void handleGridBefore( OOXMLValue::Pointer_t val );
 private:
-    OOXMLProperty::Pointer_t fakeNoBorder( Id id );
+    static OOXMLProperty::Pointer_t fakeNoBorder( Id id );
 };
 
 class OOXMLFastContextHandlerTextTable : public OOXMLFastContextHandler

writerfilter/source/rtftok/rtfdocumentimpl.cxx

@@ -741,7 +741,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
             if (ch != 0x0d && ch != 0x0a && ch != 0x20)
             {
                 b = b << 4;
-                sal_Int8 parsed = m_pTokenizer->asHex(ch);
+                sal_Int8 parsed = RTFTokenizer::asHex(ch);
                 if (parsed == -1)
                     return RTFError::HEX_INVALID;
                 b += parsed;
@@ -3367,7 +3367,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         case RTF_DPTXBX:
         {
             m_aStates.top().aDrawingObject.xShape.set(getModelFactory()->createInstance("com.sun.star.text.TextFrame"), uno::UNO_QUERY);
-            std::vector<beans::PropertyValue> aDefaults = m_pSdrImport->getTextFrameDefaults(false);
+            std::vector<beans::PropertyValue> aDefaults = RTFSdrImport::getTextFrameDefaults(false);
             for (size_t i = 0; i < aDefaults.size(); ++i)
             {
                 if (!lcl_findPropertyName(m_aStates.top().aDrawingObject.aPendingProperties, aDefaults[i].Name))
@@ -5235,7 +5235,7 @@ RTFError RTFDocumentImpl::popState()
             if (ch != 0x0d && ch != 0x0a)
             {
                 b = b << 4;
-                sal_Int8 parsed = m_pTokenizer->asHex(ch);
+                sal_Int8 parsed = RTFTokenizer::asHex(ch);
                 if (parsed == -1)
                     return RTFError::HEX_INVALID;
                 b += parsed;
@@ -5487,7 +5487,7 @@ RTFError RTFDocumentImpl::popState()
                 // If there is no fill, the Word default is 100% transparency.
                 xPropertySet->setPropertyValue("FillTransparence", uno::makeAny(sal_Int32(100)));
 
-            m_pSdrImport->resolveFLine(xPropertySet, rDrawing.nFLine);
+            RTFSdrImport::resolveFLine(xPropertySet, rDrawing.nFLine);
 
             if (!m_aStates.top().aDrawingObject.bHadShapeText)
             {
@@ -6033,7 +6033,7 @@ RTFError RTFDocumentImpl::handleEmbeddedObject()
         if (ch != 0x0d && ch != 0x0a)
         {
             b = b << 4;
-            sal_Int8 parsed = m_pTokenizer->asHex(ch);
+            sal_Int8 parsed = RTFTokenizer::asHex(ch);
             if (parsed == -1)
                 return RTFError::HEX_INVALID;
             b += parsed;

writerfilter/source/rtftok/rtfsdrimport.hxx

@@ -35,13 +35,13 @@ public:
     /// Append property on the current parent.
     void appendGroupProperty(const OUString& aKey, const OUString& aValue);
     void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle);
-    void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
+    static void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
     /**
      * These are the default in Word, but not in Writer.
      *
      * @param bNew if the frame is new-style or old-style.
      */
-    std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew);
+    static std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew);
     /// Push a new group shape to the parent stack.
     void pushParent(css::uno::Reference<css::drawing::XShapes> const& xParent);
     /// Pop the current group shape from the parent stack.

writerfilter/source/rtftok/rtftokenizer.hxx

@@ -31,7 +31,7 @@ public:
     virtual ~RTFTokenizer();
 
     RTFError resolveParse();
-    int asHex(char ch);
+    static int asHex(char ch);
     /// Number of states on the stack.
     int getGroup() const
     {