diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/vcl/vclenum.hxx | |
parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/vcl/vclenum.hxx')
-rw-r--r-- | vcl/inc/vcl/vclenum.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx index a34c633479e7..dff91a111948 100644 --- a/vcl/inc/vcl/vclenum.hxx +++ b/vcl/inc/vcl/vclenum.hxx @@ -239,7 +239,7 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE, #ifndef ENUM_FONTEMPHASISMARK_DECLARED #define ENUM_FONTEMPHASISMARK_DECLARED -typedef USHORT FontEmphasisMark; +typedef sal_uInt16 FontEmphasisMark; #define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) #define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) #define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) |