diff options
35 files changed, 16 insertions, 869 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index eae08be7cf96..5975c7a3cfa2 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -177,21 +177,6 @@ protected: }; -namespace com { namespace sun { namespace star { namespace drawing { - -std::ostream& operator<<(std::ostream& rStrm, FillStyle n) -{ - rStrm << (int) n; - return rStrm; -} -std::ostream& operator<<(std::ostream& rStrm, LineStyle n) -{ - rStrm << (int) n; - return rStrm; -} - -} } } } - namespace { struct CheckForChartName diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index ec82f813de56..871b41bc5376 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -154,26 +154,6 @@ private: }; -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 chart2 { - -std::ostream& operator<<(std::ostream& rStrm, CurveStyle n) -{ - rStrm << (int) n; - return rStrm; -} - -} } } } - // error bar import // split method up into smaller chunks for more detailed tests void Chart2ImportTest::Fdo60083() diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx index 47289db28340..0a9ba6b3aafd 100644 --- a/comphelper/qa/unit/syntaxhighlighttest.cxx +++ b/comphelper/qa/unit/syntaxhighlighttest.cxx @@ -37,11 +37,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -std::ostream& operator<<(std::ostream& rStrm, const TokenType& tt) -{ - return rStrm << (int)tt; -} - void SyntaxHighlightTest::testBasicString() { OUString s("\"foo\""); std::vector<HighlightPortion> ps; diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 6269ff2cfa86..20727db830f2 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -53,12 +53,6 @@ operator <<(std::basic_ostream<charT, traits> & stream, Type const & type) { return stream << type.getTypeName(); } -std::ostream& operator<< (std::ostream& aStream, const css::uno::TypeClass& aTypeClass) -{ - aStream << (sal_Int32)aTypeClass; - return aStream; -} - } } } } diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index d895fa4952bd..5f08d23541c4 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -44,14 +44,6 @@ using namespace com::sun::star; using namespace desktop; -namespace com { namespace sun { namespace star { namespace text { -std::ostream& operator<<(std::ostream& os, css::text::TextContentAnchorType const & n) -{ - os << (sal_Int32)n; - return os; -} -} } } }; - class DesktopLOKTest : public UnoApiTest { public: diff --git a/download.lst b/download.lst index f372257ef879..3d0418563c6d 100644 --- a/download.lst +++ b/download.lst @@ -26,8 +26,8 @@ export COINMP_SHA256SUM := 86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8 export COINMP_TARBALL := CoinMP-1.7.6.tgz export COLLADA2GLTF_SHA256SUM := b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -export CPPUNIT_SHA256SUM := 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f -export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz +export CPPUNIT_SHA256SUM := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780 +export CPPUNIT_TARBALL := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt export CURL_SHA256SUM := a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae diff --git a/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 b/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 deleted file mode 100644 index 13961f9e3506..000000000000 --- a/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 +++ /dev/null @@ -1,54 +0,0 @@ -From 059fcd2878071616cedb5116a0b2f75b5edbdbe0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -Date: Sun, 6 Jul 2014 15:34:41 +0100 -Subject: [PATCH] mark the fails as no-return - -that might help clang scan-build understand that execution won't continue after -they fail ---- - include/cppunit/Asserter.h | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h -index 94dadaa..ad981b5 100644 ---- a/include/cppunit/Asserter.h -+++ b/include/cppunit/Asserter.h -@@ -42,17 +42,24 @@ class Message; - * CPPUNIT_SOURCELINE() ) - * \endcode - */ -+ -+#if defined __GNUC__ -+# define NORETURN __attribute__((noreturn)) -+#else -+# define NORETURN -+#endif -+ - struct Asserter - { - /*! \brief Throws a Exception with the specified message and location. - */ -- static void CPPUNIT_API fail( const Message &message, -+ NORETURN static void CPPUNIT_API fail( const Message &message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. - * \deprecated Use fail( Message, SourceLine ) instead. - */ -- static void CPPUNIT_API fail( std::string message, -+ NORETURN static void CPPUNIT_API fail( std::string message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. -@@ -111,7 +118,7 @@ struct Asserter - * what are the differences between the expected and actual value. - * \param shortDescription Short description for the failure message. - */ -- static void CPPUNIT_API failNotEqual( std::string expected, -+ NORETURN static void CPPUNIT_API failNotEqual( std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage = AdditionalMessage(), --- -1.9.3 - diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index b1264769c371..28b251e4bf5b 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -12,13 +12,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit)) $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit)) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - external/cppunit/coverity.patch \ external/cppunit/windows.patch \ external/cppunit/unix.patch \ - external/cppunit/wundef.patch \ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ external/cppunit/enable-win32-debug.patch \ - external/cppunit/0001-mark-the-fails-as-no-return.patch.1 \ external/cppunit/rtti.patch.0 \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/cppunit/coverity.patch b/external/cppunit/coverity.patch deleted file mode 100644 index 34c1c2990b3e..000000000000 --- a/external/cppunit/coverity.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- misc/cppunit-1.13.1/src/cppunit/Asserter.cpp -+++ misc/build/cppunit-1.13.1/src/cppunit/Asserter.cpp -@@ -6,6 +6,7 @@ - CPPUNIT_NS_BEGIN - - -+// coverity[+kill] - void - Asserter::fail( std::string message, - const SourceLine &sourceLine ) -@@ -13,7 +14,7 @@ - fail( Message( "assertion failed", message ), sourceLine ); - } - -- -+// coverity[+kill] - void - Asserter::fail( const Message &message, - const SourceLine &sourceLine ) diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch index 661bb4b35f9c..ea50ba529356 100644 --- a/external/cppunit/enable-win32-debug.patch +++ b/external/cppunit/enable-win32-debug.patch @@ -1,5 +1,5 @@ ---- misc/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj -+++ misc/build/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj +--- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj ++++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj @@ -107,7 +107,6 @@ <SuppressStartupBanner>true</SuppressStartupBanner> <WarningLevel>Level3</WarningLevel> diff --git a/external/cppunit/wundef.patch b/external/cppunit/wundef.patch deleted file mode 100644 index 5f701cd702d1..000000000000 --- a/external/cppunit/wundef.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/cppunit-1.13.1/include/cppunit/Portability.h 2012-09-24 19:10:36.000000000 +0200 -+++ misc/build/cppunit-1.13.1/include/cppunit/Portability.h 2013-03-18 14:23:48.880718714 +0100 -@@ -68,6 +68,9 @@ - * std::allocator. On some compilers, you may need to change this to - * std::allocator<T>. - */ -+#ifndef CPPUNIT_STD_NEED_ALLOCATOR /* avoid -Wundef warning */ -+#define CPPUNIT_STD_NEED_ALLOCATOR 0 -+#endif - #if CPPUNIT_STD_NEED_ALLOCATOR - # if !defined(CPPUNIT_STD_ALLOCATOR) - # define CPPUNIT_STD_ALLOCATOR std::allocator diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index f3cb007f0e9d..6cab0e737d4e 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -71,12 +71,6 @@ std::ostream& operator<<(std::ostream& rStrm, const OpCode& rCode) return rStrm; } -std::ostream& operator<<(std::ostream& rStrm, const SvxCellHorJustify& rCode) -{ - rStrm << static_cast<int>(rCode); - return rStrm; -} - const FileFormat ScBootstrapFixture::aFileFormats[] = { { "ods" , "calc8", "", ODS_FORMAT_TYPE }, { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE }, diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 6cc4bbb407a1..fff91e78bbe9 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -295,12 +295,6 @@ private: }; -std::ostream& operator<<(std::ostream& os, SvxBorderLineStyle n) -{ - os << (int)n; - return os; -} - void ScExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) { struct { xmlChar* pPrefix; xmlChar* pURI; } aNamespaces[] = diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 1b6cb2979808..177d84185d6a 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -362,27 +362,6 @@ private: uno::Reference<uno::XInterface> m_xCalcComponent; }; -std::ostream& operator<<(std::ostream& rStrm, const SvxCellHorJustify& rCode) -{ - rStrm << static_cast<int>(rCode); - return rStrm; -} -std::ostream& operator<<(std::ostream& os, SvxBorderLineStyle n) -{ - os << (int)n; - return os; -} - -namespace com { namespace sun { namespace star { namespace sheet { - -std::ostream& operator<<(std::ostream& rStrm, DataPilotFieldOrientation n) -{ - rStrm << (int) n; - return rStrm; -} - -} } } } - bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, const OUString &rUserData, SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 68b83625acb2..9918e88e7f25 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -94,11 +94,6 @@ #include <utility> #include <vector> -static std::ostream& operator<<(std::ostream& os, ScMatrixMode mode) -{ - os << (int) mode; return os; -} - struct TestImpl { ScDocShellRef m_xDocShell; diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 9240320fac2a..4fb2b544fc1c 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -87,11 +87,6 @@ ScRange getCachedRange(const ScExternalRefCache::TableTypeRef& pCacheTab) } -static std::ostream& operator<<(std::ostream& os, ScMatrixMode mode) -{ - os << (int) mode; return os; -} - void Test::testFormulaCreateStringFromTokens() { // Insert sheets. 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()); 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 diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx index 8cfd73d00a36..55d03151924b 100644 --- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx +++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx @@ -24,16 +24,6 @@ #include "WpftLoader.hxx" #include "wpftimport.hxx" -namespace com { namespace sun { namespace star { namespace table { - -std::ostream& operator<<(std::ostream& rStrm, CellContentType n) -{ - rStrm << (int) n; - return rStrm; -} - -} } } } - namespace { |