diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 17:21:03 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 17:21:03 +0000 |
commit | 00b722f8b9ccba1b43c36b2a68b165d2a381cfa0 (patch) | |
tree | bbce99fb77bdc632e61498ae1ed231ec72ba45fe /xmloff/source/text/txtprhdl.cxx | |
parent | 8bad56bdfdc3e182733f77ed8a8d9057b7ceb286 (diff) |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'xmloff/source/text/txtprhdl.cxx')
-rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index fb5677a22053..79d13ae171f9 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtprhdl.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: dvo $ $Date: 2002-02-04 18:14:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 18:20:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,9 +102,11 @@ #ifndef _COM_SUN_STAR_TEXT_FONTEMPHASIS_HPP_ #include <com/sun/star/text/FontEmphasis.hpp> #endif +#if SUPD > 630 #ifndef _COM_SUN_STAR_TEXT_PARAGRAPHVERTALIGN_HPP_ #include <com/sun/star/text/ParagraphVertAlign.hpp> #endif +#endif #ifndef _XMLOFF_XMLTYPES_HXX #include "xmltypes.hxx" @@ -306,11 +308,19 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] = SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { +#if SUPD > 630 { XML_TOP, ParagraphVertAlign::TOP }, { XML_MIDDLE, ParagraphVertAlign::CENTER }, { XML_BOTTOM, ParagraphVertAlign::BOTTOM }, { XML_BASELINE, ParagraphVertAlign::BASELINE }, { XML_AUTO, ParagraphVertAlign::AUTOMATIC }, +#else + { XML_TOP, 2 }, + { XML_MIDDLE, 3 }, + { XML_BOTTOM, 4 }, + { XML_BASELINE, 1 }, + { XML_AUTO, 0 }, +#endif { XML_TOKEN_INVALID, 0 } }; |