diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-29 17:20:52 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-29 17:20:52 +0200 |
commit | 313fe1f7076fd7e078d5e52be9060150d60ce774 (patch) | |
tree | 11e413ce31975cdad48af9ec07a19b19cf95bcfe /sw | |
parent | e473e0e1b9bc354d53908cb0ca84db06c3051fe2 (diff) |
loplugin:staticmethods
Change-Id: I2cd84261237eb1d60dfba5f85e444d5553e08798
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1146ea2103d1..630f82e444da 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4977,7 +4977,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P case ww8::Frame::eTextBox: { // If this is a TextBox of a shape, then ignore: it's handled in WriteTextBox(). - if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrameFormat())) + if (DocxSdrExport::isTextBox(rFrame.GetFrameFormat())) break; // The frame output is postponed to the end of the anchor paragraph diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index d32e361b04d3..e4f4a80eddad 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -106,7 +106,7 @@ public: /// Writes text frame in VML format. void writeVMLTextFrame(ww8::Frame* pParentFrame, bool bTextBoxOnly = false); /// Is this a standalone TextFrame, or used as a TextBox of a shape? - bool isTextBox(const SwFrameFormat& rFrameFormat); + static bool isTextBox(const SwFrameFormat& rFrameFormat); /// Writes text from Textbox for <w:framePr> void writeOnlyTextOfFrame(ww8::Frame* pParentFrame); /// Writes the drawingML <a:ln> markup of a box item. diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index f7cc478572a9..5f521588e624 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1852,7 +1852,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi case ww8::Frame::eTextBox: { // If this is a TextBox of a shape, then ignore: it's handled in RtfSdrExport::StartShape(). - if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrameFormat())) + if (RtfSdrExport::isTextBox(rFrame.GetFrameFormat())) break; OSL_ENSURE(m_aRunText.getLength() == 0, "m_aRunText is not empty"); diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index f62d09346b6c..32341407eb1c 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -66,7 +66,7 @@ public: void AddSdrObject(const SdrObject& rObj); /// Is this a standalone TextFrame, or used as a TextBox of a shape? - bool isTextBox(const SwFrameFormat& rFrameFormat); + static bool isTextBox(const SwFrameFormat& rFrameFormat); /// Write editeng text, e.g. shape or comment. void WriteOutliner(const OutlinerParaObject& rParaObj, TextTypes eType); |