diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-18 06:50:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-18 06:50:31 +0000 |
| commit | aefdc004a2893f6be691107664d98fdcd3f12308 (patch) | |
| tree | 5d2ffb879a27bfc2036128dd3a4c76d8c028430b /xmloff/source | |
| parent | 0d1c7c1e1213ed4cae6d004969eac30050ccb8e3 (diff) | |
INTEGRATION: CWS swqbugfix01_SRC680 (1.97.78); FILE MERGED
2007/03/28 14:26:17 ama 1.97.78.2: Fix #146584#: flow-with-text
2007/03/27 07:23:14 ama 1.97.78.1: Fix #146584#: flow-with-text style, not draw
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index aec8a19e09e6..340f44d929a8 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtprmap.cxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.98 $ * - * last change: $Author: rt $ $Date: 2006-10-30 09:07:52 $ + * last change: $Author: rt $ $Date: 2007-04-18 07:50:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -701,7 +701,8 @@ XMLPropertyMapEntry aXMLFramePropMap[] = MG_E( "GraphicColorMode", DRAW, COLOR_MODE, XML_TYPE_COLOR_MODE, 0 ), MG_E( "WritingMode", STYLE, WRITING_MODE, XML_TYPE_TEXT_WRITING_MODE_WITH_DEFAULT, 0 ), // RES_FOLLOW_TEXT_FLOW - DVO, OD 01.10.2003 #i18732# - MG_E( "IsFollowingTextFlow", DRAW, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0 ), + MG_E( "IsFollowingTextFlow", DRAW, FLOW_WITH_TEXT, XML_TYPE_BOOL|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLD_FLOW_WITH_TEXT ), + MG_E( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0 ), // OD 2004-05-05 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS MG_E( "WrapInfluenceOnPosition", DRAW, WRAP_INFLUENCE_ON_POSITION, XML_TYPE_WRAP_INFLUENCE_ON_POSITION, 0 ), |