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

3 files changed, 51 insertions, 155 deletions

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e2e9dd9dfda1..b793ca62e145 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3948,10 +3948,10 @@ SfxVoidItem FontDialog SID_CHAR_DLG
     Asynchron;
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -4411,55 +4411,6 @@ XFormTextStyleItem FontWorkTextStyle SID_FORMTEXT_STYLE
     GroupId = GID_SPECIAL;
 ]
 
-SvxLRSpaceItem ParaOutlineLeft SID_ATTR_PARA_LEFT
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SvxLRSpaceItem ParaOutlineRight SID_ATTR_PARA_RIGHT
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
 //--------------------------------------------------------------------------
 SfxVoidItem FormatArea SID_ATTRIBUTES_AREA
 ()
@@ -6570,7 +6521,7 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
     GroupId = GID_ENUMERATION;
 ]
 
-SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
+SfxBoolItem CurrentBulletListType FN_BUL_NUM_RULE_INDEX
 (SfxUInt16Item On FN_PARAM_1)
 [
     /* flags: */
@@ -6592,13 +6543,13 @@ SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
     SlotType = SfxBoolItem
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_ENUMERATION;
 ]
-SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
+SfxBoolItem CurrentNumListType FN_NUM_NUM_RULE_INDEX
 (SfxUInt16Item On FN_PARAM_1)
 [
     /* flags: */
@@ -6620,10 +6571,10 @@ SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
     SlotType = SfxBoolItem
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_ENUMERATION;
 ]
 
@@ -15637,10 +15588,10 @@ SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15691,10 +15642,10 @@ SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15721,10 +15672,10 @@ XLineJointItem LineJoint SID_ATTR_LINE_JOINT
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15748,10 +15699,10 @@ XLineCapItem LineCap SID_ATTR_LINE_CAP
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15935,10 +15886,10 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
 
     Readonly = FALSE,
 
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15960,10 +15911,10 @@ SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
 
     Readonly = FALSE,
 
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -15985,10 +15936,10 @@ SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
 
     Readonly = FALSE,
 
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -16010,10 +15961,10 @@ SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS
 
     Readonly = FALSE,
 
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -16035,43 +15986,16 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
 
     Readonly = FALSE,
 
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
-
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
 ]
 
 //--------------------------------------------------------------------------
 
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
 [
     /* flags: */
     AutoUpdate = TRUE,
@@ -16089,11 +16013,11 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
+    ToolBoxConfig = TRUE
+    GroupId = GID_FORMAT;
 ]
 
 //--------------------------------------------------------------------------
@@ -16116,11 +16040,11 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
     Readonly = FALSE,
 
     /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
     StatusBarConfig = FALSE,
     ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
+    GroupId = GID_FORMAT;
 ]
 
 //--------------------------------------------------------------------------
@@ -16247,10 +16171,10 @@ SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
     Asynchron;
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
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;
     }
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 16db5dbfae00..4d240eec42dc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -80,9 +80,7 @@ public:
 
     void ShowMenu (void);
     sal_uInt16 GetBulletTypeIndex(){ return mnBulletTypeIndex; }
-    void SetBulletTypeIndex(sal_uInt16 nInd){ mnBulletTypeIndex = nInd; }
     sal_uInt16 GetNumTypeIndex(){ return mnNumTypeIndex; }
-    void SetNumTypeIndex(sal_uInt16 nInd){ mnNumTypeIndex = nInd; }
     FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
 
     void EndSpacingPopupMode (void);