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/xmlsorti.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/filter/xml/xmlsorti.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlsorti.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index c71e4c38c40c..0826b58313b1 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -54,7 +54,7 @@ using namespace xmloff::token; //------------------------------------------------------------------ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -65,10 +65,10 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sLanguage(), sAlgorithm(), nUserListIndex(0), - bCopyOutputData(sal_False), + bCopyOutputData(false), bBindFormatsToContent(sal_True), - bIsCaseSensitive(sal_False), - bEnabledUserList(sal_False) + bIsCaseSensitive(false), + bEnabledUserList(false) { sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortAttrTokenMap()); @@ -76,7 +76,7 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); rtl::OUString aLocalName; - USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( + sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); @@ -120,7 +120,7 @@ ScXMLSortContext::~ScXMLSortContext() { } -SvXMLImportContext *ScXMLSortContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) @@ -192,7 +192,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl if (IsXMLToken(sOrder, XML_ASCENDING)) aSortField.SortAscending = sal_True; else - aSortField.SortAscending = sal_False; + aSortField.SortAscending = false; if (sDataType.getLength() > 8) { rtl::OUString sTemp = sDataType.copy(0, 8); @@ -220,7 +220,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl } ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -236,7 +236,7 @@ ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); rtl::OUString aLocalName; - USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( + sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); @@ -265,7 +265,7 @@ ScXMLSortByContext::~ScXMLSortByContext() { } -SvXMLImportContext *ScXMLSortByContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) |