diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /basic | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxdec.cxx | 10 | ||||
| -rw-r--r-- | basic/source/sbx/sbxdec.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
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 |