Author: orw
Date: Tue Apr 9 07:50:07 2013
New Revision: 1465918
URL: http://svn.apache.org/r1465918
Log:
#121420# - solve conflicts of Resource-IDs and Slot-IDs
Modified:
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc
openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
Modified: openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc?rev=1465918&r1=1465917&r2=1465918&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc (original)
+++ openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc Tue Apr 9
07:50:07 2013
@@ -853,6 +853,7 @@
#define SID_ZOOM (SID_SVX_START + 289)
#define SID_SEARCH_ITEM (SID_SVX_START + 291)
#define SID_ATTR_CHAR_FONTWIDTH (SID_SVX_START + 303)
+#define SID_SIDEBAR (SID_SVX_START + 336)
#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
@@ -860,7 +861,6 @@
#define SID_TASKPANE (SID_SVX_START + 370)
#define SID_ZOOM_NEXT (SID_SVX_START + 402)
#define SID_ZOOM_PREV (SID_SVX_START + 403)
-#define SID_SIDEBAR (SID_SVX_START + 414)
#define SID_INET_DLG (SID_SVX_START + 416)
#define SID_AUTO_CORRECT_DLG (SID_SVX_START + 424)
#define SID_SD_AUTOPILOT (SID_SVX_START + 425)
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc?rev=1465918&r1=1465917&r2=1465918&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Tue Apr 9
07:50:07 2013
@@ -30,8 +30,8 @@
// Resource-Id's ------------------------------------------------------------
-// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
-#define RID_SVX_FIRSTFREE 305
+// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!!
(not for RIDs for Strings - they have there own)
+#define RID_SVX_FIRSTFREE 323
// some strings also used in CUI
#define RID_SVXERRCTX (RID_SVX_START + 351)
@@ -378,70 +378,33 @@
#define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286)
#define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287)
-#define RID_SIDEBAR_TEXT_PANEL (RID_SVX_START + 288)
-#define RID_POPUPPANEL_TEXTPAGE_UNDERLINE (RID_SVX_START + 289)
-#define RID_POPUPPANEL_TEXTPAGE_FONT_COLOR (RID_SVX_START + 290)
-#define RID_POPUPPANEL_TEXTPAGE_SPACING (RID_SVX_START + 291)
-
-#define RID_SIDEBAR_AREA_PANEL (RID_SVX_START + 292)
-#define RID_POPUPPANEL_AERAPAGE_COLOR (RID_SVX_START + 293)
-#define RID_POPUPPANEL_AREAPAGE_TRGR (RID_SVX_START + 294)
-
-#define RID_SIDEBAR_LINE_PANEL (RID_SVX_START + 295)
-#define RID_POPUPPANEL_LINEPAGE_COLOR (RID_SVX_START + 296)
-#define RID_POPUPPANEL_LINEPAGE_STYLE (RID_SVX_START + 297)
-#define RID_POPUPPANEL_LINEPAGE_WIDTH (RID_SVX_START + 298)
-
-#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 299)
-#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 300)
-#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 301)
-
-#define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 302)
-#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 303)
-#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 304)
-#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 305)
-#define RID_SVXSTR_NUMBULLET_NONE
(RID_SVX_START + 361)
-#define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START +
307)
-#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START +
308)
-#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START +
309)
-#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START +
310)
-#define RID_SVXSTR_NUMBULLET_CUSTOMIZED_WATERMARK
(RID_SVX_START + 311)
-#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_4
(RID_SVX_START + 312)
-#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_5
(RID_SVX_START + 313)
-#define RID_SVXSTR_OUTLINENUM_RTL_DESCRIPTION_7
(RID_SVX_START + 314)
-
-#define RID_SVXSTR_GRAPHICS_DESCRIPTIONS (RID_SVX_START +
317)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_0
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 0)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_1
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 1)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_2
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 2)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_3
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 3)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_4
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 4)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_5
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 5)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_6
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 6)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_7
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 7)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_8
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 8)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_9
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 9)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_10
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 10)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_11
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 11)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_12
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 12)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_13
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 13)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_14
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 14)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_15
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 15)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_16
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 16)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_17
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 17)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_18
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 18)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_19
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 19)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_20
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 20)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_21
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 21)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_22
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 22)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_23
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 23)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_24
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 24)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_25
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 25)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_26
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 26)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_27
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 27)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_28
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 28)
-#define RID_SVXSTR_GRAPHICS_DESCRIPTION_29
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 29)
-// !!! please update RID_SVX_FIRSTFREE !!! see line 46
+#define RID_SIDEBAR_TEXT_PANEL (RID_SVX_START + 305)
+#define RID_POPUPPANEL_TEXTPAGE_UNDERLINE (RID_SVX_START + 306)
+#define RID_POPUPPANEL_TEXTPAGE_FONT_COLOR (RID_SVX_START + 307)
+#define RID_POPUPPANEL_TEXTPAGE_SPACING (RID_SVX_START + 308)
+
+#define RID_SIDEBAR_AREA_PANEL (RID_SVX_START + 309)
+#define RID_POPUPPANEL_AERAPAGE_COLOR (RID_SVX_START + 310)
+#define RID_POPUPPANEL_AREAPAGE_TRGR (RID_SVX_START + 311)
+
+#define RID_SIDEBAR_LINE_PANEL (RID_SVX_START + 312)
+#define RID_POPUPPANEL_LINEPAGE_COLOR (RID_SVX_START + 313)
+#define RID_POPUPPANEL_LINEPAGE_STYLE (RID_SVX_START + 314)
+#define RID_POPUPPANEL_LINEPAGE_WIDTH (RID_SVX_START + 315)
+
+#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 316)
+#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 317)
+#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 318)
+
+#define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 319)
+#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 320)
+#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 321)
+#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 322)
+
+// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new
RIDs !!! (see above)
+
+
+
// Strings ------------------------------------------------------------------
@@ -1029,13 +992,60 @@
#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3
(RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3)
#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4
(RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4)
-#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START +
1190)
-
-#define RID_SVXSTR_NEXTFREE (RID_SVX_START +
1191)
-
//IAccessibility2 Implementation 2009-----
#define RID_SVXSTR_TEXTCOLOR
(RID_SVX_START + 1178)
//-----IAccessibility2 Implementation 2009
+
+#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START +
1190)
+
+#define RID_SVXSTR_NUMBULLET_NONE (RID_SVX_START +
1191)
+#define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START +
1192)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START +
1193)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START +
1194)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START +
1195)
+#define RID_SVXSTR_NUMBULLET_CUSTOMIZED_WATERMARK (RID_SVX_START +
1196)
+#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_4 (RID_SVX_START +
1197)
+#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_5 (RID_SVX_START +
1198)
+#define RID_SVXSTR_OUTLINENUM_RTL_DESCRIPTION_7 (RID_SVX_START +
1199)
+
+#define RID_SVXSTR_GRAPHICS_DESCRIPTIONS (RID_SVX_START +
1200)
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_0
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 0) // 1200
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_1
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 1) // 1201
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_2
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 2) // 1202
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_3
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 3) // 1203
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_4
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 4) // 1204
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_5
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 5) // 1205
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_6
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 6) // 1206
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_7
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 7) // 1207
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_8
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 8) // 1208
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_9
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 9) // 1209
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_10
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 10) // 1210
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_11
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 11) // 1211
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_12
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 12) // 1212
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_13
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 13) // 1213
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_14
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 14) // 1214
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_15
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 15) // 1215
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_16
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 16) // 1216
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_17
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 17) // 1217
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_18
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 18) // 1218
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_19
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 19) // 1219
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_20
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 20) // 1220
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_21
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 21) // 1221
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_22
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 22) // 1222
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_23
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 23) // 1223
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_24
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 24) // 1224
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_25
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 25) // 1225
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_26
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 26) // 1226
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_27
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 27) // 1227
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_28
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 28) // 1228
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_29
(RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 29) // 1229
+
+// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new
RIDs for Strings !!!
+#define RID_SVXSTR_NEXTFREE (RID_SVX_START +
1230)
+
+
+
+
// ----------------------------------------------------------------------------
// if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc?rev=1465918&r1=1465917&r2=1465918&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Tue Apr 9 07:50:07
2013
@@ -685,6 +685,9 @@
#define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 )
#define SID_CONTOUR_DLG ( SID_SVX_START + 334 )
#define SID_CONTOUR_EXEC ( SID_SVX_START + 335 )
+
+//#define SID_SIDEBAR ( SID_SVX_START + 336
) -> sfxsids.hrc
+
#define SID_BORDER_OBJECT ( SID_SVX_START + 340 )
#define SID_BORDER_LEFTLINE ( SID_SVX_START + 341 )
#define SID_BORDER_RIGHTLINE ( SID_SVX_START + 342 )
@@ -751,7 +754,7 @@
#define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 )
#define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 )
-//#define SID_SIDEBAR ( SID_SVX_START + 414
) -> sfxsids.hrc
+//#define SID_ATTR_PARA_REGISTER ( SID_SVX_START +
413 ) -> editids.hrc
//! moved to sfx2, still in use:
//#define SID_HTML_MODE ( SID_SVX_START +
414 )
@@ -1277,8 +1280,8 @@
#define SID_ATTR_PARA_LEFT (SID_SVX_START + 1115)
#define SID_ATTR_PARA_RIGHT (SID_SVX_START + 1116)
-#define FN_SVX_SET_NUMBER (RID_SVX_START + 1117)
-#define FN_SVX_SET_BULLET (RID_SVX_START + 1118)
+#define FN_SVX_SET_NUMBER (SID_SVX_START + 1117)
+#define FN_SVX_SET_BULLET (SID_SVX_START + 1118)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (FN_SVX_SET_BULLET + 1)
