diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-07-25 20:31:37 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-31 09:58:41 +0000 |
| commit | de7529b38f8ea9ee8198de1d82525a68cc6e89b8 (patch) | |
| tree | 4adb39c65a406d005bff5fb4fd0bee24bfdcb7fa /sw/source/ui | |
| parent | e1c2cb7dc89753c81618a6e4ce95dd9b0d43782f (diff) | |
Do not use deprecated comphelper::string::getToken
Change-Id: I35caf7a7806a36a7e0a8d4440e68bd682074136c
Reviewed-on: https://gerrit.libreoffice.org/5184
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 5b18557a334b..a6019e66da74 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <vcl/msgbox.hxx> @@ -128,8 +127,7 @@ void SwGlossaryGroupDlg::Apply() for (OUVector_t::const_iterator it(m_RemovedArr.begin()); it != m_RemovedArr.end(); ++it) { - const String sDelGroup = - ::comphelper::string::getToken(*it, 0, '\t'); + const String sDelGroup = it->getToken(0, '\t'); if( sDelGroup == aActGroup ) { //when the current group is deleted, the current group has to be relocated @@ -141,7 +139,7 @@ void SwGlossaryGroupDlg::Apply() } } String sMsg(SW_RES(STR_QUERY_DELETE_GROUP1)); - String sTitle( ::comphelper::string::getToken(*it, 1, '\t') ); + String sTitle( it->getToken(1, '\t') ); if(sTitle.Len()) sMsg += sTitle; else @@ -156,12 +154,9 @@ void SwGlossaryGroupDlg::Apply() for (OUVector_t::const_iterator it(m_RenamedArr.begin()); it != m_RenamedArr.end(); ++it) { - OUString const sOld( - ::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM)); - OUString sNew( - ::comphelper::string::getToken(*it, 1, RENAME_TOKEN_DELIM)); - OUString const sTitle( - ::comphelper::string::getToken(*it, 2, RENAME_TOKEN_DELIM)); + OUString const sOld(it->getToken(0, RENAME_TOKEN_DELIM)); + OUString sNew(it->getToken(1, RENAME_TOKEN_DELIM)); + OUString const sTitle(it->getToken(2, RENAME_TOKEN_DELIM)); pGlosHdl->RenameGroup(sOld, sNew, sTitle); if (it == m_RenamedArr.begin()) { @@ -259,8 +254,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) for (OUVector_t::iterator it(m_RenamedArr.begin()); it != m_RenamedArr.end(); ++it) { - if (::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM) - == sEntry) + if (it->getToken(0, RENAME_TOKEN_DELIM) == sEntry) { m_RenamedArr.erase(it); bDelete = false; |