diff options
author | Frank Schönheit <fs@openoffice.org> | 2001-06-07 11:25:52 +0000 |
---|---|---|
committer | Frank Schönheit <fs@openoffice.org> | 2001-06-07 11:25:52 +0000 |
commit | b07d04179107315009d8f2d3597daba2748abb18 (patch) | |
tree | b26492828331f93713bd5460fc430537f668cd30 /xmloff/source/forms | |
parent | 180c6fed1efb53be9295beb3bbbb0a52fce6ce0c (diff) |
#86096# enums for FontEmphasis and FontRelief
Diffstat (limited to 'xmloff/source/forms')
-rw-r--r-- | xmloff/source/forms/formenums.cxx | 42 | ||||
-rw-r--r-- | xmloff/source/forms/formenums.hxx | 9 |
2 files changed, 47 insertions, 4 deletions
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 1691f33ffe02..6bb4b0986ee2 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formenums.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fs $ $Date: 2000-12-19 12:13:57 $ + * last change: $Author: fs $ $Date: 2001-06-07 12:25:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,6 +93,12 @@ #ifndef _COM_SUN_STAR_AWT_FONTWIDTH_HPP_ #include <com/sun/star/awt/FontWidth.hpp> #endif +#ifndef _COM_SUN_STAR_AWT_FONTEMPHASISMARK_HPP_ +#include <com/sun/star/awt/FontEmphasisMark.hpp> +#endif +#ifndef _COM_SUN_STAR_AWT_FONTRELIEF_HPP_ +#include <com/sun/star/awt/FontRelief.hpp> +#endif #ifndef _SV_WINTYPES_HXX #include <vcl/wintypes.hxx> // for check states #endif @@ -120,6 +126,7 @@ namespace xmloff NULL, NULL, NULL, + NULL, NULL }; @@ -274,6 +281,34 @@ namespace xmloff rReturn = aBorderTypeMap; }; break; + + case epFontEmphasis: + { + static SvXMLEnumMapEntry aFontEmphasisMap[] = + { + { sXML_none, FontEmphasisMark::NONE }, + { sXML_dot, FontEmphasisMark::DOT }, + { sXML_circle, FontEmphasisMark::CIRCLE }, + { sXML_disc, FontEmphasisMark::DISC }, + { sXML_accent, FontEmphasisMark::ACCENT }, + { 0, 0 } + }; + rReturn = aFontEmphasisMap; + } + break; + + case epFontRelief: + { + static SvXMLEnumMapEntry aFontReliefMap[] = + { + { sXML_none, FontRelief::NONE }, + { sXML_engraved, FontRelief::ENGRAVED }, + { sXML_embossed, FontRelief::EMBOSSED }, + { 0, 0 } + }; + rReturn = aFontReliefMap; + } + break; } } @@ -287,6 +322,9 @@ namespace xmloff /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.5 2000/12/19 12:13:57 fs + * some changes ... now the exported styles are XSL conform + * * Revision 1.4 2000/12/19 08:42:19 fs * removed the epFontWidth * diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx index 246911d30714..cfdd1330ad76 100644 --- a/xmloff/source/forms/formenums.hxx +++ b/xmloff/source/forms/formenums.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formenums.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fs $ $Date: 2000-12-19 12:13:57 $ + * last change: $Author: fs $ $Date: 2001-06-07 12:25:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,6 +89,8 @@ namespace xmloff epCheckState, epTextAlign, epBorderWidth, + epFontEmphasis, + epFontRelief, KNOWN_ENUM_PROPERTIES }; @@ -109,6 +111,9 @@ namespace xmloff /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.5 2000/12/19 12:13:57 fs + * some changes ... now the exported styles are XSL conform + * * Revision 1.4 2000/12/19 08:42:19 fs * removed the epFontWidth * |