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 /svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | |
| 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 'svx/source/sidebar/paragraph/ParaPropertyPanel.cxx')
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b68c7fd9dce0..36ce007af26b 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -923,37 +923,12 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) { case BT_TBX_INDENT_PROMOTE: { - SvxLRSpaceItem aMargin( SID_ATTR_PARA_RIGHT ); - - maTxtLeft += INDENT_STEP; - sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); - nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); - aMargin.SetTxtLeft( (const long)nVal ); - aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); - aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); - - GetBindings()->GetDispatcher()->Execute( - SID_ATTR_PARA_RIGHT, SFX_CALLMODE_RECORD, &aMargin, 0L); + GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SFX_CALLMODE_RECORD ); } break; case BT_TBX_INDENT_DEMOTE: { - if((maTxtLeft - INDENT_STEP) < 0) - maTxtLeft = DEFAULT_VALUE; - else - maTxtLeft -= INDENT_STEP; - - SvxLRSpaceItem aMargin( SID_ATTR_PARA_LEFT ); - - sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); - nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); - - aMargin.SetTxtLeft( (const long)nVal ); - aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); - aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); - - GetBindings()->GetDispatcher()->Execute( - SID_ATTR_PARA_LEFT, SFX_CALLMODE_RECORD, &aMargin, 0L); + GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SFX_CALLMODE_RECORD ); } break; case SD_HANGING_INDENT: @@ -963,8 +938,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) ); - GetBindings()->GetDispatcher()->Execute( - SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); + GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); } break; } |