summaryrefslogtreecommitdiff
path: root/xmloff/source/style/EnumPropertyHdl.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /xmloff/source/style/EnumPropertyHdl.cxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'xmloff/source/style/EnumPropertyHdl.cxx')
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index 72b399be47a8..0c01ba9e6db9 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -52,7 +52,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl()
sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
- USHORT nValue = 0;
+ sal_uInt16 nValue = 0;
if( SvXMLUnitConverter::convertEnum( nValue, rStrImpValue, mpEnumMap ) )
{