Tag: cws_dev300_odfversionedexport
User: iha     
Date: 2008-04-30 15:11:58+0000
Modified:
   dba/reportdesign/source/filter/xml/xmlHelper.cxx

Log:
 #i88889# ODF: Omit export of OFD 1.2 properties when 1.1 is set

File Changes:

Directory: /dba/reportdesign/source/filter/xml/
===============================================

File [changed]: xmlHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.7&r2=1.7.6.1
Delta lines:  +12 -12
---------------------
--- xmlHelper.cxx       2008-04-10 18:38:47+0000        1.7
+++ xmlHelper.cxx       2008-04-30 15:11:55+0000        1.7.6.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xmlHelper.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.6.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -110,16 +110,16 @@
        return pHandler;
 }
 // 
-----------------------------------------------------------------------------
-#define MAP_CONST( name, prefix, token, type, context )  { name.ascii, 
name.length,        XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TEXT,       context }
-#define MAP_CONST_T( name, prefix, token, type, context )  { name.ascii, 
name.length,  XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,    
  context }
-#define MAP_CONST_ASCII_T( name, prefix, token, type, context )  { name, 
sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,   
   context }
-#define MAP_CONST_P( name, prefix, token, type, context )  { name.ascii, 
name.length,  XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_PARAGRAPH,  context }
-#define MAP_CONST_S( name, prefix, token, type, context )  { name, 
sizeof(name)-1,         XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_SECTION,    context }
-#define MAP_CONST_ASCII( name, prefix, token, type, context )  { name, 
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT,   
    context }
-#define GMAP( name, prefix, token, type, context )  { name.ascii, name.length, 
        XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC,    
context }
-#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, 
sizeof(name)-1,        XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TABLE_CELL, context }
-#define MAP_CONST_C( name, prefix, token, type, context )  { name, 
name.length,                XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TABLE_CELL, context }
-#define MAP_END()      { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0}
+#define MAP_CONST( name, prefix, token, type, context )  { name.ascii, 
name.length,        XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TEXT,       context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_T( name, prefix, token, type, context )  { name.ascii, 
name.length,  XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,    
  context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_ASCII_T( name, prefix, token, type, context )  { name, 
sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,   
   context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P( name, prefix, token, type, context )  { name.ascii, 
name.length,  XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_PARAGRAPH,  context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_S( name, prefix, token, type, context )  { name, 
sizeof(name)-1,         XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_SECTION,    context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_ASCII( name, prefix, token, type, context )  { name, 
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT,   
    context, SvtSaveOptions::ODFVER_010 }
+#define GMAP( name, prefix, token, type, context )  { name.ascii, name.length, 
        XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC,    
context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, 
sizeof(name)-1,        XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_C( name, prefix, token, type, context )  { name, 
name.length,                XML_NAMESPACE_##prefix, XML_##token, 
type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, 
SvtSaveOptions::ODFVER_010}
 // 
-----------------------------------------------------------------------------
 UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool 
_bOldFormat)
 {




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to