sd/Module_sd.mk | 2 +-
sd/qa/unit/tiledrendering/tiledrendering.cxx | 17 -----------------
2 files changed, 1 insertion(+), 18 deletions(-)
New commits:
commit e2667a55a898ae00b991619d6e66e4a5426e9bff
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Jun 10 09:03:54 2016 +0200
CppunitTest_sd_tiledrendering: replace ifdefs with a single makefile
condition
Change-Id: I61e5cad8dee9f6dace6fe78b01a6ecefbd9d8f78
Reviewed-on: https://gerrit.libreoffice.org/26144
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index d2584c9..80f31fa 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -34,13 +34,13 @@ $(eval $(call gb_Module_add_check_targets,sd,\
CppunitTest_sd_filters_test \
CppunitTest_sd_misc_tests \
CppunitTest_sd_html_export_tests \
- CppunitTest_sd_tiledrendering \
))
endif
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_check_targets,sd,\
CppunitTest_sd_svg_export_tests \
+ CppunitTest_sd_tiledrendering \
))
endif
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b4b2ec6..1d5fb5c 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -35,9 +35,7 @@
using namespace css;
-#if !defined(_WIN32) && !defined(MACOSX)
static const char* DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/";
-#endif
class SdTiledRenderingTest : public test::BootstrapFixture, public
unotest::MacrosTest, public XmlTestTools
{
@@ -46,7 +44,6 @@ public:
virtual void setUp() override;
virtual void tearDown() override;
-#if !defined(_WIN32) && !defined(MACOSX)
void testRegisterCallback();
void testPostKeyEvent();
void testPostMouseEvent();
@@ -64,10 +61,8 @@ public:
void testPartHash();
void testResizeTable();
void testResizeTableColumn();
-#endif
CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
-#if !defined(_WIN32) && !defined(MACOSX)
CPPUNIT_TEST(testRegisterCallback);
CPPUNIT_TEST(testPostKeyEvent);
CPPUNIT_TEST(testPostMouseEvent);
@@ -85,19 +80,15 @@ public:
CPPUNIT_TEST(testPartHash);
CPPUNIT_TEST(testResizeTable);
CPPUNIT_TEST(testResizeTableColumn);
-#endif
CPPUNIT_TEST_SUITE_END();
private:
-#if !defined(_WIN32) && !defined(MACOSX)
SdXImpressDocument* createDoc(const char* pName);
static void callback(int nType, const char* pPayload, void* pData);
void callbackImpl(int nType, const char* pPayload);
xmlDocPtr parseXmlDump();
-#endif
uno::Reference<lang::XComponent> mxComponent;
-#if !defined(_WIN32) && !defined(MACOSX)
Rectangle m_aInvalidation;
std::vector<Rectangle> m_aSelection;
bool m_bFound;
@@ -110,17 +101,14 @@ private:
/// For document size changed callback.
osl::Condition m_aDocumentSizeCondition;
xmlBufferPtr m_pXmlBuffer;
-#endif
};
SdTiledRenderingTest::SdTiledRenderingTest()
-#if !defined(_WIN32) && !defined(MACOSX)
: m_bFound(true),
m_nPart(0),
m_nSelectionBeforeSearchResult(0),
m_nSelectionAfterSearchResult(0),
m_pXmlBuffer(nullptr)
-#endif
{
}
@@ -136,15 +124,12 @@ void SdTiledRenderingTest::tearDown()
if (mxComponent.is())
mxComponent->dispose();
-#if !defined(_WIN32) && !defined(MACOSX)
if (m_pXmlBuffer)
xmlBufferFree(m_pXmlBuffer);
-#endif
test::BootstrapFixture::tearDown();
}
-#if !defined(_WIN32) && !defined(MACOSX)
SdXImpressDocument* SdTiledRenderingTest::createDoc(const char* pName)
{
if (mxComponent.is())
@@ -815,8 +800,6 @@ void SdTiledRenderingTest::testResizeTableColumn()
comphelper::LibreOfficeKit::setActive(false);
}
-#endif
-
CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
