diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:07:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:07:41 +0000 |
| commit | 235c2ce0dd3846117c20e61accbbf3006decda94 (patch) | |
| tree | d8db3016859f4513a57e82071f9c953578371af9 /xmloff/source | |
| parent | cf170c3f6408f232cb10b440d7f2aae081af30ff (diff) | |
INTEGRATION: CWS ause060 (1.9.44); FILE MERGED
2006/09/29 17:24:56 hjs 1.9.44.1: #i69951# remove CONV_STAR_FONTS
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/text/txtparai.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 233d04f84bc6..39b8af1ad03b 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -4,9 +4,9 @@ * * $RCSfile: txtparai.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-19 18:50:52 $ + * last change: $Author: rt $ $Date: 2006-10-30 09:07:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,11 +50,9 @@ namespace text { class XTextRange; } namespace xml { namespace sax { class XAttributeList; } } } } } -#ifdef CONV_STAR_FONTS #define CONV_FROM_STAR_BATS 1 #define CONV_FROM_STAR_MATH 2 #define CONV_STAR_FONT_FLAGS_VALID 4 -#endif class XMLParaContext : public SvXMLImportContext { @@ -69,9 +67,7 @@ class XMLParaContext : public SvXMLImportContext sal_Bool bIsListHeader; sal_Bool bIsRestart; sal_Int16 nStartValue; -#ifdef CONV_STAR_FONTS sal_uInt8 nStarFontsConvFlags; -#endif public: |