summaryrefslogtreecommitdiffstats
path: root/xmloff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-18 08:29:33 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-18 08:29:33 +0000
commit9bd851f7a89600da14cbb5d60fddd5a7daa4de2f (patch)
treef4b5fe694fbee73b01b4f0e94308f95d28111ba7 /xmloff
parent#i99226# configuration fix by mod (diff)
downloadcore-9bd851f7a89600da14cbb5d60fddd5a7daa4de2f.tar.gz
core-9bd851f7a89600da14cbb5d60fddd5a7daa4de2f.zip
CWS-TOOLING: integrate CWS impress167
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.
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/xmloff/xmltypes.hxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx
index d00a8ab3ced2..a5f5eb72de1a 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