diff options
Diffstat (limited to 'xmloff/source/draw/ximpcustomshape.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 424593d830ac..c0808153cc47 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -149,7 +149,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { - USHORT eKind; + sal_uInt16 eKind; if( SvXMLUnitConverter::convertEnum( eKind, rValue, &rMap ) ) { sal_Int16 nEnum = (sal_Int16)eKind; @@ -1286,7 +1286,7 @@ void XMLEnhancedCustomShapeContext::EndElement() SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) ); } -SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( USHORT nPrefix,const rtl::OUString& rLocalName, +SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList> & xAttrList ) { EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName ); |