diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/filter/xml/xmlconti.cxx | |
| parent | Typo. (diff) | |
| parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
| download | core-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz core-12343c15568dcc2c9209d8ca41fda2263122448f.zip | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/filter/xml/xmlconti.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlconti.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index dfb34beab24c..2b752f7aec83 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -48,7 +48,7 @@ using namespace xmloff::token; //------------------------------------------------------------------ ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, @@ -63,7 +63,7 @@ ScXMLContentContext::~ScXMLContentContext() { } -SvXMLImportContext *ScXMLContentContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) @@ -79,7 +79,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( USHORT nPrefix, const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); const rtl::OUString& sAttrValue(xAttrList->getValueByIndex( i )); rtl::OUString aLocalName; - USHORT nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName( + sal_uInt16 nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C)) nRepeat = sAttrValue.toInt32(); |