include/svx/fntctrl.hxx | 1 -
svx/source/dialog/fntctrl.cxx | 2 +-
sw/qa/core/data/ww8/fail/redline-1.doc |binary
3 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit bb0fdccaac9495628e67d1ad1812e95b1c9397ba
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Sep 27 12:16:38 2017 +0200
ofz#3301 add bugdoc
Change-Id: I9a6425f5c0ed519ef7cb90e66b0d4c8e0fe700d4
diff --git a/sw/qa/core/data/ww8/fail/redline-1.doc
b/sw/qa/core/data/ww8/fail/redline-1.doc
new file mode 100644
index 000000000000..86c967314894
Binary files /dev/null and b/sw/qa/core/data/ww8/fail/redline-1.doc differ
commit 16687c57b5e378db93972fc1887b9b19747d068c
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 23 20:14:01 2017 +0100
svx: loplugin:staticmethods
Change-Id: I8786baa0a5142397c157e01d5b99aa2c482bb468
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 9b54d2ae0a3c..ed0828e8cc3b 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -63,7 +63,6 @@ public:
void ResetColor();
void SetBackColor( const Color& rColor );
void UseResourceText();
- bool CleanAndCheckEmpty(OUString& rText);
void Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& ) override;
bool IsTwoLines() const;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 039f69fe2d80..f41889f3b766 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -616,7 +616,7 @@ void SvxFontPrevWindow::UseResourceText()
* removes line feeds and carriage returns from string
* returns if param is empty
*/
-bool SvxFontPrevWindow::CleanAndCheckEmpty(OUString& rText)
+bool CleanAndCheckEmpty(OUString& rText)
{
bool bEmpty = true;
for (sal_Int32 i = 0; i < rText.getLength(); ++i)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
