summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-03-21 19:12:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-03-22 11:47:36 +0100
commit8ef4dc07cd4413253b5747dd714fadd548d6bcf6 (patch)
treead51fde4a825d0a918a87719ef3a5e55d6ba50cb /sc
parente136900e7a971385be9367a3dcaedea54d1e7207 (diff)
improve loplugin:staticmethods
Some of the exclusions were too aggressive. Restrict them to only the important classes, which exposes some more places this plugin applies. Change-Id: I1b2d1fb24391adc71ed0984f94168f61a149479f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165154 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/table6.cxx2
-rw-r--r--sc/source/ui/docshell/docsh2.cxx8
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx4
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx12
4 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index a6b03f6b3d8d..243783c55d2e 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -185,7 +185,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, sc::Colum
OUString sReplStr = rSearchItem.GetReplaceString();
if (rSearchItem.GetRegExp())
{
- pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult );
+ utl::TextSearch::ReplaceBackReferences( sReplStr, aString, aSearchResult );
OUStringBuffer aStrBuffer(aString);
aStrBuffer.remove(nStart, nEnd-nStart+1);
aStrBuffer.insert(nStart, sReplStr);
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index c414bb34badd..cf5a1dfc770c 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -127,7 +127,7 @@ void ScDocShell::InitItems()
if (!m_pDocument->GetForbiddenCharacters())
{
// set forbidden characters if necessary
- const uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales();
+ const uno::Sequence<lang::Locale> aLocales = SvxAsianConfig::GetStartEndCharLocales();
if (aLocales.hasElements())
{
std::shared_ptr<SvxForbiddenCharactersTable> xForbiddenTable(
@@ -136,7 +136,7 @@ void ScDocShell::InitItems()
for (const lang::Locale& rLocale : aLocales)
{
i18n::ForbiddenCharacters aForbidden;
- aAsian.GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine );
+ SvxAsianConfig::GetStartEndChars( rLocale, aForbidden.beginLine, aForbidden.endLine );
LanguageType eLang = LanguageTag::convertToLanguageType(rLocale);
xForbiddenTable->SetForbiddenCharacters( eLang, aForbidden );
@@ -149,13 +149,13 @@ void ScDocShell::InitItems()
if ( !m_pDocument->IsValidAsianCompression() )
{
// set compression mode from configuration if not already set (e.g. XML import)
- m_pDocument->SetAsianCompression( aAsian.GetCharDistanceCompression() );
+ m_pDocument->SetAsianCompression( SvxAsianConfig::GetCharDistanceCompression() );
}
if ( !m_pDocument->IsValidAsianKerning() )
{
// set asian punctuation kerning from configuration if not already set (e.g. XML import)
- m_pDocument->SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed
+ m_pDocument->SetAsianKerning( !SvxAsianConfig::IsKerningWesternTextOnly() ); // reversed
}
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index aaf1c566a403..38284c60950f 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2071,7 +2071,7 @@ static void lcl_SetCellProperty( const SfxItemPropertyMapEntry& rEntry, const un
break;
default:
{
- lcl_GetCellsPropertySet()->setPropertyValue(rEntry, rValue, rSet);
+ SfxItemPropertySet::setPropertyValue(rEntry, rValue, rSet);
}
}
}
@@ -2343,7 +2343,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntr
}
break;
default:
- pPropSet->getPropertyValue(*pEntry, *pDataSet, rAny);
+ SfxItemPropertySet::getPropertyValue(*pEntry, *pDataSet, rAny);
}
}
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index beef2e67f41b..b0335697e7f1 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1335,7 +1335,7 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( std::u16string_view aPropertyName
}
break;
default:
- pPropSet->getPropertyValue( *pResultEntry, *pItemSet, aAny );
+ SfxItemPropertySet::getPropertyValue( *pResultEntry, *pItemSet, aAny );
}
}
else if ( IsScUnoWid( nWhich ) )
@@ -1552,7 +1552,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const
{
SvxSetItem aNewHeader( rSet.Get(ATTR_PAGE_HEADERSET) );
if (pValue)
- pPropSet->setPropertyValue( *pHeaderEntry, *pValue, aNewHeader.GetItemSet() );
+ SfxItemPropertySet::setPropertyValue( *pHeaderEntry, *pValue, aNewHeader.GetItemSet() );
else
aNewHeader.GetItemSet().ClearItem( pHeaderEntry->nWID );
rSet.Put( aNewHeader );
@@ -1566,7 +1566,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const
{
SvxSetItem aNewFooter( rSet.Get(ATTR_PAGE_FOOTERSET) );
if (pValue)
- pPropSet->setPropertyValue( *pFooterEntry, *pValue, aNewFooter.GetItemSet() );
+ SfxItemPropertySet::setPropertyValue( *pFooterEntry, *pValue, aNewFooter.GetItemSet() );
else
aNewFooter.GetItemSet().ClearItem( pFooterEntry->nWID );
rSet.Put( aNewFooter );
@@ -1747,7 +1747,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const
{
rSet.Put(rSet.Get(pEntry->nWID));
}
- pPropSet->setPropertyValue(*pEntry, *pValue, rSet);
+ SfxItemPropertySet::setPropertyValue(*pEntry, *pValue, rSet);
}
}
else
@@ -1970,10 +1970,10 @@ uno::Any ScStyleObj::getPropertyValue_Impl( std::u16string_view aPropertyName )
{
SfxItemSet aNoEmptySet( *pItemSet );
aNoEmptySet.Put( aNoEmptySet.Get( nWhich ) );
- pPropSet->getPropertyValue( *pResultEntry, aNoEmptySet, aAny );
+ SfxItemPropertySet::getPropertyValue( *pResultEntry, aNoEmptySet, aAny );
}
else
- pPropSet->getPropertyValue( *pResultEntry, *pItemSet, aAny );
+ SfxItemPropertySet::getPropertyValue( *pResultEntry, *pItemSet, aAny );
}
}
else if ( IsScUnoWid( nWhich ) )