From 0031210b26bfae38be4243f9c92d90fa213b9eb0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 25 Jul 2012 12:07:33 +0200 Subject: autocomplete: replace horrible use of SvStringsISortDtor... ... to store not Strings but derived SwAutoCompleteStrings with something far saner: an abstract base class with virtual dtor. Change-Id: I7d966f385dd41154ee1c4cdb43b56ff1aace9b5e --- sw/source/ui/app/docsh2.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/ui/app/docsh2.cxx') diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 32ee54712484..6138d48be0d3 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -642,8 +642,8 @@ void SwDocShell::Execute(SfxRequest& rReq) rACW.SetLockWordLstLocked( true ); - SvStringsISortDtor aTmpLst( rACW.GetWordList() ); - pAFlags->pAutoCmpltList = &aTmpLst; + editeng::SortedAutoCompleteStrings aTmpLst( rACW.GetWordList() ); + pAFlags->m_pAutoCompleteList = &aTmpLst; SfxApplication* pApp = SFX_APP(); SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool()); @@ -670,11 +670,11 @@ void SwDocShell::Execute(SfxRequest& rReq) SwEditShell::SetAutoFmtFlags( pAFlags ); rACW.SetMinWordLen( pAFlags->nAutoCmpltWordLen ); rACW.SetMaxCount( pAFlags->nAutoCmpltListLen ); - if( pAFlags->pAutoCmpltList ) // any changes? + if (pAFlags->m_pAutoCompleteList) // any changes? { rACW.CheckChangedList( aTmpLst ); // clear the temp WordList pointer - pAFlags->pAutoCmpltList = 0; + pAFlags->m_pAutoCompleteList = 0; } // remove all pointer we never delete the strings aTmpLst.clear(); -- cgit