strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flatten SvxForbiddenChars_Impl and associated map

Browse source 
std::map is a node-based datastructure, and ForbiddenCharacters only
contains two ref-counted string data types. No need for all this
indirection.

Change-Id: Ib4fa49e60557c7e5c41bb73ebeb23c4db6d33406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148179
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2023-03-03 15:08:28 +02:00
parent cdfc95ab0e
commit 43da51e9f6
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cui/source/options/optasian.cxx
View file

@ -50,7 +50,7 @@ namespace {
struct SvxForbiddenChars_Impl
{
bool bRemoved;
std::unique_ptr<ForbiddenCharacters> pCharacters;
std::optional<ForbiddenCharacters> oCharacters;
};
}
@ -63,12 +63,12 @@ struct SvxAsianLayoutPage_Impl
Reference< XForbiddenCharacters > xForbidden;
Reference< XPropertySet > xPrSet;
Reference< XPropertySetInfo > xPrSetInfo;
std::map< LanguageType, std::unique_ptr<SvxForbiddenChars_Impl> >
std::map< LanguageType, SvxForbiddenChars_Impl >
aChangedLanguagesMap;
bool hasForbiddenCharacters(LanguageType eLang);
SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang);
void addForbiddenCharacters(LanguageType eLang, std::unique_ptr<ForbiddenCharacters> pForbidden);
void addForbiddenCharacters(LanguageType eLang, std::optional<ForbiddenCharacters> oForbidden);
};
bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
@ -81,25 +81,25 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language
auto it = aChangedLanguagesMap.find( eLang );
DBG_ASSERT( ( it != aChangedLanguagesMap.end() ), "language not available");
if( it != aChangedLanguagesMap.end() )
return it->second.get();
return &it->second;
return nullptr;
}
void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
LanguageType eLang, std::unique_ptr<ForbiddenCharacters> pForbidden)
LanguageType eLang, std::optional<ForbiddenCharacters> oForbidden)
{
auto itOld = aChangedLanguagesMap.find( eLang );
if( itOld == aChangedLanguagesMap.end() )
{
std::unique_ptr<SvxForbiddenChars_Impl> pChar(new SvxForbiddenChars_Impl);
pChar->bRemoved = nullptr == pForbidden;
pChar->pCharacters = std::move(pForbidden);
aChangedLanguagesMap.emplace( eLang, std::move(pChar) );
SvxForbiddenChars_Impl aChar;
aChar.bRemoved = !oForbidden.has_value();
aChar.oCharacters = std::move(oForbidden);
aChangedLanguagesMap.emplace( eLang, std::move(aChar) );
}
else
{
itOld->second->bRemoved = nullptr == pForbidden;
itOld->second->pCharacters = std::move(pForbidden);
itOld->second.bRemoved = !oForbidden.has_value();
itOld->second.oCharacters = std::move(oForbidden);
}
}
@ -175,10 +175,10 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
for (auto const& changedLanguage : pImpl->aChangedLanguagesMap)
{
Locale aLocale( LanguageTag::convertToLocale(changedLanguage.first));
if(changedLanguage.second->bRemoved)
if(changedLanguage.second.bRemoved)
pImpl->xForbidden->removeForbiddenCharacters( aLocale );
else if(changedLanguage.second->pCharacters)
pImpl->xForbidden->setForbiddenCharacters( aLocale, *( changedLanguage.second->pCharacters ) );
else if(changedLanguage.second.oCharacters)
pImpl->xForbidden->setForbiddenCharacters( aLocale, *( changedLanguage.second.oCharacters ) );
}
}
catch (const Exception&)
@ -286,14 +286,14 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, weld::ComboBox&, void)
if(bAvail)
{
SvxForbiddenChars_Impl* pElement = pImpl->getForbiddenCharacters(eSelectLanguage);
if(pElement->bRemoved || !pElement->pCharacters)
if(pElement->bRemoved || !pElement->oCharacters)
{
bAvail = false;
}
else
{
sStart = pElement->pCharacters->beginLine;
sEnd = pElement->pCharacters->endLine;
sStart = pElement->oCharacters->beginLine;
sEnd = pElement->oCharacters->endLine;
}
}
else
@ -358,13 +358,13 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, weld::Entry&, rEdit, void)
{
if(bEnable)
{
std::unique_ptr<ForbiddenCharacters> pFCSet(new ForbiddenCharacters);
pFCSet->beginLine = sStart;
pFCSet->endLine = sEnd;
pImpl->addForbiddenCharacters(eSelectLanguage, std::move(pFCSet));
ForbiddenCharacters aFCSet;
aFCSet.beginLine = sStart;
aFCSet.endLine = sEnd;
pImpl->addForbiddenCharacters(eSelectLanguage, std::move(aFCSet));
}
else
pImpl->addForbiddenCharacters(eSelectLanguage, nullptr);
pImpl->addForbiddenCharacters(eSelectLanguage, std::nullopt);
}
catch (const Exception&)
{