diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /sd/qa/unit/tiledrendering | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd/qa/unit/tiledrendering')
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 3fbe6c0578a4..955425101b2e 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -36,7 +36,7 @@ using namespace css; -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) static const char* DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/"; #endif @@ -47,7 +47,7 @@ public: virtual void setUp() override; virtual void tearDown() override; -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) void testInsertPage(); void testRegisterCallback(); void testPostKeyEvent(); @@ -64,7 +64,7 @@ public: #endif CPPUNIT_TEST_SUITE(SdTiledRenderingTest); -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) CPPUNIT_TEST(testInsertPage); CPPUNIT_TEST(testRegisterCallback); CPPUNIT_TEST(testPostKeyEvent); @@ -82,14 +82,14 @@ public: CPPUNIT_TEST_SUITE_END(); private: -#if !defined(WNT) && !defined(MACOSX) +#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); #endif uno::Reference<lang::XComponent> mxComponent; -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) Rectangle m_aInvalidation; std::vector<Rectangle> m_aSelection; bool m_bFound; @@ -103,7 +103,7 @@ private: }; SdTiledRenderingTest::SdTiledRenderingTest() -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) : m_bFound(true), m_nPart(0), m_nSelectionBeforeSearchResult(0), @@ -127,7 +127,7 @@ void SdTiledRenderingTest::tearDown() test::BootstrapFixture::tearDown(); } -#if !defined(WNT) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) SdXImpressDocument* SdTiledRenderingTest::createDoc(const char* pName) { if (mxComponent.is()) |