summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-04-04 11:14:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-05-05 12:57:00 +0200
commit9f1701d01d9f664828356976d8592492f85b30f5 (patch)
treea91eaef0674591af87b06096fdd186283559a8de /sfx2
parentb8bb44161aeb6e00526a38343b63e678ce7d4a1a (diff)
use more o3tl::getToken
found by inspecting call sites of OUString::getToken Change-Id: I4269c7476c7aa46fac39528227e350568f0eb34a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132644 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8618126e0b5f..701369f378c7 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1341,7 +1341,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
{
sal_Int32 nIdx = 0;
OUString aTitle = rRow.getToken( 0, '\t', nIdx ); // token 0
- OUString aURL = rRow.getToken( 1, '\t', nIdx ); // token 2
+ std::u16string_view aURL = o3tl::getToken(rRow, 1, '\t', nIdx ); // token 2
OUString aFactory(INetURLObject(aURL).GetHost());
m_xActiveLB->append(aFactory, aTitle);
}
@@ -2262,7 +2262,7 @@ void SfxHelpWindow_Impl::LoadConfig()
DBG_ASSERT( comphelper::string::getTokenCount(aUserData, ';') == 6, "invalid user data" );
sal_Int32 nIdx = 0;
nIndexSize = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx ));
- aUserData.getToken(0, ';', nIdx); // ignore nTextSize
+ o3tl::getToken(aUserData, 0, ';', nIdx); // ignore nTextSize
sal_Int32 nOldWidth = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx ));
sal_Int32 nOldHeight = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx ));
aWinSize = Size(nOldWidth, nOldHeight);
@@ -2327,18 +2327,18 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, LinkParamNone*, void)
sHelpURL = aEntry;
else
{
- OUString aId;
+ std::u16string_view aId;
OUString aAnchor('#');
if ( comphelper::string::getTokenCount(aEntry, '#') == 2 )
{
sal_Int32 nIdx{ 0 };
- aId = aEntry.getToken( 0, '#', nIdx );
+ aId = o3tl::getToken(aEntry, 0, '#', nIdx );
aAnchor += o3tl::getToken(aEntry, 0, '#', nIdx );
}
else
aId = aEntry;
- sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), OUStringConcatenation("/" + aId), aAnchor);
+ sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), OUStringConcatenation(OUString::Concat("/") + aId), aAnchor);
}
loadHelpContent(sHelpURL);