[Libreoffice-commits] core.git: 2 commits - cui/source sw/source

[Libreoffice Gerrit user]

 cui/source/options/webconninfo.cxx |    4 ----
 sw/source/ui/misc/glosbib.cxx      |   12 +++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 1b347e2688e87c79063f2492fdaea8cd824d6a5b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 4 16:58:08 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 4 22:00:38 2019 +0100

    click handlers set twice
    
    Change-Id: I2b44673330b952b0dc28a8cb321541ee9f944699
    Reviewed-on: https://gerrit.libreoffice.org/67373
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 237ded056a45..18a2cd7fbca9 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -120,10 +120,6 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
     pPasswordsLBContainer->set_height_request(m_pPasswordsLB->GetTextHeight()*8);
 
     m_pPasswordsLB->SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) );
-    m_pRemoveBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemovePasswordHdl ) );
-    m_pRemoveAllBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemoveAllPasswordsHdl ) );
-    m_pChangeBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) );
-
 
     FillPasswordList();
 
commit d166dc5a1a5962411026a362c3552ecc4660c1dd
Author:     Matteo Casalin <matteo.casalin at yahoo.com>
AuthorDate: Sun Jan 27 20:17:43 2019 +0100
Commit:     Matteo Casalin <matteo.casalin at yahoo.com>
CommitDate: Mon Feb 4 22:00:29 2019 +0100

    Use indexed getToken()
    
    Change-Id: I84b75dcc2e5b32fe456c1ecd1a8524d4fb25ebc7
    Reviewed-on: https://gerrit.libreoffice.org/67312
    Tested-by: Jenkins
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index d32df5c3e2d8..aa47f32c06d4 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -147,7 +147,8 @@ void SwGlossaryGroupDlg::Apply()
 
     for (const auto& removedStr : m_RemovedArr)
     {
-        const OUString sDelGroup = removedStr.getToken(0, '\t');
+        sal_Int32 nIdx{ 0 };
+        const OUString sDelGroup = removedStr.getToken(0, '\t', nIdx);
         if( sDelGroup == aActGroup )
         {
             //when the current group is deleted, the current group has to be relocated
@@ -157,7 +158,7 @@ void SwGlossaryGroupDlg::Apply()
                 pGlosHdl->SetCurGroup(pUserData->sGroupName);
             }
         }
-        OUString sTitle( removedStr.getToken(1, '\t') );
+        OUString sTitle( removedStr.getToken(0, '\t', nIdx) );
         const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1)
                             + sTitle
                             + SwResId(STR_QUERY_DELETE_GROUP2));
@@ -172,9 +173,10 @@ void SwGlossaryGroupDlg::Apply()
     //don't rename before there was one
     for (auto it(m_RenamedArr.cbegin()); it != m_RenamedArr.cend(); ++it)
     {
-        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));
+        sal_Int32 nIdx{ 0 };
+        OUString const sOld(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
+        OUString sNew(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
+        OUString const sTitle(it->getToken(0, RENAME_TOKEN_DELIM, nIdx));
         pGlosHdl->RenameGroup(sOld, sNew, sTitle);
         if (it == m_RenamedArr.begin())
         {