summaryrefslogtreecommitdiffstats
path: root/sw/qa
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-31 13:49:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-03 06:24:33 +0000
commit4809096a1f60d9ef57a494ba6ae8fb8541361572 (patch)
tree6d83f7a2c806eeb28c72ba0f83cbb5ae8db275d0 /sw/qa
parentuse actual UNO enums in sc (diff)
downloadcore-4809096a1f60d9ef57a494ba6ae8fb8541361572.tar.gz
core-4809096a1f60d9ef57a494ba6ae8fb8541361572.zip
use actual UNO enums in sw
Change-Id: If0f4a6532cc255f632d88d97e6b1a9e57462f5fc Reviewed-on: https://gerrit.libreoffice.org/35969 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/qa')
-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.cxx75
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx26
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx50
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx52
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx30
15 files changed, 498 insertions, 0 deletions
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index b04f7c927b70..ff2a7af94dfe 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -26,6 +26,21 @@ 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 a8f55d9cafdf..cb8e4de67481 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -42,6 +42,16 @@
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 dddaa4b5e801..41d7abbbfd03 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -97,6 +97,46 @@ 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 9572e7f4dba4..9015dd805e6d 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -32,6 +32,30 @@
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 7c488f719d0d..480a091de014 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -80,6 +80,36 @@ 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 a0bd7e490320..568ce9114ac9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -92,6 +92,71 @@ 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 4614e3fb2780..7f36628e2164 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -76,6 +76,37 @@ 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 1d94e25938aa..2b369fa9c6c7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -73,6 +73,16 @@ 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 80f28f09875a..a1839fcfc9e4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -41,6 +41,36 @@ 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 b538e9f990da..0f8480f3c6d5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -41,6 +41,16 @@ 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 706a359fb58e..156f8f4fa696 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -115,6 +115,81 @@ protected:
}
};
+namespace com { namespace sun { namespace star { namespace beans {
+
+std::ostream& operator<<(std::ostream& rStrm, PropertyState 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;
+}
+
+} } } }
+
+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;
+}
+
+} } } }
+
+namespace com { namespace sun { namespace star { namespace text {
+
+std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
+{
+ rStrm << (int) n;
+ return rStrm;
+}
+std::ostream& operator<<(std::ostream& rStrm, TextContentAnchorType 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;
+}
+
+} } } }
+
#if !defined(_WIN32)
DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 208ed6370e7b..c1155bdb69cb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -81,6 +81,32 @@ public:
}
};
+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;
+}
+
+} } } }
+
+
+namespace com { namespace sun { namespace star { namespace style {
+
+std::ostream& operator<<(std::ostream& rStrm, BreakType n)
+{
+ rStrm << (int) n;
+ return rStrm;
+}
+
+} } } }
+
#if !defined _WIN32
class FailTest : public Test
{
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index ff413cf0d1f5..9dba6712a039 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -93,6 +93,56 @@ 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 d03d76979498..191fc7a2664b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -63,6 +63,58 @@
#include <bordertest.hxx>
+namespace com { namespace sun { namespace star { namespace beans {
+
+std::ostream& operator<<(std::ostream& rStrm, PropertyState 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;
+}
+std::ostream& operator<<(std::ostream& rStrm, TabAlign n)
+{
+ rStrm << (int) n;
+ return rStrm;
+}
+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, FillStyle 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;
+}
+std::ostream& operator<<(std::ostream& rStrm, WrapTextMode n)
+{
+ rStrm << (int) n;
+ return rStrm;
+}
+
+} } } }
+
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 4e70aa3aff16..55022b806431 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -137,6 +137,36 @@ 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