diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 15:37:49 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 15:37:49 +0100 |
| commit | b2a2a0ce7b2d348dbc6c3d11c22b1986b7dbedc6 (patch) | |
| tree | e53f2ad8f35535dcb50064a794d1eb6e98e8015a /xmloff/source/chart/SchXMLAxisContext.cxx | |
| parent | bebf85efd10e676c8a9409c6ebd98a6e767d16f0 (diff) | |
removetooltypes01: #i112600# Fix problem after rebase in xmloff
Diffstat (limited to 'xmloff/source/chart/SchXMLAxisContext.cxx')
| -rwxr-xr-x | xmloff/source/chart/SchXMLAxisContext.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index d08e4937ff22..f9828fa04931 100755 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -305,13 +305,13 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; OUString aValue = xAttrList->getValueByIndex( i ); - USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) { case XML_TOK_AXIS_DIMENSION: { - USHORT nEnumVal; + sal_uInt16 nEnumVal; if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap )) m_aCurrentAxis.eDimension = ( SchXMLAxisDimension )nEnumVal; } @@ -321,7 +321,7 @@ void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList break; case XML_TOK_AXIS_TYPE: case XML_TOK_AXIS_TYPE_EXT: - USHORT nEnumVal; + sal_uInt16 nEnumVal; if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisTypeMap )) { m_nAxisType = nEnumVal; @@ -653,7 +653,7 @@ struct theAxisChildTokenMap : public rtl::Static< AxisChildTokenMap, theAxisChil } SvXMLImportContext* SchXMLAxisContext::CreateChildContext( - USHORT p_nPrefix, + sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { @@ -695,7 +695,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext( { OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; - USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) { @@ -906,7 +906,7 @@ void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttribut { OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; - USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) ) @@ -997,7 +997,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList > OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; OUString aValue = xAttrList->getValueByIndex( i ); - USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) { |