[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Thorsten Behrens]

 patches/dev300/writer-doc-comparison.diff |   34 +++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

New commits:
commit e6d597a421e39ab63624c07186715d26697e38b4
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue May 18 14:20:51 2010 +0200

    Moved rsid xml attributes to officeooo experimental NS
    
    * patches/dev300/writer-doc-comparison.diff: the code adds two new
      attributes to odf, rsid and paragraph-rsid. moved those to the
      http://openoffice.org/2009/office experimental namespace, and
      made the whole storing conditional to "odf next" mode (the
      default). Checked that older versions don't barf on the unknown
      attrs.

diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index 23cc606..93c1751 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -1,6 +1,6 @@
 Tzvetelinas gsoc project - writer document comparison
 
-From: Thorsten Behrens <thb at openoffice.org>
+From: Thorsten Behrens <tbehrens at novell.com>
 
 
 ---
@@ -38,6 +38,7 @@ From: Thorsten Behrens <thb at openoffice.org>
  sw/source/filter/html/css1atr.cxx                  |    3 
  sw/source/filter/html/htmlatr.cxx                  |    2 
  sw/source/filter/rtf/rtfatr.cxx                    |    3 
+ sw/source/filter/xml/xmlexp.cxx                    |    8 
  sw/source/ui/app/appopt.cxx                        |    1 
  sw/source/ui/app/docsh.cxx                         |    3 
  sw/source/ui/app/swmodul1.cxx                      |   40 +
@@ -57,7 +58,7 @@ From: Thorsten Behrens <thb at openoffice.org>
  xmloff/source/style/xmlbahdl.cxx                   |   42 +
  xmloff/source/style/xmlbahdl.hxx                   |   12 
  xmloff/source/text/txtprmap.cxx                    |    8 
- 52 files changed, 1876 insertions(+), 153 deletions(-)
+ 53 files changed, 1884 insertions(+), 153 deletions(-)
  create mode 100644 svx/inc/svx/rsiditem.hxx
 
 
@@ -2268,6 +2269,25 @@ index bbe9030..faeb5ed 100644
  
  /* RES_PARATR_LIST_ID */            0, // new
  /* RES_PARATR_LIST_LEVEL */         0, // new
+diff --git sw/source/filter/xml/xmlexp.cxx sw/source/filter/xml/xmlexp.cxx
+index f2ec2a7..17010e2 100644
+--- sw/source/filter/xml/xmlexp.cxx
++++ sw/source/filter/xml/xmlexp.cxx
+@@ -240,6 +240,14 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
+     if( (getExportFlags() & (EXPORT_FONTDECLS|EXPORT_STYLES|
+                              EXPORT_MASTERSTYLES|EXPORT_CONTENT)) != 0 )
+     {
++        if( getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
++        {
++            _GetNamespaceMap().Add(
++                GetXMLToken(XML_NP_OFFICE_EXT),
++                GetXMLToken(XML_N_OFFICE_EXT), 
++                XML_NAMESPACE_OFFICE_EXT);
++        }
++
+         GetTextParagraphExport()->SetBlockMode( bBlock );
+ 
+         const SfxPoolItem* pItem;
 diff --git sw/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
 index 1f178d4..e77bf2a 100644
 --- sw/source/ui/app/appopt.cxx
@@ -3015,7 +3035,7 @@ index 9c4e1c3..fbbbbeb 100644
  */
  class XMLStringPropHdl : public XMLPropertyHandler
 diff --git xmloff/source/text/txtprmap.cxx xmloff/source/text/txtprmap.cxx
-index e68469f..6a6e960 100644
+index e68469f..c7758d3 100644
 --- xmloff/source/text/txtprmap.cxx
 +++ xmloff/source/text/txtprmap.cxx
 @@ -149,6 +149,10 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
@@ -3023,9 +3043,9 @@ index e68469f..6a6e960 100644
      // RES_CHRATR_WEIGHT
      MT_E( "CharWeight",		FO,		FONT_WEIGHT,		XML_TYPE_TEXT_WEIGHT, 0 ),
 +	// RES_CHRATR_RSID
-+	MT_E( "Rsid",		TEXT,		RSID,		XML_TYPE_HEX, 0 ),
++    { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
 +	// RES_PARATR_RSID
-+	MT_E( "ParRsid",	TEXT,		PARRSID,	XML_TYPE_HEX, 0 ),
++    { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
      // RES_CHRATR_WORDLINEMODE
      MT_E( "CharWordMode",	STYLE,	TEXT_UNDERLINE_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
      MT_E( "CharWordMode",   STYLE,  TEXT_OVERLINE_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -3034,9 +3054,9 @@ index e68469f..6a6e960 100644
      // RES_CHRATR_WEIGHT
      MT_E( "CharWeight",		FO,		FONT_WEIGHT,		XML_TYPE_TEXT_WEIGHT, 0 ),
 +	// RES_CHRATR_RSID
-+	MT_E( "Rsid",		TEXT,		RSID,		XML_TYPE_HEX, 0 ),
++    { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
 +	// RES_PARATR_RSID
-+	MT_E( "ParRsid",	TEXT,		PARRSID,	XML_TYPE_HEX, 0 ),
++    { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
      // RES_CHRATR_WORDLINEMODE
      MT_E( "CharWordMode",	STYLE,	TEXT_UNDERLINE_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
      MT_E( "CharWordMode",   STYLE,  TEXT_OVERLINE_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),