diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /xmloff/source/text/txtvfldi.cxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'xmloff/source/text/txtvfldi.cxx')
| -rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 64a8b37a3539..a2cc3cbc4bfd 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -965,7 +965,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( // rename field // currently: no family in use! Use 0. OUString sName = rImportHelper.GetRenameMap().Get( - sal::static_int_cast< USHORT >(eVarType), sVarName); + sal::static_int_cast< sal_uInt16 >(eVarType), sVarName); // get text fields supplier and field masters Reference<XTextFieldsSupplier> xTextFieldsSupp(rImport.GetModel(), @@ -1017,7 +1017,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( sNew = aBuf.makeStringAndClear(); rImportHelper.GetRenameMap().Add( - sal::static_int_cast< USHORT >(eVarType), sName, sNew); + sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew); // call FindFieldMaster recursively to create new master return FindFieldMaster(xMaster, rImport, rImportHelper, @@ -1042,7 +1042,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( sNew = aBuf.makeStringAndClear(); rImportHelper.GetRenameMap().Add( - sal::static_int_cast< USHORT >(eVarType), sName, sNew); + sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew); // call FindFieldMaster recursively to create new master return FindFieldMaster(xMaster, rImport, rImportHelper, |