strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy this up and be consistent

Browse source
This commit is contained in:
Caolán McNamara 2011-02-18 21:26:40 +00:00
parent e8f92e54b9
commit 926be1c961
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
comphelper/inc/comphelper/string.hxx
View file

@ -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
{

2
comphelper/qa/string/makefile.mk
View file

@ -27,7 +27,7 @@
PRJ := ..$/..
PRJNAME := comphelper
TARGET := qa
TARGET := qa_string
ENABLE_EXCEPTIONS := TRUE

4
comphelper/qa/string/test_string.cxx
View file

@ -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;

2
comphelper/qa/weakbag/makefile.mk
View file

@ -27,7 +27,7 @@
PRJ := ..$/..
PRJNAME := comphelper
TARGET := qa
TARGET := qa_weakbag
ENABLE_EXCEPTIONS := TRUE

16
comphelper/source/misc/string.cxx
View file

@ -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,