diff options
Diffstat (limited to 'sw/source/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 3ddd08d14b6d..257e9c4a052f 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -22,6 +22,7 @@ #include <svl/stritem.hxx> #include <unotools/viewoptions.hxx> #include <vcl/weld.hxx> +#include <o3tl/string_view.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <officecfg/Office/Common.hxx> @@ -501,7 +502,7 @@ OUString BookmarkTable::GetNameProposal() const sw::mark::IMark* pBookmark = weld::fromId<sw::mark::IMark*>(m_xControl->get_id(i)); const OUString& sName = pBookmark->GetName(); sal_Int32 nIndex = 0; - if (sName.getToken(0, ' ', nIndex) == sDefaultBookmarkName) + if (o3tl::getToken(sName, 0, ' ', nIndex) == sDefaultBookmarkName) { sal_Int32 nCurrBookmarkId = sName.getToken(0, ' ', nIndex).toInt32(); nHighestBookmarkId = std::max<sal_Int32>(nHighestBookmarkId, nCurrBookmarkId); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 74e81a87f9e1..76ab41f80bb4 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -24,6 +24,7 @@ #include <unotools/tempfile.hxx> #include <unotools/pathoptions.hxx> #include <osl/diagnose.h> +#include <o3tl/string_view.hxx> #include <swtypes.hxx> #include <glosbib.hxx> @@ -151,7 +152,7 @@ void SwGlossaryGroupDlg::Apply() } } const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1) - + removedStr.getToken(0, '\t', nIdx) + + o3tl::getToken(removedStr, 0, '\t', nIdx) + SwResId(STR_QUERY_DELETE_GROUP2)); std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(m_pParent, @@ -265,7 +266,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, weld::Button&, rButton, void ) if(bDelete) { it = std::find_if(m_RenamedArr.begin(), m_RenamedArr.end(), - [&sEntry](OUString& s) { return s.getToken(0, RENAME_TOKEN_DELIM) == sEntry; }); + [&sEntry](OUString& s) { return o3tl::getToken(s, 0, RENAME_TOKEN_DELIM) == sEntry; }); if (it != m_RenamedArr.end()) { m_RenamedArr.erase(it); |