diff options
| -rw-r--r-- | comphelper/inc/comphelper/string.hxx | 3 | ||||
| -rw-r--r-- | comphelper/qa/string/makefile.mk | 2 | ||||
| -rw-r--r-- | comphelper/qa/string/test_string.cxx | 4 | ||||
| -rw-r--r-- | comphelper/qa/weakbag/makefile.mk | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/string.cxx | 16 |
5 files changed, 13 insertions, 14 deletions
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx index 7944b1e2bddd..b1f769388ee0 100644 --- a/comphelper/inc/comphelper/string.hxx +++ b/comphelper/inc/comphelper/string.hxx @@ -174,8 +174,7 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const ::rtl::OUString &rLHS, const ::rtl::OUString &rRHS, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > &rCollator, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > &rBI, - const ::com::sun::star::lang::Locale &rLocale ) - SAL_THROW(()); + const ::com::sun::star::lang::Locale &rLocale ); class COMPHELPER_DLLPUBLIC NaturalStringSorter { diff --git a/comphelper/qa/string/makefile.mk b/comphelper/qa/string/makefile.mk index 7a74454c9212..fb7ce8ae23ab 100644 --- a/comphelper/qa/string/makefile.mk +++ b/comphelper/qa/string/makefile.mk @@ -27,7 +27,7 @@ PRJ := ..$/.. PRJNAME := comphelper -TARGET := qa +TARGET := qa_string ENABLE_EXCEPTIONS := TRUE diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 2f92b8190d15..58fa60a151e7 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -200,7 +200,7 @@ public: const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) { const sal_Unicode *pStr = rText.getStr()+nStartPos; - for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI) + for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) { if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr)) return nI; @@ -216,7 +216,7 @@ public: const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) { const sal_Unicode *pStr = rText.getStr()+nStartPos; - for (sal_Int16 nI = nStartPos; nI < rText.getLength(); ++nI) + for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) { if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr)) return nI; diff --git a/comphelper/qa/weakbag/makefile.mk b/comphelper/qa/weakbag/makefile.mk index 606373c34b85..fdba94838a56 100644 --- a/comphelper/qa/weakbag/makefile.mk +++ b/comphelper/qa/weakbag/makefile.mk @@ -27,7 +27,7 @@ PRJ := ..$/.. PRJNAME := comphelper -TARGET := qa +TARGET := qa_weakbag ENABLE_EXCEPTIONS := TRUE diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 6f088f4bbdc6..9a9a9b8901c5 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -228,19 +228,19 @@ uno::Sequence< ::rtl::OUString > sal_Int32 compareNatural( const ::rtl::OUString & rLHS, const ::rtl::OUString & rRHS, const uno::Reference< i18n::XCollator > &rCollator, const uno::Reference< i18n::XBreakIterator > &rBI, - const lang::Locale &rLocale) SAL_THROW(()) + const lang::Locale &rLocale ) { - sal_Int16 nRet = 0; + sal_Int32 nRet = 0; - sal_Int16 nLHSLastNonDigitPos = 0; - sal_Int16 nRHSLastNonDigitPos = 0; - sal_Int16 nLHSFirstDigitPos = 0; - sal_Int16 nRHSFirstDigitPos = 0; + sal_Int32 nLHSLastNonDigitPos = 0; + sal_Int32 nRHSLastNonDigitPos = 0; + sal_Int32 nLHSFirstDigitPos = 0; + sal_Int32 nRHSFirstDigitPos = 0; while (nLHSFirstDigitPos < rLHS.getLength() || nRHSFirstDigitPos < rRHS.getLength()) { - sal_Int16 nLHSChunkLen; - sal_Int16 nRHSChunkLen; + sal_Int32 nLHSChunkLen; + sal_Int32 nRHSChunkLen; //Compare non digit block as normal strings nLHSFirstDigitPos = rBI->nextCharBlock(rLHS, nLHSLastNonDigitPos, |