summaryrefslogtreecommitdiffstats
path: root/vcl/source/filter/sgvtext.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 14:14:43 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-02-17 11:33:57 +0000
commit2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch)
tree1f335918a854319df9269329d165a91d711d2108 /vcl/source/filter/sgvtext.cxx
parentForceReposition is unused (diff)
downloadcore-2087484c65a3d5e75a9e8ad116d11a4e13366219.tar.gz
core-2087484c65a3d5e75a9e8ad116d11a4e13366219.zip
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 'vcl/source/filter/sgvtext.cxx')
-rw-r--r--vcl/source/filter/sgvtext.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 25e8decb6ea6..10e84cc53f68 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -481,7 +481,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
switch (Atr.GetFont()) {
case 92500: case 92501: case 92504: case 92505:
{
-#if defined(WNT)
+#if defined(_WIN32)
FNam = "Times New Roman"; // CG Times is Times New Roman in Windows
#else
FNam = "Times"; // otherwise just Times
@@ -490,7 +490,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
aFont.SetFamily(FAMILY_ROMAN);
} break;
case 94021: case 94022: case 94023: case 94024: {
-#if defined(WNT)
+#if defined(_WIN32)
FNam = "Arial"; // Univers is Arial in Windows
#else
FNam = "Helvetica"; // otherwise Helvetica
@@ -499,7 +499,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
StdBrei=47;
} break;
case 93950: case 93951: case 93952: case 93953: {
-#if defined(WNT)
+#if defined(_WIN32)
FNam = "Courier New"; // The vector-Courierfont is called Courier New in Windows
#else
FNam = "Courier"; // otherwise Courier remains Courier