summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-04-13 05:21:11 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-04-14 01:10:25 +0200
commit6f12914ddfb4d69c0267b206be654c875da17426 (patch)
treeacc51420bbabe78092bc1a866848fbc8d07efd39 /sw
parentf15a69bd57e578ca607f14cb62f29a16986b96e6 (diff)
update cppunit to 1.14.0
Change-Id: I95fa42f4ef0580734b605df859c1660b29adb8b2 Reviewed-on: https://gerrit.libreoffice.org/36499 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/htmlimport/htmlimport.cxx15
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx10
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx40
-rw-r--r--sw/qa/extras/odfimport/odfimport.cxx24
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx30
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx65
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx31
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx10
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport6.cxx30
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport7.cxx10
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport8.cxx81
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx31
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx100
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx105
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx6
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx30
16 files changed, 0 insertions, 618 deletions
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index ff2a7af94dfe..b04f7c927b70 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -26,21 +26,6 @@ class HtmlImportTest : public SwModelTestBase
HtmlImportTest() : SwModelTestBase("sw/qa/extras/htmlimport/data/", "HTML (StarWriter)") {}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, BitmapMode n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
#define DECLARE_HTMLIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, nullptr, HtmlImportTest)
DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index cb8e4de67481..a8f55d9cafdf 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -42,16 +42,6 @@
typedef std::map<OUString, OUString> DBuriMap;
static DBuriMap aDBuriMap;
-namespace com { namespace sun { namespace star { namespace text {
-
-std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
class MMTest : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 0ed193c280d6..41b421b36116 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -97,46 +97,6 @@ public:
}
};
-namespace com { namespace sun { namespace star { namespace awt {
-
-std::ostream& operator<<(std::ostream& rStrm, FontSlant n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, GradientStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, TextVerticalAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace table {
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx")
{
uno::Reference<util::XModifiable> xModifiable(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 9015dd805e6d..9572e7f4dba4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -32,30 +32,6 @@
typedef std::map<OUString, css::uno::Sequence< css::table::BorderLine> > AllBordersMap;
typedef std::pair<OUString, css::uno::Sequence< css::table::BorderLine> > StringSequencePair;
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, BitmapMode n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, PageStyleLayout n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 480a091de014..7c488f719d0d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -80,36 +80,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, BreakType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace awt {
-
-std::ostream& operator<<(std::ostream& rStrm, FontSlant n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx")
{
if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 568ce9114ac9..a0bd7e490320 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -92,71 +92,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, ParagraphAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace text {
-
-std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, LineStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace awt {
-
-std::ostream& operator<<(std::ostream& rStrm, GradientStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace table {
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, TabAlign n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST(testPageGraphicBackground, "page-graphic-background.odt")
{
// No idea how the graphic background should be exported (seems there is no
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index fd9e652087de..85ef3c242685 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -76,37 +76,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, BreakType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-
-namespace com { namespace sun { namespace star { namespace table {
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
{
// The problem was that in 'MSWordExportBase::SectionProperties' function in 'wrt8sty.cxx'
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 2b369fa9c6c7..1d94e25938aa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -73,16 +73,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST(testRelorientation, "relorientation.docx")
{
uno::Reference<drawing::XShape> xShape = getShape(1);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index a1839fcfc9e4..80f28f09875a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -41,36 +41,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, LineJoint n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, LineStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, HatchStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, TextVerticalAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, "dml-shape-title.docx")
{
CPPUNIT_ASSERT_EQUAL(OUString("Title"), getProperty<OUString>(getShape(1), "Title"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 0f8480f3c6d5..b538e9f990da 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -41,16 +41,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, TextVerticalAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_OOXMLEXPORT_TEST( testChildNodesOfCubicBezierTo, "FDO74774.docx")
{
/* Number of children required by cubicBexTo is 3 of type "pt".
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index a84c8256267d..5b62695446fc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -115,89 +115,8 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace beans {
-
-std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-#if !defined _WIN32
-
-namespace com { namespace sun { namespace star { namespace awt {
-
-std::ostream& operator<<(std::ostream& rStrm, FontSlant n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, ParagraphAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, TextVerticalAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace table {
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-#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;
- return rStrm;
-}
-
-} } } }
-
#if !defined(_WIN32)
-namespace com { namespace sun { namespace star { namespace style {
-
-std::ostream& operator<<(std::ostream& rStrm, BreakType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
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 056eca1e3ebc..9b30cd8a7bd2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -81,35 +81,6 @@ public:
}
};
-namespace com { namespace sun { namespace star { namespace text {
-
-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 {
-
-std::ostream& operator<<(std::ostream& rStrm, BreakType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
class FailTest : public Test
{
public:
@@ -144,8 +115,6 @@ public:
}
};
-#endif
-
DECLARE_OOXMLIMPORT_TEST(testImageHyperlink, "image-hyperlink.docx")
{
OUString URL = getProperty<OUString>(getShape(1), "HyperLinkURL");
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 76a82593aafb..ff413cf0d1f5 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -93,106 +93,6 @@ public:
}
};
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace awt
-{
-
-std::ostream& operator<<(std::ostream& rStrm, GradientStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace drawing
-{
-
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace style
-{
-
-std::ostream& operator<<(std::ostream& rStrm, PageStyleLayout n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace text
-{
-
-std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace table
-{
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
DECLARE_RTFEXPORT_TEST(testZoom, "zoom.rtf")
{
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index d0d12b168de2..72f7e04d2e6e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -63,111 +63,6 @@
#include <bordertest.hxx>
-#if !defined _WIN32
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace beans
-{
-
-std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-#endif
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace style
-{
-
-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;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-#if !defined _WIN32
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace drawing
-{
-
-std::ostream& operator<<(std::ostream& rStrm, FillStyle n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
-#endif
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace text
-{
-
-std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-}
-}
-}
-}
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 7bb8a1dfb757..a0c814be86d4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -361,12 +361,6 @@ private:
SwDoc* createDoc(const char* pName = nullptr);
};
-std::ostream& operator<<(std::ostream& s, SvxAdjust n)
-{
- s << (int)n;
- return s;
-}
-
SwDoc* SwUiWriterTest::createDoc(const char* pName)
{
if (!pName)
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 55022b806431..4e70aa3aff16 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -137,36 +137,6 @@ protected:
}
};
-namespace com { namespace sun { namespace star { namespace drawing {
-
-std::ostream& operator<<(std::ostream& rStrm, TextVerticalAdjust n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace table {
-
-std::ostream& operator<<(std::ostream& rStrm, ShadowLocation n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
-namespace com { namespace sun { namespace star { namespace beans {
-
-std::ostream& operator<<(std::ostream& rStrm, PropertyState n)
-{
- rStrm << (int) n;
- return rStrm;
-}
-
-} } } }
-
DECLARE_WW8EXPORT_TEST(testN757910, "n757910.doc")
{
// The internal margin was larger than 0.28cm