diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:40:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:40:11 +0000 |
| commit | 8b90e197a705585aaad5b504a382e9245f1ba543 (patch) | |
| tree | 12b024531f1484fa2a6f71c108fb5740206907e3 /svx/source/dialog/align.hrc | |
| parent | e91b767d89115f545eeac496ee37e062f32b9066 (diff) | |
INTEGRATION: CWS dr14 (1.6.498); FILE MERGED
2004/07/12 19:01:32 dr 1.6.498.2: RESYNC: (1.6-1.7); FILE MERGED
2003/12/18 14:05:39 dr 1.6.498.1: #i22640# SvxAlignmentTabPage: new orientation controls: svx::DialControl, svx::WrapField, svx::OrientationHelper
#i22640# SvxAlignmentTabPage: SvxOrientationItem replaced by SfxBoolItem for stacked state
#i22640# SvxAlignmentTabPage: ImageButton replaced by CheckBox for stacked state
#i22928# SvxAlignmentTabPage: Added "Fill" to horizontal alignment
#i22640# Moved border controls from SvxAlignmentTabPage to SvxBorderTabPage
Diffstat (limited to 'svx/source/dialog/align.hrc')
| -rw-r--r-- | svx/source/dialog/align.hrc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/svx/source/dialog/align.hrc b/svx/source/dialog/align.hrc index 4996363ecd56..c5554bf0b2bb 100644 --- a/svx/source/dialog/align.hrc +++ b/svx/source/dialog/align.hrc @@ -2,9 +2,9 @@ * * $RCSfile: align.hrc,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2004-07-06 14:44:53 $ + * last change: $Author: hr $ $Date: 2004-08-02 17:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,21 +81,12 @@ #define CTR_BORDER_LOCK 26 #define BTN_ASIAN_VERTICAL 27 -#define FL_SPACE 30 -#define FT_LEFTSPACE 31 -#define ED_LEFTSPACE 32 -#define FT_RIGHTSPACE 33 -#define ED_RIGHTSPACE 34 -#define FT_TOPSPACE 35 -#define ED_TOPSPACE 36 -#define FT_BOTTOMSPACE 37 -#define ED_BOTTOMSPACE 38 - #define FL_WRAP 40 #define BTN_WRAP 41 #define BTN_HYPH 42 #define FT_TEXTFLOW 43 #define LB_FRAMEDIR 44 +#define BTN_SHRINK 45 //#define ED_INDENT1 100 @@ -105,6 +96,7 @@ #define ALIGNDLG_HORALIGN_CENTER 2 #define ALIGNDLG_HORALIGN_RIGHT 3 #define ALIGNDLG_HORALIGN_BLOCK 4 +#define ALIGNDLG_HORALIGN_FILL 5 #define ALIGNDLG_VERALIGN_STD 0 #define ALIGNDLG_VERALIGN_TOP 1 |