[Libreoffice-commits] core.git: 2 commits - include/svx
Tor Lillqvist
tml at collabora.com
Fri Sep 20 03:56:11 PDT 2013
include/svx/svxids.hrc | 160 ++++++++++++++++++++++++-------------------------
1 file changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 54035e9408daa0b05256a12de7df626572aa34c5
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Sep 20 13:54:57 2013 +0300
Use consistent spacing in this madness at least
Change-Id: Icee043f43072244e28405e4dff3ce4b51fbb3cd9
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6e93760..307ce14 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -423,7 +423,7 @@
#define SID_INSERT_FRAME ( SID_SVX_START + 240 )
#define SID_INSERT_GRAPHIC ( SID_SVX_START + 241 )
#define SID_AUTOFORMAT ( SID_SVX_START + 242 )
-#define SID_SPELL_DIALOG ( SID_SVX_START + 243 )
+#define SID_SPELL_DIALOG ( SID_SVX_START + 243 )
#define SID_INSERT_DRAW ( SID_SVX_START + 244 )
#define SID_THESAURUS ( SID_SVX_START + 245 )
#define SID_DRAW_TEXT ( SID_SVX_START + 253 )
@@ -733,7 +733,7 @@
#define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 )
#define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 )
#define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 )
-#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
+#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
#define SID_DRAW_CAPTION_VERTICAL ( SID_SVX_START + 906 )
#define SID_TEXTDIRECTION_LEFT_TO_RIGHT ( SID_SVX_START + 907 )
#define SID_TEXTDIRECTION_TOP_TO_BOTTOM ( SID_SVX_START + 908 )
@@ -882,80 +882,80 @@
#define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1068 )
#define SID_SET_DOCUMENT_LANGUAGE ( SID_SVX_START + 1069 )
-#define SID_TABLE_MERGE_CELLS (SID_SVX_START+1070)
-#define SID_TABLE_SPLIT_CELLS (SID_SVX_START+1071)
-#define SID_OPTIMIZE_TABLE (SID_SVX_START+1072)
-#define SID_TABLE_VERT_BOTTOM (SID_SVX_START+1073)
-#define SID_TABLE_VERT_CENTER (SID_SVX_START+1074)
-#define SID_TABLE_VERT_NONE (SID_SVX_START+1075)
-#define SID_TABLE_INSERT_ROW (SID_SVX_START+1076)
-#define SID_TABLE_INSERT_COL (SID_SVX_START+1077)
-#define SID_TABLE_DELETE_ROW (SID_SVX_START+1078)
-#define SID_TABLE_DELETE_COL (SID_SVX_START+1079)
-#define SID_TABLE_SELECT_ALL (SID_SVX_START+1080)
-#define SID_TABLE_SELECT_COL (SID_SVX_START+1081)
-#define SID_TABLE_SELECT_ROW (SID_SVX_START+1082)
-#define SID_FORMAT_TABLE_DLG (SID_SVX_START+1083)
-#define SID_TABLE_SORT_DIALOG (SID_SVX_START+1084)
-#define SID_TABLE_AUTOSUM (SID_SVX_START+1085)
-#define SID_TABLE_DISTRIBUTE_COLUMNS (SID_SVX_START+1086)
-#define SID_TABLE_DISTRIBUTE_ROWS (SID_SVX_START+1087)
-#define SID_TABLE_STYLE (SID_SVX_START+1088)
-#define SID_TABLE_STYLE_SETTINGS (SID_SVX_START+1089)
-#define SID_CHAR_DLG_PREVIEW_STRING (SID_SVX_START+1090)
-#define SID_RECHECK_DOCUMENT (SID_SVX_START+1091)
-
-#define SID_OBJECT_MIRROR (SID_SVX_START+1093)
-
-#define SID_DELETE_POSTIT (SID_SVX_START+1094)
-#define SID_NEXT_POSTIT (SID_SVX_START+1095)
-#define SID_PREVIOUS_POSTIT (SID_SVX_START+1096)
-#define SID_DELETEALL_POSTIT (SID_SVX_START+1097)
-#define SID_SHOW_POSTIT (SID_SVX_START+1098)
-#define SID_REPLYTO_POSTIT (SID_SVX_START+1099)
-#define SID_DELETEALLBYAUTHOR_POSTIT (SID_SVX_START+1100)
-#define SID_INSERT_POSTIT (SID_SVX_START+1101)
-
-#define SID_TRANSLITERATE_SENTENCE_CASE (SID_SVX_START+1102)
-#define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103)
-#define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104)
-#define SID_TRANSLITERATE_ROTATE_CASE (SID_SVX_START+1105)
-#define SID_INSERT_FORM_RADIO (SID_SVX_START+1106)
-#define SID_INSERT_FORM_CHECK (SID_SVX_START+1107)
-#define SID_INSERT_FORM_LIST (SID_SVX_START+1108)
-#define SID_INSERT_FORM_COMBO (SID_SVX_START+1109)
-#define SID_INSERT_FORM_SPIN (SID_SVX_START+1110)
-#define SID_INSERT_FORM_VSCROLL (SID_SVX_START+1111)
-#define SID_INSERT_FORM_HSCROLL (SID_SVX_START+1112)
-#define SID_EXTERNAL_EDIT (SID_SVX_START+1113)
-#define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114)
-#define SID_CHANGE_PICTURE (SID_SVX_START+1115)
-#define SID_SAVE_GRAPHIC (SID_SVX_START+1116)
-#define SID_COMPRESS_GRAPHIC (SID_SVX_START+1117)
-#define SID_FRAME_UP (SID_SVX_START+1118)
-#define SID_FRAME_DOWN (SID_SVX_START+1119)
-#define SID_ATTR_SPECIALCHAR (SID_SVX_START+1120)
-#define SID_ROTATE_GRAPHIC_LEFT (SID_SVX_START+1121)
-#define SID_ROTATE_GRAPHIC_RIGHT (SID_SVX_START+1122)
-#define SID_MENU_MANAGE_GRAPHIC (SID_SVX_START+1123)
+#define SID_TABLE_MERGE_CELLS ( SID_SVX_START + 1070 )
+#define SID_TABLE_SPLIT_CELLS ( SID_SVX_START + 1071 )
+#define SID_OPTIMIZE_TABLE ( SID_SVX_START + 1072 )
+#define SID_TABLE_VERT_BOTTOM ( SID_SVX_START + 1073 )
+#define SID_TABLE_VERT_CENTER ( SID_SVX_START + 1074 )
+#define SID_TABLE_VERT_NONE ( SID_SVX_START + 1075 )
+#define SID_TABLE_INSERT_ROW ( SID_SVX_START + 1076 )
+#define SID_TABLE_INSERT_COL ( SID_SVX_START + 1077 )
+#define SID_TABLE_DELETE_ROW ( SID_SVX_START + 1078 )
+#define SID_TABLE_DELETE_COL ( SID_SVX_START + 1079 )
+#define SID_TABLE_SELECT_ALL ( SID_SVX_START + 1080 )
+#define SID_TABLE_SELECT_COL ( SID_SVX_START + 1081 )
+#define SID_TABLE_SELECT_ROW ( SID_SVX_START + 1082 )
+#define SID_FORMAT_TABLE_DLG ( SID_SVX_START + 1083 )
+#define SID_TABLE_SORT_DIALOG ( SID_SVX_START + 1084 )
+#define SID_TABLE_AUTOSUM ( SID_SVX_START + 1085 )
+#define SID_TABLE_DISTRIBUTE_COLUMNS ( SID_SVX_START + 1086 )
+#define SID_TABLE_DISTRIBUTE_ROWS ( SID_SVX_START + 1087 )
+#define SID_TABLE_STYLE ( SID_SVX_START + 1088 )
+#define SID_TABLE_STYLE_SETTINGS ( SID_SVX_START + 1089 )
+#define SID_CHAR_DLG_PREVIEW_STRING ( SID_SVX_START + 1090 )
+#define SID_RECHECK_DOCUMENT ( SID_SVX_START + 1091 )
+
+#define SID_OBJECT_MIRROR ( SID_SVX_START + 1093 )
+
+#define SID_DELETE_POSTIT ( SID_SVX_START + 1094 )
+#define SID_NEXT_POSTIT ( SID_SVX_START + 1095 )
+#define SID_PREVIOUS_POSTIT ( SID_SVX_START + 1096 )
+#define SID_DELETEALL_POSTIT ( SID_SVX_START + 1097 )
+#define SID_SHOW_POSTIT ( SID_SVX_START + 1098 )
+#define SID_REPLYTO_POSTIT ( SID_SVX_START + 1099 )
+#define SID_DELETEALLBYAUTHOR_POSTIT ( SID_SVX_START + 1100 )
+#define SID_INSERT_POSTIT ( SID_SVX_START + 1101 )
+
+#define SID_TRANSLITERATE_SENTENCE_CASE ( SID_SVX_START + 1102 )
+#define SID_TRANSLITERATE_TITLE_CASE ( SID_SVX_START + 1103 )
+#define SID_TRANSLITERATE_TOGGLE_CASE ( SID_SVX_START + 1104 )
+#define SID_TRANSLITERATE_ROTATE_CASE ( SID_SVX_START + 1105 )
+#define SID_INSERT_FORM_RADIO ( SID_SVX_START + 1106 )
+#define SID_INSERT_FORM_CHECK ( SID_SVX_START + 1107 )
+#define SID_INSERT_FORM_LIST ( SID_SVX_START + 1108 )
+#define SID_INSERT_FORM_COMBO ( SID_SVX_START + 1109 )
+#define SID_INSERT_FORM_SPIN ( SID_SVX_START + 1110 )
+#define SID_INSERT_FORM_VSCROLL ( SID_SVX_START + 1111 )
+#define SID_INSERT_FORM_HSCROLL ( SID_SVX_START + 1112 )
+#define SID_EXTERNAL_EDIT ( SID_SVX_START + 1113 )
+#define SID_ATTR_PAGE_SHARED_FIRST ( SID_SVX_START + 1114 )
+#define SID_CHANGE_PICTURE ( SID_SVX_START + 1115 )
+#define SID_SAVE_GRAPHIC ( SID_SVX_START + 1116 )
+#define SID_COMPRESS_GRAPHIC ( SID_SVX_START + 1117 )
+#define SID_FRAME_UP ( SID_SVX_START + 1118 )
+#define SID_FRAME_DOWN ( SID_SVX_START + 1119 )
+#define SID_ATTR_SPECIALCHAR ( SID_SVX_START + 1120 )
+#define SID_ROTATE_GRAPHIC_LEFT ( SID_SVX_START + 1121 )
+#define SID_ROTATE_GRAPHIC_RIGHT ( SID_SVX_START + 1122 )
+#define SID_MENU_MANAGE_GRAPHIC ( SID_SVX_START + 1123 )
// new slots for panels
-#define SID_ATTR_FILL_TRANSPARENCE (SID_SVX_START+1124)
-#define SID_ATTR_FILL_FLOATTRANSPARENCE (SID_SVX_START+1125)
-#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1126)
-#define SID_FLIP_HORIZONTAL (SID_SVX_START+1127)
-#define SID_FLIP_VERTICAL (SID_SVX_START+1128)
-#define SID_ATTR_LINE_JOINT (SID_SVX_START+1129)
-#define SID_ATTR_LINE_CAP (SID_SVX_START+1130)
-#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1131)
-
-#define SID_CELL_FORMAT_BORDER (SID_SVX_START+1132)
-#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1133)
-
-#define FN_SVX_SET_NUMBER (SID_SVX_START+1136)
-#define FN_SVX_SET_BULLET (SID_SVX_START+1137)
-#define SID_SW_ATTR_FILL_STYLE (SID_SVX_START+1138)
-#define SID_SW_ATTR_FILL_GRADIENT (SID_SVX_START+1139)
+#define SID_ATTR_FILL_TRANSPARENCE ( SID_SVX_START + 1124 )
+#define SID_ATTR_FILL_FLOATTRANSPARENCE ( SID_SVX_START + 1125 )
+#define SID_ATTR_LINE_TRANSPARENCE ( SID_SVX_START + 1126 )
+#define SID_FLIP_HORIZONTAL ( SID_SVX_START + 1127 )
+#define SID_FLIP_VERTICAL ( SID_SVX_START + 1128 )
+#define SID_ATTR_LINE_JOINT ( SID_SVX_START + 1129 )
+#define SID_ATTR_LINE_CAP ( SID_SVX_START + 1130 )
+#define SID_ATTR_TRANSFORM_MATRIX ( SID_SVX_START + 1131 )
+
+#define SID_CELL_FORMAT_BORDER ( SID_SVX_START + 1132 )
+#define SID_CHAR_DLG_EFFECT ( SID_SVX_START + 1133 )
+
+#define FN_SVX_SET_NUMBER ( SID_SVX_START + 1136 )
+#define FN_SVX_SET_BULLET ( SID_SVX_START + 1137 )
+#define SID_SW_ATTR_FILL_STYLE ( SID_SVX_START + 1138 )
+#define SID_SW_ATTR_FILL_GRADIENT ( SID_SVX_START + 1139 )
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
commit 3e2376c87c825b9854062e90cf55e1feb1d19691
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Sep 20 13:49:10 2013 +0300
Move one block to maintain numeric order
No, I didn't check if all the others are in correct order.
Change-Id: Ic676fa79ea864d75abd183df2662007f05cca75d
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index c6fb25f..6e93760 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -293,6 +293,12 @@
#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 )
#define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 )
#define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 )
+#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS ( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT ( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 )
+#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 )
+#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 )
#define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 )
#define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 )
#define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 )
@@ -304,12 +310,6 @@
#define SID_ATTR_TRANSFORM_ROT_X ( SID_SVX_START + 93 )
#define SID_ATTR_TRANSFORM_ROT_Y ( SID_SVX_START + 94 )
#define SID_ATTR_TRANSFORM_ANGLE ( SID_SVX_START + 95 )
-#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS ( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT ( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 )
-#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 )
-#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 )
#define SID_SIZE_ALL ( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
#define SID_DRAW_XLINE ( SID_SVX_START + 103 )
More information about the Libreoffice-commits
mailing list