diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2010-10-05 21:17:21 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-05 21:38:12 +0200 |
| commit | 5abaf7746c6c960d090b55ffc311ed018ecaf470 (patch) | |
| tree | 965f56c4a35c8128da930327150983233e7df548 | |
| parent | 10e3f3f098a6f511fb21d9aa087b64b10813e658 (diff) | |
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.
| -rw-r--r-- | cui/source/inc/autocdlg.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 36e0fbd57..71317409b 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 afb63d2c4..bf6a5fa94 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); } |