sc/source/core/tool/typedstrdata.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 338140e5201bc23625eacd1a4740622e6241cbc2
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Wed Jan 30 22:32:28 2013 -0500
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 811c5d8..71cf0fa 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include "typedstrdata.hxx"
#include "global.hxx"
-#include "unotools/transliterationwrapper.hxx"
+#include "unotools/collatorwrapper.hxx"
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData&
left, const ScTypedStrData& right) const
{
@@ -39,7 +39,7 @@ bool ScTypedStrData::LessCaseSensitive::operator() (const
ScTypedStrData& left,
if (left.meStrType == Value)
return left.mfValue < right.mfValue;
- return ScGlobal::GetCaseTransliteration()->compareString(
+ return ScGlobal::GetCaseCollator()->compareString(
left.maStrValue, right.maStrValue) < 0;
}
@@ -51,7 +51,7 @@ bool ScTypedStrData::LessCaseInsensitive::operator() (const
ScTypedStrData& left
if (left.meStrType == Value)
return left.mfValue < right.mfValue;
- return ScGlobal::GetpTransliteration()->compareString(
+ return ScGlobal::GetCollator()->compareString(
left.maStrValue, right.maStrValue) < 0;
}
@@ -63,7 +63,7 @@ bool ScTypedStrData::EqualCaseSensitive::operator() (const
ScTypedStrData& left,
if (left.meStrType == Value && left.mfValue != right.mfValue)
return false;
- return ScGlobal::GetCaseTransliteration()->compareString(
+ return ScGlobal::GetCaseCollator()->compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@ bool ScTypedStrData::EqualCaseInsensitive::operator() (const
ScTypedStrData& lef
if (left.meStrType == Value && left.mfValue != right.mfValue)
return false;
- return ScGlobal::GetpTransliteration()->compareString(
+ return ScGlobal::GetCollator()->compareString(
left.maStrValue, right.maStrValue) == 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
