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 /drawinglayer | |
| 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 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index bec31951dd37..e249ddd84044 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -380,7 +380,7 @@ namespace drawinglayer const sal_uInt32 nWidth(basegfx::fround(fabs(fFontScaleX))); const bool bFontIsScaled(nHeight != nWidth); -#ifdef WIN32 +#ifdef _WIN32 // for WIN32 systems, start with creating an unscaled font. If FontScaling // is wanted, that width needs to be adapted using FontMetric again to get a // width of the unscaled font @@ -409,7 +409,7 @@ namespace drawinglayer aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE); aRetval.SetLanguage(LanguageTag::convertToLanguageType( rLocale, false)); -#ifdef WIN32 +#ifdef _WIN32 // for WIN32 systems, correct the FontWidth if FontScaling is used if(bFontIsScaled && nHeight > 0) { @@ -456,7 +456,7 @@ namespace drawinglayer o_rSize.setY(rFont.GetFontSize().getHeight() > 0 ? rFont.GetFontSize().getHeight() : 0); o_rSize.setX(o_rSize.getY()); -#ifdef WIN32 +#ifdef _WIN32 // for WIN32 systems, the FontScaling at the Font is detected by // checking that FontWidth != 0. When FontScaling is used, WIN32 // needs to do extra stuff to detect the correct width (since it's |