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

6 files changed, 17 insertions, 43 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 08bb1d75f40e..33d245e225db 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -899,10 +899,9 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_UNO_TITLE                    (FN_FRAME + 19)
 #define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
 
-#define FN_PROPERTY_WRAP_DLG            (FN_SIDEBAR + 0)
-#define SID_ATTR_PAGE_COLUMN            (FN_SIDEBAR + 1)
-#define SID_ATTR_PAGE_ULSPACE           (FN_SIDEBAR + 2)
-#define SID_ATTR_PAGE_LRSPACE           (FN_SIDEBAR + 3)
+#define SID_ATTR_PAGE_COLUMN            (FN_SIDEBAR + 0)
+#define SID_ATTR_PAGE_ULSPACE           (FN_SIDEBAR + 1)
+#define SID_ATTR_PAGE_LRSPACE           (FN_SIDEBAR + 2)
 
 //Member IDs for Fill / SetVariable of items
 #define         MID_STYLE       0xe0
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 31cb86d0f281..808e204a61d5 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -184,7 +184,7 @@ interface BaseTextFrame
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    FN_PROPERTY_WRAP_DLG // status(final|play)
+    FN_DRAW_WRAP_DLG // status(final|play)
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index a3198b919e9d..30372b52e510 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -53,7 +53,7 @@ interface BaseTextGraphic
         StateMethod = GetAttrState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    FN_PROPERTY_WRAP_DLG // status(final|play)
+    FN_DRAW_WRAP_DLG // status(final|play)
     [
         ExecMethod = Execute ;
         StateMethod = GetAttrState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c9e027eca730..10f29fd934d2 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3373,31 +3373,6 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAFIC_DLG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ObjectWrapDialog FN_PROPERTY_WRAP_DLG
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerItem;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_GRAPHIC;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem Grow FN_GROW_FONT_SIZE
 ()
 [
@@ -6253,10 +6228,10 @@ SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG
     Asynchron;
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
+    ToolBoxConfig = FALSE,
     GroupId = GID_FORMAT;
 ]
 
@@ -10380,7 +10355,7 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE
     GroupId = GID_APPLICATION;
 ]
 
-SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
+SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN
 
 [
     /* flags: */
@@ -10399,11 +10374,11 @@ SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
     Readonly = TRUE,
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
 ]
 
 SvxLongULSpaceItem SwPageULMargin SID_ATTR_PAGE_ULSPACE
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() )