diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:48:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:48:42 +0000 |
| commit | c0e38c19ce22c7fcfcc8a673cd2cf083128ab745 (patch) | |
| tree | 8234db4281e2f15eb1fd924cb8823babec941efb /xmloff/source/draw | |
| parent | ab9add3bdea623abfc7b362e97d5efc1349c142a (diff) | |
INTEGRATION: CWS odfversionedexport (1.98.22); FILE MERGED
2008/04/30 14:58:39 iha 1.98.22.1: #i88889# ODF: Omit export of OFD 1.2 properties when 1.1 is set
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index e1c617692df5..7740fc51130a 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sdpropls.cxx,v $ - * $Revision: 1.98 $ + * $Revision: 1.99 $ * * This file is part of OpenOffice.org. * @@ -87,11 +87,12 @@ using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; -#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context } +#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context) #define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context) #define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TEXT,context) #define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context) +#define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010} ////////////////////////////////////////////////////////////////////////////// // entry list for graphic properties @@ -295,7 +296,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = // misc object properties GMAP( "MoveProtect", XML_NAMESPACE_STYLE, XML_PROTECT, XML_SD_TYPE_MOVE_PROTECT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, CTF_SD_MOVE_PROTECT ), GMAP( "SizeProtect", XML_NAMESPACE_STYLE, XML_PROTECT, XML_SD_TYPE_SIZE_PROTECT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, CTF_SD_SIZE_PROTECT ), - { 0L, 0, 0, XML_EMPTY, 0, 0 } + MAP_END() }; ////////////////////////////////////////////////////////////////////////////// @@ -343,7 +344,7 @@ const XMLPropertyMapEntry aXMLSDPresPageProps[] = DPMAP( "TransitionSubtype", XML_NAMESPACE_SMIL, XML_SUBTYPE, XML_SD_TYPE_TRANSTIION_SUBTYPE, CTF_PAGE_TRANSITION_SUBTYPE ), DPMAP( "TransitionDirection", XML_NAMESPACE_SMIL, XML_DIRECTION, XML_SD_TYPE_TRANSTIION_DIRECTION, CTF_PAGE_TRANSITION_DIRECTION ), DPMAP( "TransitionFadeColor", XML_NAMESPACE_SMIL, XML_FADECOLOR, XML_TYPE_COLOR, CTF_PAGE_TRANSITION_FADECOLOR ), - { 0L, 0, 0, XML_EMPTY, 0, 0 } + MAP_END() }; const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[] = @@ -353,7 +354,7 @@ const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[] = DPMAP( "IsPageNumberVisible", XML_NAMESPACE_PRESENTATION, XML_DISPLAY_PAGE_NUMBER, XML_SD_TYPE_HEADER_FOOTER_VISIBILITY_TYPE, CTF_PAGE_NUMBER_VISIBLE ), DPMAP( "IsDateTimeVisible", XML_NAMESPACE_PRESENTATION, XML_DISPLAY_DATE_TIME, XML_SD_TYPE_HEADER_FOOTER_VISIBILITY_TYPE, CTF_DATE_TIME_VISIBLE ), - { 0L, 0, 0, XML_EMPTY, 0, 0 } + MAP_END() }; /** contains the attribute to property mapping for a drawing layer table @@ -367,7 +368,7 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] = _MAP( "UseLastColumnStyle", XML_NAMESPACE_TABLE, XML_USE_LAST_COLUMN_STYLES, XML_TYPE_BOOL, 0 ), _MAP( "UseBandingRowStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_ROWS_STYLES, XML_TYPE_BOOL, 0 ), _MAP( "UseBandingColumnStyle", XML_NAMESPACE_TABLE, XML_USE_BANDING_COLUMNS_STYLES, XML_TYPE_BOOL, 0 ), - { 0L, 0, 0, XML_EMPTY, 0, 0 } + MAP_END() }; ////////////////////////////////////////////////////////////////////////////// |