mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:inlinefields in SvxAutoCorrect

Browse Source 
Change-Id: I09aa52551dd1ed96bc9a72baec6afe5a4a05c1dd
Reviewed-on: https://gerrit.libreoffice.org/36346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-04-07 16:01:05 +02:00
parent 40d26609ef
commit dd700ceda7
2 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
editeng/source/misc/svxacorr.cxx
View File

@@ -298,8 +298,6 @@ SvxAutoCorrect::SvxAutoCorrect( const OUString& rShareAutocorrFile,
const OUString& rUserAutocorrFile ) const OUString& rUserAutocorrFile )
: sShareAutoCorrFile( rShareAutocorrFile ) : sShareAutoCorrFile( rShareAutocorrFile )
, sUserAutoCorrFile( rUserAutocorrFile ) , sUserAutoCorrFile( rUserAutocorrFile )
, m_pLangTable( new std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> )
, pCharClass( nullptr )
, bRunNext( false ) , bRunNext( false )
, eCharClassLang( LANGUAGE_DONTKNOW ) , eCharClassLang( LANGUAGE_DONTKNOW )
, nFlags(SvxAutoCorrect::GetDefaultFlags()) , nFlags(SvxAutoCorrect::GetDefaultFlags())
@@ -316,8 +314,6 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
: sShareAutoCorrFile( rCpy.sShareAutoCorrFile ) : sShareAutoCorrFile( rCpy.sShareAutoCorrFile )
, sUserAutoCorrFile( rCpy.sUserAutoCorrFile ) , sUserAutoCorrFile( rCpy.sUserAutoCorrFile )
, aSwFlags( rCpy.aSwFlags ) , aSwFlags( rCpy.aSwFlags )
, m_pLangTable( new std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> )
, pCharClass( nullptr )
, bRunNext( false ) , bRunNext( false )
, eCharClassLang(rCpy.eCharClassLang) , eCharClassLang(rCpy.eCharClassLang)
, nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)) , nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad))
@@ -333,14 +329,11 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
SvxAutoCorrect::~SvxAutoCorrect() SvxAutoCorrect::~SvxAutoCorrect()
{ {
delete m_pLangTable;
delete pCharClass;
} }
void SvxAutoCorrect::GetCharClass_( LanguageType eLang ) void SvxAutoCorrect::GetCharClass_( LanguageType eLang )
{ {
delete pCharClass; pCharClass.reset( new CharClass( LanguageTag( eLang)) );
pCharClass = new CharClass( LanguageTag( eLang));
eCharClassLang = eLang; eCharClassLang = eLang;
} }
@@ -1457,15 +1450,15 @@ SvxAutoCorrectLanguageLists& SvxAutoCorrect::GetLanguageList_(
LanguageType eLang ) LanguageType eLang )
{ {
LanguageTag aLanguageTag( eLang); LanguageTag aLanguageTag( eLang);
if (m_pLangTable->find(aLanguageTag) == m_pLangTable->end()) if (m_aLangTable.find(aLanguageTag) == m_aLangTable.end())
(void)CreateLanguageFile(aLanguageTag); (void)CreateLanguageFile(aLanguageTag);
return *(m_pLangTable->find(aLanguageTag)->second); return *(m_aLangTable.find(aLanguageTag)->second);
} }
void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang ) void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
{ {
auto const iter = m_pLangTable->find(LanguageTag(eLang)); auto const iter = m_aLangTable.find(LanguageTag(eLang));
if (iter != m_pLangTable->end() && iter->second) if (iter != m_aLangTable.end() && iter->second)
iter->second->SaveCplSttExceptList(); iter->second->SaveCplSttExceptList();
else else
{ {
@@ -1475,8 +1468,8 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang) void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
{ {
auto const iter = m_pLangTable->find(LanguageTag(eLang)); auto const iter = m_aLangTable.find(LanguageTag(eLang));
if (iter != m_pLangTable->end() && iter->second) if (iter != m_aLangTable.end() && iter->second)
iter->second->SaveWrdSttExceptList(); iter->second->SaveWrdSttExceptList();
else else
{ {
@@ -1490,17 +1483,17 @@ bool SvxAutoCorrect::AddCplSttException( const OUString& rNew,
{ {
SvxAutoCorrectLanguageLists* pLists = nullptr; SvxAutoCorrectLanguageLists* pLists = nullptr;
// either the right language is present or it will be this in the general list // either the right language is present or it will be this in the general list
auto iter = m_pLangTable->find(LanguageTag(eLang)); auto iter = m_aLangTable.find(LanguageTag(eLang));
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
pLists = iter->second.get(); pLists = iter->second.get();
else else
{ {
LanguageTag aLangTagUndetermined( LANGUAGE_UNDETERMINED); LanguageTag aLangTagUndetermined( LANGUAGE_UNDETERMINED);
iter = m_pLangTable->find(aLangTagUndetermined); iter = m_aLangTable.find(aLangTagUndetermined);
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
pLists = iter->second.get(); pLists = iter->second.get();
else if(CreateLanguageFile(aLangTagUndetermined)) else if(CreateLanguageFile(aLangTagUndetermined))
pLists = m_pLangTable->find(aLangTagUndetermined)->second.get(); pLists = m_aLangTable.find(aLangTagUndetermined)->second.get();
} }
OSL_ENSURE(pLists, "No auto correction data"); OSL_ENSURE(pLists, "No auto correction data");
return pLists && pLists->AddToCplSttExceptList(rNew); return pLists && pLists->AddToCplSttExceptList(rNew);
@@ -1512,17 +1505,17 @@ bool SvxAutoCorrect::AddWrtSttException( const OUString& rNew,
{ {
SvxAutoCorrectLanguageLists* pLists = nullptr; SvxAutoCorrectLanguageLists* pLists = nullptr;
//either the right language is present or it is set in the general list //either the right language is present or it is set in the general list
auto iter = m_pLangTable->find(LanguageTag(eLang)); auto iter = m_aLangTable.find(LanguageTag(eLang));
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
pLists = iter->second.get(); pLists = iter->second.get();
else else
{ {
LanguageTag aLangTagUndetermined( LANGUAGE_UNDETERMINED); LanguageTag aLangTagUndetermined( LANGUAGE_UNDETERMINED);
iter = m_pLangTable->find(aLangTagUndetermined); iter = m_aLangTable.find(aLangTagUndetermined);
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
pLists = iter->second.get(); pLists = iter->second.get();
else if(CreateLanguageFile(aLangTagUndetermined)) else if(CreateLanguageFile(aLangTagUndetermined))
pLists = m_pLangTable->find(aLangTagUndetermined)->second.get(); pLists = m_aLangTable.find(aLangTagUndetermined)->second.get();
} }
OSL_ENSURE(pLists, "No auto correction file!"); OSL_ENSURE(pLists, "No auto correction file!");
return pLists && pLists->AddToWrdSttExceptList(rNew); return pLists && pLists->AddToWrdSttExceptList(rNew);
@@ -1575,7 +1568,7 @@ bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool bNewFile ) bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool bNewFile )
{ {
OSL_ENSURE(m_pLangTable->find(rLanguageTag) == m_pLangTable->end(), "Language already exists "); OSL_ENSURE(m_aLangTable.find(rLanguageTag) == m_aLangTable.end(), "Language already exists ");
OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true )); OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true ));
OUString sShareDirFile( sUserDirFile ); OUString sShareDirFile( sUserDirFile );
@@ -1596,7 +1589,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
sShareDirFile = sUserDirFile; sShareDirFile = sUserDirFile;
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile ); pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const reference LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const reference
m_pLangTable->insert(std::make_pair(aTmp, std::unique_ptr<SvxAutoCorrectLanguageLists>(pLists))); m_aLangTable.insert(std::make_pair(aTmp, std::unique_ptr<SvxAutoCorrectLanguageLists>(pLists)));
aLastFileTable.erase(nFndPos); aLastFileTable.erase(nFndPos);
} }
} }
@@ -1612,7 +1605,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
{ {
pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile ); pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, sUserDirFile );
LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const reference LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const reference
m_pLangTable->insert(std::make_pair(aTmp, std::unique_ptr<SvxAutoCorrectLanguageLists>(pLists))); m_aLangTable.insert(std::make_pair(aTmp, std::unique_ptr<SvxAutoCorrectLanguageLists>(pLists)));
if (nFndPos != aLastFileTable.end()) if (nFndPos != aLastFileTable.end())
aLastFileTable.erase(nFndPos); aLastFileTable.erase(nFndPos);
} }
@@ -1627,11 +1620,11 @@ bool SvxAutoCorrect::PutText( const OUString& rShort, const OUString& rLong,
LanguageType eLang ) LanguageType eLang )
{ {
LanguageTag aLanguageTag( eLang); LanguageTag aLanguageTag( eLang);
auto const iter = m_pLangTable->find(aLanguageTag); auto const iter = m_aLangTable.find(aLanguageTag);
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
return iter->second->PutText(rShort, rLong); return iter->second->PutText(rShort, rLong);
if(CreateLanguageFile(aLanguageTag)) if(CreateLanguageFile(aLanguageTag))
return m_pLangTable->find(aLanguageTag)->second->PutText(rShort, rLong); return m_aLangTable.find(aLanguageTag)->second->PutText(rShort, rLong);
return false; return false;
} }
@@ -1640,14 +1633,14 @@ void SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntr
LanguageType eLang ) LanguageType eLang )
{ {
LanguageTag aLanguageTag( eLang); LanguageTag aLanguageTag( eLang);
auto const iter = m_pLangTable->find(aLanguageTag); auto const iter = m_aLangTable.find(aLanguageTag);
if (iter != m_pLangTable->end()) if (iter != m_aLangTable.end())
{ {
iter->second->MakeCombinedChanges( aNewEntries, aDeleteEntries ); iter->second->MakeCombinedChanges( aNewEntries, aDeleteEntries );
} }
else if(CreateLanguageFile( aLanguageTag )) else if(CreateLanguageFile( aLanguageTag ))
{ {
m_pLangTable->find( aLanguageTag )->second->MakeCombinedChanges( aNewEntries, aDeleteEntries ); m_aLangTable.find( aLanguageTag )->second->MakeCombinedChanges( aNewEntries, aDeleteEntries );
} }
} }
@@ -1729,10 +1722,10 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
// First search for eLang, then US-English -> English // First search for eLang, then US-English -> English
// and last in LANGUAGE_UNDETERMINED // and last in LANGUAGE_UNDETERMINED
if (m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || CreateLanguageFile(aLanguageTag, false)) if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_pLangTable->find(aLanguageTag)->second; std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_aLangTable.find(aLanguageTag)->second;
pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos ); pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos );
if( pRet ) if( pRet )
{ {
@@ -1747,11 +1740,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
aLanguageTag.reset(aLanguageTag.getLanguage()); aLanguageTag.reset(aLanguageTag.getLanguage());
LanguageType nTmpKey = aLanguageTag.getLanguageType(false); LanguageType nTmpKey = aLanguageTag.getLanguageType(false);
if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED && if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED &&
(m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false))) CreateLanguageFile(aLanguageTag, false)))
{ {
//the language is available - so bring it on //the language is available - so bring it on
std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_pLangTable->find(aLanguageTag)->second; std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_aLangTable.find(aLanguageTag)->second;
pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos ); pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos );
if( pRet ) if( pRet )
{ {
@@ -1760,11 +1753,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
} }
} }
if (m_pLangTable->find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_pLangTable->end() || if (m_aLangTable.find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false)) CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_pLangTable->find(aLanguageTag)->second; std::unique_ptr<SvxAutoCorrectLanguageLists> const& pList = m_aLangTable.find(aLanguageTag)->second;
pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos ); pRet = lcl_SearchWordsInList( pList.get(), rTxt, rStt, nEndPos );
if( pRet ) if( pRet )
{ {
@@ -1785,10 +1778,10 @@ bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
// First search for eLang, then primary language of eLang // First search for eLang, then primary language of eLang
// and last in LANGUAGE_UNDETERMINED // and last in LANGUAGE_UNDETERMINED
if (m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || CreateLanguageFile(aLanguageTag, false)) if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
auto const& pList = m_pLangTable->find(aLanguageTag)->second; auto const& pList = m_aLangTable.find(aLanguageTag)->second;
if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() ) if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() )
return true; return true;
} }
@@ -1798,20 +1791,20 @@ bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
aLanguageTag.reset(aLanguageTag.getLanguage()); aLanguageTag.reset(aLanguageTag.getLanguage());
LanguageType nTmpKey = aLanguageTag.getLanguageType(false); LanguageType nTmpKey = aLanguageTag.getLanguageType(false);
if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED && if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED &&
(m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false))) CreateLanguageFile(aLanguageTag, false)))
{ {
//the language is available - so bring it on //the language is available - so bring it on
auto const& pList = m_pLangTable->find(aLanguageTag)->second; auto const& pList = m_aLangTable.find(aLanguageTag)->second;
if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() ) if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() )
return true; return true;
} }
if (m_pLangTable->find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_pLangTable->end() || if (m_aLangTable.find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false)) CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
auto const& pList = m_pLangTable->find(aLanguageTag)->second; auto const& pList = m_aLangTable.find(aLanguageTag)->second;
if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() ) if(pList->GetWrdSttExceptList()->find(sWord) != pList->GetWrdSttExceptList()->end() )
return true; return true;
} }
@@ -1862,10 +1855,10 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
// First search for eLang, then primary language of eLang // First search for eLang, then primary language of eLang
// and last in LANGUAGE_UNDETERMINED // and last in LANGUAGE_UNDETERMINED
if (m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || CreateLanguageFile(aLanguageTag, false)) if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
const SvStringsISortDtor* pList = m_pLangTable->find(aLanguageTag)->second->GetCplSttExceptList(); const SvStringsISortDtor* pList = m_aLangTable.find(aLanguageTag)->second->GetCplSttExceptList();
if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() ) if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() )
return true; return true;
} }
@@ -1875,20 +1868,20 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
aLanguageTag.reset(aLanguageTag.getLanguage()); aLanguageTag.reset(aLanguageTag.getLanguage());
LanguageType nTmpKey = aLanguageTag.getLanguageType(false); LanguageType nTmpKey = aLanguageTag.getLanguageType(false);
if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED && if (nTmpKey != eLang && nTmpKey != LANGUAGE_UNDETERMINED &&
(m_pLangTable->find(aLanguageTag) != m_pLangTable->end() || (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false))) CreateLanguageFile(aLanguageTag, false)))
{ {
//the language is available - so bring it on //the language is available - so bring it on
const SvStringsISortDtor* pList = m_pLangTable->find(aLanguageTag)->second->GetCplSttExceptList(); const SvStringsISortDtor* pList = m_aLangTable.find(aLanguageTag)->second->GetCplSttExceptList();
if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() ) if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() )
return true; return true;
} }
if (m_pLangTable->find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_pLangTable->end() || if (m_aLangTable.find(aLanguageTag.reset(LANGUAGE_UNDETERMINED)) != m_aLangTable.end() ||
CreateLanguageFile(aLanguageTag, false)) CreateLanguageFile(aLanguageTag, false))
{ {
//the language is available - so bring it on //the language is available - so bring it on
const SvStringsISortDtor* pList = m_pLangTable->find(aLanguageTag)->second->GetCplSttExceptList(); const SvStringsISortDtor* pList = m_aLangTable.find(aLanguageTag)->second->GetCplSttExceptList();
if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() ) if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : pList->find(sWord) != pList->end() )
return true; return true;
} }

4
include/editeng/svxacorr.hxx
View File

@@ -232,9 +232,9 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags
// all languages in a table // all languages in a table
std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>>* m_pLangTable; std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> m_aLangTable;
std::map<LanguageTag, long> aLastFileTable; std::map<LanguageTag, long> aLastFileTable;
CharClass* pCharClass; std::unique_ptr<CharClass> pCharClass;
bool bRunNext; bool bRunNext;