From ce43d0ae9279edbf1ad108fe0d8325327a038d49 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 11:26:51 +0200 Subject: use consistent #define checks for the Windows platform stage 1 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f Reviewed-on: https://gerrit.libreoffice.org/22390 Tested-by: Jenkins Reviewed-by: Michael Stahl --- basic/source/sbx/sbxdec.cxx | 10 +++++----- basic/source/sbx/sbxdec.hxx | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'basic/source') diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 8a956c8dfd7c..1616771bc4c3 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -34,7 +34,7 @@ SbxDecimal::SbxDecimal() SbxDecimal::SbxDecimal( const SbxDecimal& rDec ) { -#ifdef WIN32 +#ifdef _WIN32 maDec = rDec.maDec; #else (void)rDec; @@ -45,7 +45,7 @@ SbxDecimal::SbxDecimal( const SbxDecimal& rDec ) SbxDecimal::SbxDecimal ( const css::bridge::oleautomation::Decimal& rAutomationDec ) { -#ifdef WIN32 +#ifdef _WIN32 maDec.scale = rAutomationDec.Scale; maDec.sign = rAutomationDec.Sign; maDec.Lo32 = rAutomationDec.LowValue; @@ -60,7 +60,7 @@ SbxDecimal::SbxDecimal void SbxDecimal::fillAutomationDecimal ( css::bridge::oleautomation::Decimal& rAutomationDec ) { -#ifdef WIN32 +#ifdef _WIN32 rAutomationDec.Scale = maDec.scale; rAutomationDec.Sign = maDec.sign; rAutomationDec.LowValue = maDec.Lo32; @@ -88,7 +88,7 @@ void releaseDecimalPtr( SbxDecimal*& rpDecimal ) } } -#ifdef WIN32 +#ifdef _WIN32 bool SbxDecimal::operator -= ( const SbxDecimal &r ) { @@ -351,7 +351,7 @@ bool SbxDecimal::getDouble( double& rVal ) { (void)rVal; return false; } void SbxDecimal::getString( OUString& rString ) { -#ifdef WIN32 +#ifdef _WIN32 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); bool bRet = false; diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index 957ffd03c0d5..eb71f2c9f50f 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -45,7 +45,7 @@ class SbxDecimal { friend void releaseDecimalPtr( SbxDecimal*& rpDecimal ); -#ifdef WIN32 +#ifdef _WIN32 DECIMAL maDec; #endif sal_Int32 mnRefCount; @@ -75,7 +75,7 @@ public: bool setString( OUString* pOUString ); void setDecimal( SbxDecimal* pDecimal ) { -#ifdef WIN32 +#ifdef _WIN32 if( pDecimal ) maDec = pDecimal->maDec; #else -- cgit