[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source

[Caolán McNamara]

 svx/source/dialog/imapdlg.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a8f791ec013d9b703d12eb9f045e42d9b0e8bd1f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 25 13:39:18 2017 +0100

    fix image map item ids
    
    broken since...
    
    commit 4bbf35572d94efe8b321e3159e9810f52bc3f9f8
    Date:   Mon Jul 7 11:24:48 2014 +0200
    
        RID_SVXDLG_IMAP conversion to .ui
    
    Change-Id: Ic08b82af0b8890fb910153c87fb170618d95f34f
    Reviewed-on: https://gerrit.libreoffice.org/40407
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8afc2c14e5f9..cb14538ae6c9 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -399,8 +399,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void )
     else if(nNewItemId == mnActiveId)
     {
         URLLoseFocusHdl( *m_pURLBox );
-        bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
-        pTbx->CheckItem( TBI_ACTIVE, bNewState );
+        bool bNewState = !pTbx->IsItemChecked(mnActiveId);
+        pTbx->CheckItem(mnActiveId, bNewState);
         pIMapWnd->SetCurrentObjState( !bNewState );
     }
     else if(nNewItemId == mnMacroId)
@@ -410,8 +410,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void )
     else if(nNewItemId == mnPolyEditId)
     {
         SetActiveTool( nNewItemId );
-        pIMapWnd->SetPolyEditMode( pTbx->IsItemChecked( TBI_POLYEDIT ) ? SID_BEZIER_MOVE : 0 );
-        if( pTbx->IsKeyEvent() && pTbx->IsItemChecked( TBI_POLYEDIT ) )
+        pIMapWnd->SetPolyEditMode( pTbx->IsItemChecked(mnPolyEditId) ? SID_BEZIER_MOVE : 0 );
+        if( pTbx->IsKeyEvent() && pTbx->IsItemChecked(mnPolyEditId) )
             pIMapWnd->StartPolyEdit();
     }
     else if(nNewItemId == mnPolyMoveId)
@@ -567,8 +567,8 @@ void SvxIMapDlg::SetActiveTool( sal_uInt16 nId )
 
     bool bMove = mnPolyMoveId == nId
                 || ( mnPolyEditId == nId
-                && !m_pTbxIMapDlg1->IsItemChecked( TBI_POLYINSERT )
-                && !m_pTbxIMapDlg1->IsItemChecked( TBI_POLYDELETE ) );
+                && !m_pTbxIMapDlg1->IsItemChecked(mnPolyInsertId)
+                && !m_pTbxIMapDlg1->IsItemChecked(mnPolyDeleteId) );
 
     m_pTbxIMapDlg1->CheckItem( mnPolyMoveId, bMove );