[Libreoffice-commits] core.git: sw/qa
Stephan Bergmann
sbergman at redhat.com
Thu Apr 6 11:12:47 UTC 2017
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 10 ++++++++--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 ++++-
sw/qa/extras/rtfimport/rtfimport.cxx | 13 +++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 882dc72e675b28859eff8f9e5f4fcc6cdbc48128
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 6 13:12:12 2017 +0200
loplugin:unreffun (clang-cl)
Change-Id: Ifd5522ce1be31f9c9bd432ccf40a0c971063c8da
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 156f8f4fa696..166d4658fda0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -125,6 +125,8 @@ std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
} } } }
+#if !defined _WIN32
+
namespace com { namespace sun { namespace star { namespace awt {
std::ostream& operator<<(std::ostream& rStrm, FontSlant n)
@@ -165,13 +167,17 @@ std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
} } } }
+#endif
+
namespace com { namespace sun { namespace star { namespace text {
+#if !defined _WIN32
std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
{
rStrm << (int) n;
return rStrm;
}
+#endif
std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
{
rStrm << (int) n;
@@ -180,6 +186,8 @@ std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
} } } }
+#if !defined(_WIN32)
+
namespace com { namespace sun { namespace star { namespace style {
std::ostream& operator<<(std::ostream& rStrm, BreakType n)
@@ -190,8 +198,6 @@ std::ostream& operator<<(std::ostream& rStrm, BreakType n)
} } } }
-#if !defined(_WIN32)
-
DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
{
text::TextContentAnchorType eValue = getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType");
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c1155bdb69cb..f8c5ec9feecf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -88,14 +88,17 @@ std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
rStrm << (int) n;
return rStrm;
}
+#if !defined _WIN32
std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
{
rStrm << (int) n;
return rStrm;
}
+#endif
} } } }
+#if !defined _WIN32
namespace com { namespace sun { namespace star { namespace style {
@@ -107,7 +110,6 @@ std::ostream& operator<<(std::ostream& rStrm, BreakType n)
} } } }
-#if !defined _WIN32
class FailTest : public Test
{
public:
@@ -141,6 +143,7 @@ public:
finish();
}
};
+
#endif
DECLARE_OOXMLIMPORT_TEST(testImageHyperlink, "image-hyperlink.docx")
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 28c96fb690d3..f8529679c4a0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -63,6 +63,8 @@
#include <bordertest.hxx>
+#if !defined _WIN32
+
namespace com
{
namespace sun
@@ -82,6 +84,9 @@ std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
}
}
}
+
+#endif
+
namespace com
{
namespace sun
@@ -96,11 +101,13 @@ std::ostream& operator<<(std::ostream& rStrm, BreakType n)
rStrm << (int) n;
return rStrm;
}
+#if !defined _WIN32
std::ostream& operator<<(std::ostream& rStrm, TabAlign n)
{
rStrm << (int) n;
return rStrm;
}
+#endif
std::ostream& operator<<(std::ostream& rStrm, ParagraphAdjust n)
{
rStrm << (int) n;
@@ -111,6 +118,9 @@ std::ostream& operator<<(std::ostream& rStrm, ParagraphAdjust n)
}
}
}
+
+#if !defined _WIN32
+
namespace com
{
namespace sun
@@ -130,6 +140,9 @@ std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
}
}
}
+
+#endif
+
namespace com
{
namespace sun
More information about the Libreoffice-commits
mailing list