# HG changeset patch
# User Arnaud Versini <arnaud.versini@gmail.com>
# Date 1278408070 -7200
# Node ID e76534c06aefd1f53ed5296248a8ba4c5734a938
# Parent  03b087691bd0aa901e49756d28fb41c9a028f7f3
Resolving issue 2838 : AutoCorrections does not match case of the words that AutoCorrect replaces.

diff -r 03b087691bd0 -r e76534c06aef cui/source/inc/autocdlg.hxx
--- a/cui/source/inc/autocdlg.hxx	Wed Jun 30 12:41:48 2010 +0200
+++ b/cui/source/inc/autocdlg.hxx	Tue Jul 06 11:21:10 2010 +0200
@@ -239,7 +239,6 @@
 		SvStringsISortDtor* 	pFormatText;
 		DoubleStringTable		aDoubleStringTable;
 		CollatorWrapper* 		pCompareClass;
-        CollatorWrapper*        pCompareCaseClass;
         CharClass*              pCharClass;
 		LanguageType 			eLang;
 
diff -r 03b087691bd0 -r e76534c06aef cui/source/tabpages/autocdlg.cxx
--- a/cui/source/tabpages/autocdlg.cxx	Wed Jun 30 12:41:48 2010 +0200
+++ b/cui/source/tabpages/autocdlg.cxx	Tue Jul 06 11:21:10 2010 +0200
@@ -1013,10 +1013,7 @@
 
 	::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 };
@@ -1046,7 +1043,6 @@
 	delete pFormatText;
 	lcl_ClearTable(aDoubleStringTable);
     delete pCompareClass;
-    delete pCompareCaseClass;
     delete pCharClass;
 }
 /*-----------------14.10.96 15.58-------------------
@@ -1111,7 +1107,7 @@
 						nLastPos = nPos - 1;
 						bFound = TRUE;
 						if( !(pWordPtr->IsTextOnly() == (0 == pDouble->pUserData)
-                            && 0 == pCompareCaseClass->compareString(
+                            && 0 == pCompareClass->compareString(
 								pWordPtr->GetLong(), pDouble->sLong ) ) )
 						{
 							pAutoCorrect->PutText(sEntry, pDouble->sLong, eCurLang);
@@ -1174,7 +1170,7 @@
 				bFound = TRUE;
 				String sLong = aReplaceTLB.GetEntryText(pEntry, 1);
 				if( !(pWordPtr->IsTextOnly() == (0 == pEntry->GetUserData())
-                    && 0 == pCompareCaseClass->compareString(
+                    && 0 == pCompareClass->compareString(
 						pWordPtr->GetLong(), sLong )))
 				{
 					pAutoCorrect->PutText(sEntry, sLong, eLang);
@@ -1343,15 +1339,11 @@
 		RefillReplaceBox(FALSE, eLang, eSet);
 		eLastDialogLanguage = eSet;
 		delete pCompareClass;
-        delete pCompareCaseClass;
 		delete pCharClass;
 
 		::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 );
 		ModifyHdl(&aShortED);
 	}
@@ -1611,8 +1603,7 @@
 
 	::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));
@@ -1788,9 +1779,7 @@
 		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);
 	}
diff -r 03b087691bd0 -r e76534c06aef editeng/source/misc/svxacorr.cxx
--- a/editeng/source/misc/svxacorr.cxx	Wed Jun 30 12:41:48 2010 +0200
+++ b/editeng/source/misc/svxacorr.cxx	Tue Jul 06 11:21:10 2010 +0200
@@ -219,7 +219,6 @@
 {
 	static int bIsInit = 0;
 	static TransliterationWrapper aWrp( GetProcessFact(),
-				::com::sun::star::i18n::TransliterationModules_IGNORE_CASE |
 				::com::sun::star::i18n::TransliterationModules_IGNORE_KANA |
 				::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH );
 	if( !bIsInit )