[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/filter/ww8/wrtww8.cxx   |    6 +++---
 sw/source/filter/ww8/wrtww8.hxx   |   12 ++++++------
 sw/source/filter/ww8/wrtww8gr.cxx |    2 +-
 sw/source/filter/ww8/ww8atr.cxx   |    6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 03aaa99e3e141bbe722fdead969ec9541dcc5d73
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jun 20 20:42:21 2015 +0200

    loplugin:staticmethods
    
    Change-Id: Ice0e5fa5ac0a2c46b70442bb7baeb7e43efbf599

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 8edd8cb..417f949 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2216,10 +2216,10 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
         {
             const SvxBoxItem & rBoxItem = pBoxFormat->GetBox();
 
-            m_rWW8Export.Out_SwFormatTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte
+            WW8Export::Out_SwFormatTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte
         }
         else
-            m_rWW8Export.Out_SwFormatTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte
+            WW8Export::Out_SwFormatTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte
 
         SAL_INFO( "sw.ww8.level2", "<tclength>" << ( m_rWW8Export.pO->size() - npOCount ) << "</tclength>" );
     }
@@ -2390,7 +2390,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
             aColor = COL_AUTO;
 
         WW8_SHD aShd;
-        m_rWW8Export.TransBrush( aColor, aShd );
+        WW8Export::TransBrush( aColor, aShd );
         m_rWW8Export.InsUInt16( aShd.GetValue() );
     }
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index d8330b3..3c3aa32 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1060,16 +1060,16 @@ public:
                                      const SwFormatPageDesc* pNewPgDescFormat = 0,
                                      const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
 
-    void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine,
+    static void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine,
         sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9,
         bool bShadow);
 
     void Out_SwFormatBox(const SvxBoxItem& rBox, bool bShadow);
-    void Out_SwFormatTableBox( ww::bytes& rO, const SvxBoxItem * rBox );
+    static void Out_SwFormatTableBox( ww::bytes& rO, const SvxBoxItem * rBox );
     void Out_CellRangeBorders(const SvxBoxItem * pBox, sal_uInt8 nStart,
         sal_uInt8 nLimit);
-    bool TransBrush(const Color& rCol, WW8_SHD& rShd);
-    WW8_BRCVer9 TranslateBorderLine(const ::editeng::SvxBorderLine& pLine,
+    static bool TransBrush(const Color& rCol, WW8_SHD& rShd);
+    static WW8_BRCVer9 TranslateBorderLine(const ::editeng::SvxBorderLine& pLine,
         sal_uInt16 nDist, bool bShadow);
 
     // #i77805# - new return value indicates, if an inherited outline numbering is suppressed
@@ -1355,14 +1355,14 @@ private:
     typedef std::vector<GraphicDetails>::iterator myiter;
     sal_uInt16 mnIdx;       // Index in File-Positionen
 
-    void WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
+    static void WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
             sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight,
             const SwAttrSet* pAttrSet = 0);
     void WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem);
     void WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rNd,
         const sw::Frame &rFly, sal_uInt16 nWidth, sal_uInt16 nHeight);
 
-    void WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight);
+    static void WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight);
     void WriteGrfForBullet(SvStream& rStrm,  const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight);
 
     SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3b2bbea..a99881e 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -550,7 +550,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
                 WW8_BRC aBrc;
                 if (pLn)
                 {
-                    WW8_BRCVer9 aBrc90 = rWrt.TranslateBorderLine( *pLn,
+                    WW8_BRCVer9 aBrc90 = WW8Export::TranslateBorderLine( *pLn,
                         pBox->GetDistance( i ), bShadow );
                     sal_uInt8 ico = msfilter::util::TransColToIco(msfilter::util::BGRToRGB(
                         aBrc90.cv()));
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b1c6529..7b1639f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1180,7 +1180,7 @@ void WW8AttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
 
 void WW8AttributeOutput::CharBorder( const SvxBorderLine* pAllBorder, const sal_uInt16 /*nDist*/, const bool bShadow )
 {
-    m_rWW8Export.Out_BorderLine( *m_rWW8Export.pO, pAllBorder, 0, NS_sprm::LN_CBrc80, NS_sprm::LN_CBrc, bShadow );
+    WW8Export::Out_BorderLine( *m_rWW8Export.pO, pAllBorder, 0, NS_sprm::LN_CBrc80, NS_sprm::LN_CBrc, bShadow );
 }
 
 void WW8AttributeOutput::CharHighlight( const SvxBrushItem& rBrush )
@@ -1511,7 +1511,7 @@ void WW8AttributeOutput::CharBackground( const SvxBrushItem& rBrush )
 {
     WW8_SHD aSHD;
 
-    m_rWW8Export.TransBrush( rBrush.GetColor(), aSHD );
+    WW8Export::TransBrush( rBrush.GetColor(), aSHD );
     // sprmCShd80
     m_rWW8Export.InsUInt16( NS_sprm::LN_CShd80 );
     m_rWW8Export.InsUInt16( aSHD.GetValue() );
@@ -3845,7 +3845,7 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
     {
         WW8_SHD aSHD;
 
-        m_rWW8Export.TransBrush( rBrush.GetColor(), aSHD );
+        WW8Export::TransBrush( rBrush.GetColor(), aSHD );
         // sprmPShd
         m_rWW8Export.InsUInt16( NS_sprm::LN_PShd );
         m_rWW8Export.InsUInt16( aSHD.GetValue() );