From deee6394c0db6c6ec844d2c9606b138d9bcb4672 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 28 Sep 2012 12:21:53 -0400 Subject: 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 --- svx/inc/svx/svxids.hrc | 16 ++----- svx/sdi/svx.sdi | 125 ------------------------------------------------- 2 files changed, 3 insertions(+), 138 deletions(-) (limited to 'svx') 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 @@ -231,19 +231,6 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #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 // -------------------------------------------------------------------------- @@ -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 @@ -5574,31 +5574,6 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- -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 @@ -5734,31 +5709,6 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- -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 @@ -6072,31 +6022,6 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- -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) @@ -10137,31 +10062,6 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -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 @@ -11507,31 +11407,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -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 -- cgit