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

[Cédric Bosdonnat]

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

New commits:
commit 5abaf7746c6c960d090b55ffc311ed018ecaf470
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Tue Oct 5 21:17:21 2010 +0200

    This patch resolve the issue 2838 of OOo.
    
    It’s in two parts :
       * autocorrection comparison function during the search of the
    word(s) takes care of the case.
       * possibility to insert two times the same words with different
    cases.

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