diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-02-16 15:34:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-02-16 15:34:49 +0000 |
| commit | 77bae2cefa9ce466a8767dbcd59dfbc6703a1c3e (patch) | |
| tree | 1457b6aa901d49e8b371b33f79dfc2f044872229 | |
| parent | 00ec906f84d97a97ec92a9cb92042fbbf12c0d55 (diff) | |
CWS-TOOLING: integrate CWS impress167_OOO310
2009-02-02 16:32:46 +0100 sj r267276 : build problem, removing build dependency to vcl
2009-01-30 16:45:22 +0100 sj r267210 : CWS-TOOLING: rebase CWS impress167 to trunk@267171 (milestone: DEV300:m41)
2009-01-23 16:14:11 +0100 sj r266833 : #98331# fixed: crop information is not saved and not read on loading
2009-01-23 10:45:11 +0100 af r266780 : #158592# Made processing of slidesorter queue entries more robust.
2009-01-23 09:58:16 +0100 af r266773 : #i93848# Fixed termination of timer thread.
| -rw-r--r-- | xmloff/inc/xmloff/xmltypes.hxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx index 7deb386139..cd3e443563 100644 --- a/xmloff/inc/xmloff/xmltypes.hxx +++ b/xmloff/inc/xmloff/xmltypes.hxx @@ -275,13 +275,12 @@ #define XML_TYPE_NUMBER16_AUTO (XML_TEXT_TYPES_START + 105) #define XML_TYPE_TEXT_SOFT_PAGE_BREAK (XML_TEXT_TYPES_START + 106) #define XML_TYPE_TEXT_USE_SOFT_PAGE_BREAKS (XML_TEXT_TYPES_START + 107) -#define XML_TYPE_TEXT_CLIP (XML_TEXT_TYPES_START + 108) - -#define XML_TYPE_TEXT_OVERLINE_TYPE (XML_TEXT_TYPES_START + 108) -#define XML_TYPE_TEXT_OVERLINE_STYLE (XML_TEXT_TYPES_START + 109) -#define XML_TYPE_TEXT_OVERLINE_WIDTH (XML_TEXT_TYPES_START + 110) -#define XML_TYPE_TEXT_OVERLINE_COLOR (XML_TEXT_TYPES_START + 111) -#define XML_TYPE_TEXT_OVERLINE_HASCOLOR (XML_TEXT_TYPES_START + 112) +#define XML_TYPE_TEXT_CLIP (XML_TEXT_TYPES_START + 108) +#define XML_TYPE_TEXT_OVERLINE_TYPE (XML_TEXT_TYPES_START + 109) +#define XML_TYPE_TEXT_OVERLINE_STYLE (XML_TEXT_TYPES_START + 110) +#define XML_TYPE_TEXT_OVERLINE_WIDTH (XML_TEXT_TYPES_START + 111) +#define XML_TYPE_TEXT_OVERLINE_COLOR (XML_TEXT_TYPES_START + 112) +#define XML_TYPE_TEXT_OVERLINE_HASCOLOR (XML_TEXT_TYPES_START + 113) #define XML_SCH_TYPES_START (0x4 << XML_TYPE_APP_SHIFT) #define XML_PM_TYPES_START (0x5 << XML_TYPE_APP_SHIFT) // page master |