diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/callform.hxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/helper/debughelper.hxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 4 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/impop.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/orcus/orcusfiltersimpl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/datastream.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/select.cxx | 4 |
12 files changed, 17 insertions, 17 deletions
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 409c95db46c1..fd85ab1122b2 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -28,7 +28,7 @@ #define MAXFUNCPARAM 16 #define MAXARRSIZE 0xfffe -#ifndef WNT +#ifndef _WIN32 #define CALLTYPE #else #define CALLTYPE __cdecl diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 0143d6e6908c..4f8dd6633590 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -14,7 +14,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#ifdef WNT +#ifdef _WIN32 #if !defined NOMINMAX #define NOMINMAX #endif diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 0779ad35ca36..d734a2e8d061 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -25,7 +25,7 @@ #include <config_orcus.h> #if ENABLE_ORCUS -#if defined WNT +#if defined(_WIN32) #define __ORCUS_STATIC_LIB #endif #include <orcus/csv_parser.hpp> diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index aab6d3430357..ba14452f7664 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -199,13 +199,13 @@ public: CPPUNIT_TEST(testCeilingFloorXLSX); CPPUNIT_TEST(testCeilingFloorXLS); CPPUNIT_TEST(testCeilingFloorODS); -#if !defined(WNT) +#if !defined(_WIN32) CPPUNIT_TEST(testRelativePaths); #endif CPPUNIT_TEST(testSheetProtection); CPPUNIT_TEST(testPivotTableXLSX); CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX); -#if !defined(WNT) +#if !defined(_WIN32) CPPUNIT_TEST(testSupBookVirtualPath); #endif CPPUNIT_TEST(testSwappedOutImageExport); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 91812b2f9dc0..d4a8426c79e7 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -158,7 +158,7 @@ public: void testErrorOnExternalReferences(); //misc tests unrelated to the import filters -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT) +#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void testPasswordNew(); void testPasswordOld(); void testPasswordWrongSHA(); @@ -279,7 +279,7 @@ public: //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT) +#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) CPPUNIT_TEST(testPasswordWrongSHA); CPPUNIT_TEST(testPasswordOld); CPPUNIT_TEST(testPasswordNew); @@ -312,7 +312,7 @@ public: CPPUNIT_TEST_SUITE_END(); private: -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT) +#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void testPassword_Impl(const OUString& rFileNameBase); #endif @@ -1507,7 +1507,7 @@ void ScFiltersTest::testRowIndex1BasedXLSX() xDocSh->DoClose(); } -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT) +#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) { OUString aFileExtension(getFileFormats()[0].pName, strlen(getFileFormats()[0].pName), RTL_TEXTENCODING_UTF8 ); diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 25317265920c..983ebeb1372c 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3987,7 +3987,7 @@ bool ScFormulaCell::InterpretFormulaGroup() int nMaxGroupLength = INT_MAX; -#ifdef WNT +#ifdef _WIN32 // Heuristic: Certain old low-end OpenCL implementations don't // work for us with too large group lengths. 1000 was determined // empirically to be a good compromise. Looking at the preferred diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 1d24749aca16..470c31572c0a 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -77,7 +77,7 @@ #include "excform.hxx" #include "documentimport.hxx" -#if defined( WNT ) +#if defined(_WIN32) #include <math.h> #else #include <stdlib.h> diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index 54b5ac2815c8..c86ca3b68d23 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/task/XStatusIndicator.hpp> -#ifdef WNT +#ifdef _WIN32 #define SYSTEM_PATH INetURLObject::FSYS_DOS #else #define SYSTEM_PATH INetURLObject::FSYS_UNX diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 082fe89a643e..8440c71af158 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -31,7 +31,7 @@ #if ENABLE_ORCUS -#if defined WNT +#if defined(_WIN32) #define __ORCUS_STATIC_LIB #endif #include <orcus/csv_parser.hpp> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index e84b73f865f4..acf223bcd00e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2086,7 +2086,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, rbFooter = static_cast<const SfxBoolItem&>(pSet->Get(ATTR_PAGE_ON)).GetValue(); } -#if defined WNT +#if defined(_WIN32) bool ScDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType, css::uno::Any & rValue ) diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 827d12314a31..c1fbcd71c52c 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -360,7 +360,7 @@ public: bool& rbHeader, bool& rbFooter ); -#if defined WNT +#if defined(_WIN32) virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, css::uno::Any & rValue ) override; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index faebc8feb61d..3bd992734ef6 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -32,7 +32,7 @@ #include "markdata.hxx" #include <gridwin.hxx> -#if defined WNT +#if defined(_WIN32) #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65 #endif @@ -124,7 +124,7 @@ sal_uLong ScViewFunctionSet::CalcUpdateInterval( const Size& rWinSize, const Poi nUpdateInterval = nTmp; } -#ifdef WNT +#ifdef _WIN32 ScTabViewShell* pViewShell = pViewData->GetViewShell(); bool bRefMode = pViewShell && pViewShell->IsRefInputMode(); if (bRefMode && nUpdateInterval < SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN) |