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>

2 files changed, 12 insertions, 52 deletions

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index f45ae187d0db..c194e0314769 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -82,6 +82,18 @@
 
 using namespace ::com::sun::star;
 
+namespace com { namespace sun { namespace star { namespace uno {
+
+template<class T>
+std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xRef)
+{
+    rStrm << xRef.get();
+    return rStrm;
+}
+
+} } } }
+
+
 /// Impress import filters tests.
 class SdImportTest : public SdModelTestBase
 {
@@ -612,52 +624,6 @@ void SdImportTest::testFdo77027()
     xDocShRef->DoClose();
 }
 
-namespace com { namespace sun { namespace star { namespace uno {
-
-template<class T>
-std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xRef)
-{
-    rStrm << xRef.get();
-    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 presentation {
-
-std::ostream& operator<<(std::ostream& rStrm, ClickAction 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;
-}
-
-} } } }
-
 void SdImportTest::testTdf97808()
 {
     sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf97808.fodp"), FODP);
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 014869cb0790..e90deebc059e 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -73,12 +73,6 @@ private:
     sd::DrawDocShellRef Load(const OUString& rURL, sal_Int32 nFormat);
 };
 
-std::ostream& operator<<(std::ostream& s, SvxAdjust n)
-{
-    s << (int)n;
-    return s;
-}
-
 sd::DrawDocShellRef SdMiscTest::Load(const OUString& rURL, sal_Int32 nFormat)
 {
     uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(::comphelper::getProcessComponentContext());