sw/qa/extras/rtfexport/rtfexport.cxx | 70 ++++++++++++++++++++++++++++++-----
sw/qa/extras/rtfimport/rtfimport.cxx | 56 ++++++++++++++++++++++++----
sw/source/filter/rtf/swparrtf.cxx | 2 -
3 files changed, 109 insertions(+), 19 deletions(-)
New commits:
commit 40eca147d11a0563eab6450cb94f0b5704c88fcc
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Apr 3 09:20:07 2017 +0200
sw: indentation fixes
Change-Id: I81076414ee335f34bb687f93e89d65343d2f3c57
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 9dba6712a039..76a82593aafb 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -93,7 +93,14 @@ public:
}
};
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace awt
+{
std::ostream& operator<<(std::ostream& rStrm, GradientStyle n)
{
@@ -101,9 +108,19 @@ std::ostream& operator<<(std::ostream& rStrm,
GradientStyle n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
-namespace com { namespace sun { namespace star { namespace drawing {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace drawing
+{
std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
{
@@ -111,9 +128,19 @@ std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
-namespace com { namespace sun { namespace star { namespace style {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace style
+{
std::ostream& operator<<(std::ostream& rStrm, PageStyleLayout n)
{
@@ -121,9 +148,19 @@ std::ostream& operator<<(std::ostream& rStrm,
PageStyleLayout n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
-namespace com { namespace sun { namespace star { namespace text {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace text
+{
std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
{
@@ -131,9 +168,19 @@ std::ostream& operator<<(std::ostream& rStrm,
TextContentAnchorType n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
-namespace com { namespace sun { namespace star { namespace table {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace table
+{
std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
{
@@ -141,7 +188,10 @@ std::ostream& operator<<(std::ostream& rStrm,
ShadowLocation n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
DECLARE_RTFEXPORT_TEST(testZoom, "zoom.rtf")
{
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 191fc7a2664b..28c96fb690d3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -63,7 +63,14 @@
#include <bordertest.hxx>
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
{
@@ -71,8 +78,18 @@ std::ostream& operator<<(std::ostream& rStrm, PropertyState
n)
return rStrm;
}
-} } } }
-namespace com { namespace sun { namespace star { namespace style {
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace style
+{
std::ostream& operator<<(std::ostream& rStrm, BreakType n)
{
@@ -90,8 +107,18 @@ std::ostream& operator<<(std::ostream& rStrm,
ParagraphAdjust n)
return rStrm;
}
-} } } }
-namespace com { namespace sun { namespace star { namespace drawing {
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace drawing
+{
std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
{
@@ -99,8 +126,18 @@ std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
return rStrm;
}
-} } } }
-namespace com { namespace sun { namespace star { namespace text {
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace text
+{
std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
{
@@ -113,7 +150,10 @@ std::ostream& operator<<(std::ostream& rStrm, WrapTextMode
n)
return rStrm;
}
-} } } }
+}
+}
+}
+}
class Test : public SwModelTestBase
{
diff --git a/sw/source/filter/rtf/swparrtf.cxx
b/sw/source/filter/rtf/swparrtf.cxx
index cdcff0f3d0ab..d1186a7f9755 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -158,7 +158,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
return new SwRTFReader;
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream& rStream)
{
SwGlobals::ensure();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
