Kaydet (Commit) 03aaa99e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:staticmethods

Change-Id: Ice0e5fa5ac0a2c46b70442bb7baeb7e43efbf599
üst 20e64b60
...@@ -2216,10 +2216,10 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t ...@@ -2216,10 +2216,10 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
{ {
const SvxBoxItem & rBoxItem = pBoxFormat->GetBox(); 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 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>" ); SAL_INFO( "sw.ww8.level2", "<tclength>" << ( m_rWW8Export.pO->size() - npOCount ) << "</tclength>" );
} }
...@@ -2390,7 +2390,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t ...@@ -2390,7 +2390,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
aColor = COL_AUTO; aColor = COL_AUTO;
WW8_SHD aShd; WW8_SHD aShd;
m_rWW8Export.TransBrush( aColor, aShd ); WW8Export::TransBrush( aColor, aShd );
m_rWW8Export.InsUInt16( aShd.GetValue() ); m_rWW8Export.InsUInt16( aShd.GetValue() );
} }
......
...@@ -1060,16 +1060,16 @@ public: ...@@ -1060,16 +1060,16 @@ public:
const SwFormatPageDesc* pNewPgDescFormat = 0, const SwFormatPageDesc* pNewPgDescFormat = 0,
const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; 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, sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9,
bool bShadow); bool bShadow);
void Out_SwFormatBox(const SvxBoxItem& rBox, 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, void Out_CellRangeBorders(const SvxBoxItem * pBox, sal_uInt8 nStart,
sal_uInt8 nLimit); sal_uInt8 nLimit);
bool TransBrush(const Color& rCol, WW8_SHD& rShd); static bool TransBrush(const Color& rCol, WW8_SHD& rShd);
WW8_BRCVer9 TranslateBorderLine(const ::editeng::SvxBorderLine& pLine, static WW8_BRCVer9 TranslateBorderLine(const ::editeng::SvxBorderLine& pLine,
sal_uInt16 nDist, bool bShadow); sal_uInt16 nDist, bool bShadow);
// #i77805# - new return value indicates, if an inherited outline numbering is suppressed // #i77805# - new return value indicates, if an inherited outline numbering is suppressed
...@@ -1355,14 +1355,14 @@ private: ...@@ -1355,14 +1355,14 @@ private:
typedef std::vector<GraphicDetails>::iterator myiter; typedef std::vector<GraphicDetails>::iterator myiter;
sal_uInt16 mnIdx; // Index in File-Positionen 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, sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight,
const SwAttrSet* pAttrSet = 0); const SwAttrSet* pAttrSet = 0);
void WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem); void WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem);
void WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rNd, void WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rNd,
const sw::Frame &rFly, sal_uInt16 nWidth, sal_uInt16 nHeight); 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); void WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight);
SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION; SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
......
...@@ -550,7 +550,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly, ...@@ -550,7 +550,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
WW8_BRC aBrc; WW8_BRC aBrc;
if (pLn) if (pLn)
{ {
WW8_BRCVer9 aBrc90 = rWrt.TranslateBorderLine( *pLn, WW8_BRCVer9 aBrc90 = WW8Export::TranslateBorderLine( *pLn,
pBox->GetDistance( i ), bShadow ); pBox->GetDistance( i ), bShadow );
sal_uInt8 ico = msfilter::util::TransColToIco(msfilter::util::BGRToRGB( sal_uInt8 ico = msfilter::util::TransColToIco(msfilter::util::BGRToRGB(
aBrc90.cv())); aBrc90.cv()));
......
...@@ -1180,7 +1180,7 @@ void WW8AttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden ) ...@@ -1180,7 +1180,7 @@ void WW8AttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
void WW8AttributeOutput::CharBorder( const SvxBorderLine* pAllBorder, const sal_uInt16 /*nDist*/, const bool bShadow ) 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 ) void WW8AttributeOutput::CharHighlight( const SvxBrushItem& rBrush )
...@@ -1511,7 +1511,7 @@ void WW8AttributeOutput::CharBackground( const SvxBrushItem& rBrush ) ...@@ -1511,7 +1511,7 @@ void WW8AttributeOutput::CharBackground( const SvxBrushItem& rBrush )
{ {
WW8_SHD aSHD; WW8_SHD aSHD;
m_rWW8Export.TransBrush( rBrush.GetColor(), aSHD ); WW8Export::TransBrush( rBrush.GetColor(), aSHD );
// sprmCShd80 // sprmCShd80
m_rWW8Export.InsUInt16( NS_sprm::LN_CShd80 ); m_rWW8Export.InsUInt16( NS_sprm::LN_CShd80 );
m_rWW8Export.InsUInt16( aSHD.GetValue() ); m_rWW8Export.InsUInt16( aSHD.GetValue() );
...@@ -3845,7 +3845,7 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) ...@@ -3845,7 +3845,7 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
{ {
WW8_SHD aSHD; WW8_SHD aSHD;
m_rWW8Export.TransBrush( rBrush.GetColor(), aSHD ); WW8Export::TransBrush( rBrush.GetColor(), aSHD );
// sprmPShd // sprmPShd
m_rWW8Export.InsUInt16( NS_sprm::LN_PShd ); m_rWW8Export.InsUInt16( NS_sprm::LN_PShd );
m_rWW8Export.InsUInt16( aSHD.GetValue() ); m_rWW8Export.InsUInt16( aSHD.GetValue() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment