Add new slot ID for 'Manage XML Source' menu entry.

Plus unwind the mess of slot ID collision between sc and svx.

Change-Id: Iad236e50f58160d85c997d6f8f6dfce405fd82bb

6 files changed, 32 insertions, 1 deletions

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 80b91142243b..39b4b9025f26 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -363,6 +363,7 @@
 #define SID_AUTO_FILTER         (DATA_MENU_START + 5)
 #define SID_UNFILTER            (DATA_MENU_START + 6)
 #define SID_QUERY               (DATA_MENU_START + 7)
+#define SID_MANAGE_XML_SOURCE   (DATA_MENU_START + 8)
 #define SID_SUBTOTALS           (DATA_MENU_START + 13)
 #define SID_AUTO_OUTLINE        (DATA_MENU_START + 14)
 #define SID_IMPORT_DATA         (DATA_MENU_START + 15)
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index be8f411dfbe1..8de1f7a89bad 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -102,6 +102,7 @@
 #define CMD_FID_TAB_EVENTS                          ".uno:TableEvents"
 #define CMD_FID_TAB_MENU_SET_TAB_BG_COLOR           ".uno:SetTabBgColor"
 #define CMD_FID_TAB_SET_TAB_BG_COLOR                ".uno:TabBgColor"
+#define CMD_SID_MANAGE_XML_SOURCE                   ".uno:ManageXMLSource"
 
 #endif
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 1086fd547e6a..e4781b86fca6 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -60,6 +60,7 @@ interface CellSelection
     SID_REFRESH_DBAREA      [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     SID_SBA_BRW_INSERT      [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     SID_SELECT_DB           [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+    SID_MANAGE_XML_SOURCE   [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     SID_SORT                [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     SID_DATA_FORM           [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     FID_FILTER_OK           [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 8e0cf31d6b4a..b75f7ffe408d 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -5811,7 +5811,30 @@ SfxVoidItem SelectDB SID_SELECT_DB
     GroupId = GID_DATA;
 ]
 
-//--------------------------------------------------------------------------
+SfxVoidItem ManageXMLSource SID_MANAGE_XML_SOURCE
+(SfxStringItem DbName SID_MANAGE_XML_SOURCE)
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_DATA;
+]
+
 SfxObjectItem SelectedObject SID_SC_ACTIVEOBJECT
 
 [
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 3f120adcdc85..d05e3859b724 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -745,6 +745,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
             }
             break;
 
+        case SID_MANAGE_XML_SOURCE:
+            fprintf(stdout, "ScCellShell::ExecuteDB:   SID_MANAGE_XML_SOURCE\n");
+        break;
         case FID_VALIDATION:
             {
                 const SfxPoolItem* pItem;
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 901dedadf8a7..a09626a081db 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -421,6 +421,8 @@
             <menu:menuitem menu:id=".uno:DefineDBName"/>
             <menu:menuitem menu:id=".uno:SelectDB"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ManageXMLSource"/>
+            <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:DataSort"/>
             <menu:menu menu:id=".uno:FilterMenu">
                 <menu:menupopup>