Hi
This is the full patch
2010/10/6 Arnaud VERSINI <arnaud.vers...@gmail.com>
> Sorry,
>
> I prepare a new patch with all lines removed.
>
> Arnaud
>
> 2010/10/6 Kohei Yoshida <kyosh...@novell.com>
>
> On Tue, 2010-10-05 at 19:17 -0400, Kohei Yoshida wrote:
>> > Hi Arnaud,
>> >
>> > On Tue, 2010-10-05 at 21:32 +0200, Arnaud VERSINI wrote:
>> > > Patch resolving issue 2838 of OpenOffice.org.
>> >
>> > Hmm... Unfortunately your cui.patch breaks the build for me. Reverting
>> > your commit fixes the build.
>> >
>> > Could you take another look at this?
>>
>> Ultimately the build breaks because the patch removes pCompareCaseClass
>> member variable from the class, but that member variable is still
>> referenced in five locations (2 in FillItemSet() and 3 in SetLanguage()
>> methods)...
>>
>> I've reverted the commit for the time being.
>>
>> Kohei
>>
>> --
>> Kohei Yoshida, LibreOffice hacker, Calc
>> <kyosh...@novell.com>
>>
>>
From 431481c73b502cda1ead9c273627bacf88363da9 Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Wed, 6 Oct 2010 20:51:14 +0200
Subject: [PATCH] Resolving issue 2838 of OOo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
---
editeng/source/misc/svxacorr.cxx | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 9977667..d289098 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -220,7 +220,6 @@ static TransliterationWrapper& GetIgnoreTranslWrapper()
{
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 )
--
1.7.1
From 822dfa1a2d64e6205a6b35c82a52660d1bc59a4b Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Wed, 6 Oct 2010 20:50:09 +0200
Subject: [PATCH] Resolving issue 2838 of OOo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
---
cui/source/inc/autocdlg.hxx | 1 -
cui/source/tabpages/autocdlg.cxx | 16 ++++------------
2 files changed, 4 insertions(+), 13 deletions(-)
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..e04c896 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-------------------
@@ -1122,7 +1118,7 @@ BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
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);
@@ -1185,7 +1181,7 @@ BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
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);
@@ -1354,15 +1350,11 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
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);
}
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
