[ooo-build-commit] .: cui/source

[Kohei Yoshida]

 cui/source/inc/autocdlg.hxx      |    1 +
 cui/source/tabpages/autocdlg.cxx |   13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit c3b94463f21c63d33fc260e87779ed80f15e6607
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 5 19:57:19 2010 -0400

    Revert "This patch resolve the issue 2838 of OOo."
    
    This reverts commit 5abaf7746c6c960d090b55ffc311ed018ecaf470.
    
    The build breaks with this change.  Reverting for the time being.

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 7131740..36e0fbd 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -239,6 +239,7 @@ private:
         SvStringsISortDtor* 	pFormatText;
         DoubleStringTable		aDoubleStringTable;
         CollatorWrapper* 		pCompareClass;
+        CollatorWrapper*        pCompareCaseClass;
         CharClass*              pCharClass;
         LanguageType 			eLang;
 
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index bf6a5fa..afb63d2 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1024,7 +1024,10 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
 
     ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage ));
     pCompareClass = new CollatorWrapper( GetProcessFact() );
-    pCompareClass->loadDefaultCollator( aLcl, 0 );
+    pCompareCaseClass = new CollatorWrapper( GetProcessFact() );
+    pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n::
+                            CollatorOptions::CollatorOptions_IGNORE_CASE );
+    pCompareCaseClass->loadDefaultCollator( aLcl, 0 );
     pCharClass = new CharClass( aLcl );
 
     static long nTabs[] = { 2 /* Tab-Count */, 1, 61 };
@@ -1054,6 +1057,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
     delete pFormatText;
     lcl_ClearTable(aDoubleStringTable);
     delete pCompareClass;
+    delete pCompareCaseClass;
     delete pCharClass;
 }
 /*-----------------14.10.96 15.58-------------------
@@ -1618,7 +1622,8 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
 
     ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage ));
     pCompareClass = new CollatorWrapper( GetProcessFact() );
-    pCompareClass->loadDefaultCollator( aLcl, 0 );
+    pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n::
+                            CollatorOptions::CollatorOptions_IGNORE_CASE );
 
     aNewAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
     aDelAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
@@ -1794,7 +1799,9 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
         eLastDialogLanguage = eSet;
         delete pCompareClass;
         pCompareClass = new CollatorWrapper( GetProcessFact() );
-        pCompareClass->loadDefaultCollator( SvxCreateLocale( eLastDialogLanguage ), 0 );
+        pCompareClass->loadDefaultCollator( SvxCreateLocale( eLastDialogLanguage ),
+                        ::com::sun::star::i18n::
+                            CollatorOptions::CollatorOptions_IGNORE_CASE );
         ModifyHdl(&aAbbrevED);
         ModifyHdl(&aDoubleCapsED);
     }