Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1932

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1932/1

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
---
M sc/source/core/tool/typedstrdata.cxx
1 file changed, 5 insertions(+), 5 deletions(-)



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 @@
     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 @@
     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 @@
     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 @@
     if (left.meStrType == Value && left.mfValue != right.mfValue)
         return false;
 
-    return ScGlobal::GetpTransliteration()->compareString(
+    return ScGlobal::GetCollator()->compareString(
         left.maStrValue, right.maStrValue) == 0;
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/1932
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida <kohei.yoshida@gmail.com>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.