diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-28 12:21:53 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-28 13:32:54 -0400 |
commit | deee6394c0db6c6ec844d2c9606b138d9bcb4672 (patch) | |
tree | 2877478ba3b35ef1fb006955c966567c9094d6ce | |
parent | fix xlsx export missing alignment attributes with cellstyle fdo#55417 (diff) | |
download | core-deee6394c0db6c6ec844d2c9606b138d9bcb4672.tar.gz core-deee6394c0db6c6ec844d2c9606b138d9bcb4672.zip |
Unwind some of the resource ID nastiness between sc and svx.
Never reference SC resource ID's in svx. That's just asking for
trouble.
Change-Id: I893de42891fbc05a2824360c52f2b74ead60f60c
-rw-r--r-- | sc/inc/sc.hrc | 9 | ||||
-rw-r--r-- | sc/sdi/scalc.sdi | 120 | ||||
-rw-r--r-- | svx/inc/svx/svxids.hrc | 16 | ||||
-rw-r--r-- | svx/sdi/svx.sdi | 125 |
4 files changed, 129 insertions, 141 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b5e6b8a15fd8..51cebf39f182 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) @@ -369,13 +370,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/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 451ffca2ce8c..f9d70578e9bf 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8172,3 +8172,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/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index a932a117bb99..8d6e56f1e8c2 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 eea97a40a5bd..97c15711a3a6 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 [ |