configure.in | 2 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 5 sc/inc/sc.hrc | 10 sc/inc/sccommands.h | 1 sc/sdi/cellsh.sdi | 1 sc/sdi/scalc.sdi | 145 +++++++++- sc/source/ui/view/cellsh2.cxx | 3 sc/uiconfig/scalc/menubar/menubar.xml | 2 svx/inc/svx/svxids.hrc | 16 - svx/sdi/svx.sdi | 125 -------- 10 files changed, 167 insertions(+), 143 deletions(-)
New commits: commit 961b3988ee1249f76f0eebfa6222f44bf1ec8beb Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Wed Sep 26 16:11:52 2012 -0400 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 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index e6767b7..a9fbf92 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1194,6 +1194,11 @@ <value xml:lang="en-US">Select ~Range...</value> </prop> </node> + <node oor:name=".uno:ManageXMLSource" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Manage ~XML Source...</value> + </prop> + </node> <node oor:name=".uno:DataSort" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Sort...</value> diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b5e6b8a..0dcb1fe 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -238,6 +238,7 @@ #define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) #define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) +#define SID_ENTER_STRING (SC_MESSAGE_START + 37) // messages for opening dialogs: #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) @@ -360,6 +361,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) @@ -369,13 +371,15 @@ #define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) #define SID_CONSOLIDATE (DATA_MENU_START + 20) #define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) - #define SID_SBA_IMPORT (DATA_MENU_START + 22) - #define SID_SORT_DESCENDING (DATA_MENU_START + 23) #define SID_SORT_ASCENDING (DATA_MENU_START + 24) +#define SID_OUTLINE_HIDE (DATA_MENU_START + 25) +#define SID_OUTLINE_SHOW (DATA_MENU_START + 26) +#define SID_OUTLINE_MAKE (DATA_MENU_START + 27) +#define SID_OUTLINE_REMOVE (DATA_MENU_START + 28) -#define DATA_MENU_END (DATA_MENU_START + 25) +#define DATA_MENU_END (DATA_MENU_START + 29) #define TAB_POPUP_START (DATA_MENU_END) #define RID_POPUP_TAB (TAB_POPUP_START) diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h index 1350c0c..783f757 100644 --- a/sc/inc/sccommands.h +++ b/sc/inc/sccommands.h @@ -101,6 +101,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 77eea5c..0256ea0 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 451ffca..2cdf7cd 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -5761,7 +5761,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 [ @@ -8172,3 +8195,123 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] + +SfxVoidItem ShowDetail SID_OUTLINE_SHOW +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem HideDetail SID_OUTLINE_HIDE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem Group SID_OUTLINE_MAKE +(SfxStringItem RowOrCol SID_OUTLINE_MAKE) +[ + /* 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 = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem Ungroup SID_OUTLINE_REMOVE +(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) +[ + /* 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 = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem EnterString SID_ENTER_STRING +(SfxStringItem StringName SID_ENTER_STRING) +[ + /* 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 = FALSE, + GroupId = GID_INTERN; +] diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 325e713..f1d6395 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 0bff97c..47e57af 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -416,6 +416,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> diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index a932a11..8d6e56f 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -232,19 +232,6 @@ #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) // -------------------------------------------------------------------------- -// Calc-Id's -// -------------------------------------------------------------------------- - -#define SID_OUTLINE_HIDE (SID_SC_START + 329) -#define SID_OUTLINE_SHOW (SID_SC_START + 330) -#define SID_OUTLINE_MAKE (SID_SC_START + 331) -#define SID_OUTLINE_REMOVE (SID_SC_START + 332) -#define SID_FRAME_UP (SID_SC_START + 407) -#define SID_FRAME_DOWN (SID_SC_START + 408) -#define SID_ENTER_STRING (SID_SC_START + 476) -#define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) - -// -------------------------------------------------------------------------- // Writer-Id's // -------------------------------------------------------------------------- #define FN_EDIT (SID_SW_START + 100) @@ -937,6 +924,9 @@ #define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114) #define SID_SAVE_GRAPHIC (SID_SVX_START+1115) #define SID_COMPRESS_GRAPHIC (SID_SVX_START+1116) +#define SID_FRAME_UP (SID_SVX_START+1117) +#define SID_FRAME_DOWN (SID_SVX_START+1118) +#define SID_ATTR_SPECIALCHAR (SID_SVX_START+1119) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_COMPRESS_GRAPHIC + 1) diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index eea97a4..97c1571 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5575,31 +5575,6 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE ] //-------------------------------------------------------------------------- -SfxVoidItem Group SID_OUTLINE_MAKE -(SfxStringItem RowOrCol SID_OUTLINE_MAKE) -[ - /* 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 = TRUE, - GroupId = GID_DATA; -] - -//-------------------------------------------------------------------------- SfxBoolItem GroupBox SID_FM_GROUPBOX [ @@ -5735,31 +5710,6 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE ] //-------------------------------------------------------------------------- -SfxVoidItem HideDetail SID_OUTLINE_HIDE -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - -//-------------------------------------------------------------------------- SfxBoolItem HScrollbar SID_INSERT_HSCROLLBAR [ @@ -6073,31 +6023,6 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE ] //-------------------------------------------------------------------------- -SfxVoidItem EnterString SID_ENTER_STRING -(SfxStringItem StringName SID_ENTER_STRING) -[ - /* 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 = FALSE, - GroupId = GID_INTERN; -] - -//-------------------------------------------------------------------------- SfxVoidItem InsertAnnotation SID_INSERT_POSTIT (SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT) [ @@ -10138,31 +10063,6 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED ] //-------------------------------------------------------------------------- -SfxVoidItem ShowDetail SID_OUTLINE_SHOW -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - -//-------------------------------------------------------------------------- SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER [ @@ -11508,31 +11408,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE ] //-------------------------------------------------------------------------- -SfxVoidItem Ungroup SID_OUTLINE_REMOVE -(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) -[ - /* 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 = TRUE, - GroupId = GID_DATA; -] - -//-------------------------------------------------------------------------- SfxBoolItem URLButton SID_INSERT_URLBUTTON [ commit 56dde1307c290b1036045e42c9717be4a225a541 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Wed Sep 26 13:02:20 2012 -0400 Switch to orcus-0.3.0 (work-in-progress version from master). Change-Id: I786face760685a243e6b78f71094a8733256aa46 diff --git a/configure.in b/configure.in index 81f8fa3..eb2197d 100644 --- a/configure.in +++ b/configure.in @@ -8705,7 +8705,7 @@ AC_MSG_CHECKING([which orcus library to use]) if test "$with_system_orcus" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_LIBORCUS=YES - PKG_CHECK_MODULES(ORCUS, liborcus-0.2 >= 0.1.0) + PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0) else AC_MSG_RESULT([internal]) ORCUS_TARBALL=46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits