diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-04-17 11:50:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:15 +0100 |
| commit | 58a825b4d047c0f99d4f9a193c97af423b23fb97 (patch) | |
| tree | 148c1908c2153f7ba39e8f69ae4900a9fa4e598e /sw/source | |
| parent | 95b4b0f3e26c049cf04400ffc05bf3ccbdf85b9d (diff) | |
Resolves: #i122025# UNO commands introduced with sidebar
apply labels and disable their UI customization
(cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/inc/svx/svxids.hrc
svx/sdi/svx.sdi
sw/sdi/swriter.sdi
Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb
Related: #i122025# followup - remove usage of removed Slot
(cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac)
Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/shells/frmsh.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/shells/grfsh.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 4422916e0400..0755f0e2cdb0 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -399,7 +399,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) break; case FN_FORMAT_FRAME_DLG: - case FN_PROPERTY_WRAP_DLG: + case FN_DRAW_WRAP_DLG: { const int nSel = rSh.GetSelectionType(); if (nSel & nsSelectionType::SEL_GRF) @@ -483,7 +483,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) nDefPage); OSL_ENSURE(pDlg, "Dialogdiet fail!"); - if ( nSlot == FN_PROPERTY_WRAP_DLG ) + if ( nSlot == FN_DRAW_WRAP_DLG ) { pDlg->SetCurPageId(TP_FRM_WRAP); } diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 585b8fd29ba3..715363b1f4e8 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -179,7 +179,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) break; case SID_INSERT_GRAPHIC: case FN_FORMAT_GRAFIC_DLG: - case FN_PROPERTY_WRAP_DLG: + case FN_DRAW_WRAP_DLG: { SwFlyFrmAttrMgr aMgr( sal_False, &rSh, rSh.IsFrmSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF); @@ -294,7 +294,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet, sal_False, DLG_FRM_GRF); OSL_ENSURE(pDlg, "Dialogdiet fail!"); - if (nSlot == FN_PROPERTY_WRAP_DLG) + if (nSlot == FN_DRAW_WRAP_DLG) pDlg->SetCurPageId(TP_FRM_WRAP); if( pDlg->Execute() ) |