summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-05 16:58:52 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-05 16:58:52 +0000
commit837513c32a657e301335741f2f600861e89bef4e (patch)
tree25bf9aec0ea7c5d5fe62ace2b6fe721a4af4a1dc /svx
parent5a2fdb4cc60569529250cc114f1b72f718a13e8e (diff)
INTEGRATION: CWS iconswitching1 (1.14.234); FILE MERGED
2005/12/16 14:40:35 ka 1.14.234.4: #i36518#: added check for OPENSOURCECONTEXT 2005/11/30 13:33:46 kendy 1.14.234.3: RESYNC: (1.15-1.16); FILE MERGED 2005/11/01 12:27:04 kendy 1.14.234.2: RESYNC: (1.14-1.15); FILE MERGED 2005/07/20 14:13:45 kendy 1.14.234.1: #i36518# GUI for the icon switching
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/optgdlg.hrc16
1 files changed, 9 insertions, 7 deletions
diff --git a/svx/source/dialog/optgdlg.hrc b/svx/source/dialog/optgdlg.hrc
index c2ef592904d8..c9ab6a402518 100644
--- a/svx/source/dialog/optgdlg.hrc
+++ b/svx/source/dialog/optgdlg.hrc
@@ -4,9 +4,9 @@
*
* $RCSfile: optgdlg.hrc,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2005-11-11 11:50:25 $
+ * last change: $Author: kz $ $Date: 2006-01-05 17:58:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -70,9 +70,9 @@
//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
#define ROW_MF_SCALING (13)
-#define ROW_FT_ICONSIZE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
-#define ROW_LB_ICONSIZE (ROW_FT_ICONSIZE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE)
-#define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
+#define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
+#define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE)
+#define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_DROPDOWN_HEIGHT) +ROWSPACE)
#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
@@ -132,8 +132,10 @@
#define BTN_DOCVIEW 51
#define BTN_OPENWIN 52
#define LB_ICONSIZE 53
-#define FT_ICONSIZE 54
-#define CB_SYSTEM_FONT 55
+#define FT_ICONSIZESTYLE 54
+#define LB_ICONSTYLE 55
+#define CB_SYSTEM_FONT 56
+#define STR_ICONSIZE 57
#define CB_FONT_SHOW 60
#define CB_SHOW_INACTIVE 61