incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1243429 - in /incubator/ooo/trunk/main: cui/source/inc/autocdlg.hxx cui/source/tabpages/autocdlg.cxx editeng/source/misc/svxacorr.cxx
Date Mon, 13 Feb 2012 08:25:12 GMT
Author: hdu
Date: Mon Feb 13 08:25:12 2012
New Revision: 1243429

URL: http://svn.apache.org/viewvc?rev=1243429&view=rev
Log:
(author=Arnaud Versini) Match case in AutoCorrection

Modified:
    incubator/ooo/trunk/main/cui/source/inc/autocdlg.hxx
    incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.cxx
    incubator/ooo/trunk/main/editeng/source/misc/svxacorr.cxx

Modified: incubator/ooo/trunk/main/cui/source/inc/autocdlg.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/inc/autocdlg.hxx?rev=1243429&r1=1243428&r2=1243429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/inc/autocdlg.hxx (original)
+++ incubator/ooo/trunk/main/cui/source/inc/autocdlg.hxx Mon Feb 13 08:25:12 2012
@@ -235,7 +235,6 @@ private:
 		SvStringsISortDtor* 	pFormatText;
 		DoubleStringTable		aDoubleStringTable;
 		CollatorWrapper* 		pCompareClass;
-        CollatorWrapper*        pCompareCaseClass;
         CharClass*              pCharClass;
 		LanguageType 			eLang;
 

Modified: incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.cxx?rev=1243429&r1=1243428&r2=1243429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.cxx (original)
+++ incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.cxx Mon Feb 13 08:25:12 2012
@@ -1009,10 +1009,7 @@ OfaAutocorrReplacePage::OfaAutocorrRepla
 
 	::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 };
@@ -1042,7 +1039,6 @@ OfaAutocorrReplacePage::~OfaAutocorrRepl
 	delete pFormatText;
 	lcl_ClearTable(aDoubleStringTable);
     delete pCompareClass;
-    delete pCompareCaseClass;
     delete pCharClass;
 }
 /*-----------------14.10.96 15.58-------------------
@@ -1107,7 +1103,7 @@ sal_Bool OfaAutocorrReplacePage::FillIte
 						nLastPos = nPos - 1;
 						bFound = sal_True;
 						if( !(pWordPtr->IsTextOnly() == (0 == pDouble->pUserData)
-                            && 0 == pCompareCaseClass->compareString(
+                            && 0 == pCompareClass->compareString(
 								pWordPtr->GetLong(), pDouble->sLong ) ) )
 						{
 							pAutoCorrect->PutText(sEntry, pDouble->sLong, eCurLang);
@@ -1170,7 +1166,7 @@ sal_Bool OfaAutocorrReplacePage::FillIte
 				bFound = sal_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);
@@ -1339,15 +1335,11 @@ void OfaAutocorrReplacePage::SetLanguage
 		RefillReplaceBox(sal_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);
 	}
@@ -1612,8 +1604,7 @@ OfaAutocorrExceptPage::OfaAutocorrExcept
 
 	::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));
@@ -1793,9 +1784,7 @@ void OfaAutocorrExceptPage::SetLanguage(
 		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);
 	}

Modified: incubator/ooo/trunk/main/editeng/source/misc/svxacorr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/editeng/source/misc/svxacorr.cxx?rev=1243429&r1=1243428&r2=1243429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/editeng/source/misc/svxacorr.cxx (original)
+++ incubator/ooo/trunk/main/editeng/source/misc/svxacorr.cxx Mon Feb 13 08:25:12 2012
@@ -251,7 +251,6 @@ static TransliterationWrapper& GetIgnore
 {
 	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 )



Mime
View raw message