diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-15 23:29:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-15 23:29:14 +0200 |
| commit | 1f742c520d0cca536d1e8f59a435b014577b7b4c (patch) | |
| tree | da1e6d4a13724dd8e8d5907246289bd25afb1905 /sw | |
| parent | 78fcb7f256802232239b5acf8b11949a298c87e4 (diff) | |
Properly #ifdef some per-platform test code
Change-Id: I286fb35e223f205ecc649aa388471ef1b0823d86
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/macros-test.cxx | 8 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 9e9ed6fa0458..d8ad1410878f 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -51,13 +51,17 @@ class SwMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest public: SwMacrosTest(); +#if !defined MACOSX && !defined WNT void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); +#endif virtual void setUp() SAL_OVERRIDE; virtual void tearDown() SAL_OVERRIDE; //void testStarBasic(); +#if !defined MACOSX && !defined WNT void testVba(); +#endif void testFdo55289(); CPPUNIT_TEST_SUITE(SwMacrosTest); #if !defined(MACOSX) && !defined(WNT) @@ -75,6 +79,7 @@ private: OUString m_aBaseString; }; +#if !defined MACOSX && !defined WNT void SwMacrosTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { OUString aSep("/"); @@ -83,6 +88,7 @@ void SwMacrosTest::createFileURL(const OUString& aFileBase, const OUString& aFil aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); } +#endif #if 0 @@ -113,6 +119,7 @@ void SwMacrosTest::testStarBasic() #endif +#if !defined MACOSX && !defined WNT void SwMacrosTest::testVba() { TestMacroInfo testInfo[] = { @@ -148,6 +155,7 @@ void SwMacrosTest::testVba() pFoundShell->DoClose(); } } +#endif void SwMacrosTest::testFdo55289() { diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 7ebd83ef43c1..19196a01631a 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -84,6 +84,7 @@ public: protected: /// Copy&paste helper. +#if !defined MACOSX && !defined WNT void paste(const OUString& aFilename, uno::Reference<text::XTextRange> xTextRange = uno::Reference<text::XTextRange>()) { uno::Reference<document::XFilter> xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); @@ -103,6 +104,7 @@ protected: } xFilter->filter(aDescriptor); } +#endif AllSettings m_aSavedSettings; }; |