svx/source/dialog/imapdlg.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 07838a39305d0ea95a43766cdeee53545ad80cec Author: Caolán McNamara <caol...@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/40405 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 6c6cb6467bf9..f79cb383c7ce 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -405,8 +405,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) @@ -416,8 +416,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) @@ -573,8 +573,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 );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits