diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:03:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:03:51 +0000 |
| commit | ae2e8dfee1e9c1c38938877a8682fcf9dd867b87 (patch) | |
| tree | 1c380e88bdb2ea594d6f8fd151227a4c9b341e0b | |
| parent | ad97ca5b0cef8a971c762e0916c47b58a6298b5e (diff) | |
INTEGRATION: CWS mingwport03 (1.16.88); FILE MERGED
2006/11/09 00:40:26 vg 1.16.88.2: RESYNC: (1.16-1.17); FILE MERGED
2006/09/13 14:27:28 vg 1.16.88.1: #i53572# MinGW port
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index ed4be6b78ef6..2603d5ccf169 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxhtml.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:25:00 $ + * last change: $Author: vg $ $Date: 2007-03-26 15:03:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,11 @@ sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-"; #define HTML_META_CONTENT_TYPE 12 // <INPUT TYPE=xxx> +#ifdef __MINGW32__ // for runtime pseudo reloc +static HTMLOptionEnum aAreaShapeOptEnums[] = +#else static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] = +#endif { { sHTML_SH_rect, IMAP_OBJ_RECTANGLE }, { sHTML_SH_rectangle, IMAP_OBJ_RECTANGLE }, @@ -117,7 +121,11 @@ static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] = }; // <META NAME=xxx> +#ifdef __MINGW32__ // for runtime pseudo reloc +static HTMLOptionEnum aHTMLMetaNameTable[] = +#else static HTMLOptionEnum __READONLY_DATA aHTMLMetaNameTable[] = +#endif { { sHTML_META_author, HTML_META_AUTHOR }, { sHTML_META_changed, HTML_META_CHANGED }, |