[ooo-build-commit] .: patches/dev300 patches/vba

[Noel Power]

 patches/dev300/calc-distributed-cell-text-xmloff.diff |    4 ++--
 patches/vba/cws-vbasupportdev300-m13.diff             |   12 ++++++------
 patches/vba/cws-vbasupportdev300.diff                 |   12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit f9fafe557a124907ef4e511ed31fdbb24fa424c2
Author: Noel Power <noel.power at novell.com>
Date:   Fri Apr 16 10:48:00 2010 +0100

    ( suspected ) fuzziness cockup, fix pos of tokens in xmltoken.[ch]xx"
    
    * patches/dev300/calc-distributed-cell-text-xmloff.diff:
    * patches/vba/cws-vbasupportdev300-m13.diff:
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/dev300/calc-distributed-cell-text-xmloff.diff b/patches/dev300/calc-distributed-cell-text-xmloff.diff
index 4060677..21712fc 100644
--- a/patches/dev300/calc-distributed-cell-text-xmloff.diff
+++ b/patches/dev300/calc-distributed-cell-text-xmloff.diff
@@ -93,8 +93,8 @@ index fe98301..f01a7ce 100644
 --- xmloff/source/core/xmltoken.cxx
 +++ xmloff/source/core/xmltoken.cxx
 @@ -163,6 +163,9 @@ namespace xmloff { namespace token {
-         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
-         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
+         TOKEN( "formx",                           XML_NP_FORMX ),
+         TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
  
 +        TOKEN( "css3t",                        XML_NP_CSS3TEXT ),
 +        TOKEN( "http://www.w3.org/TR/css3-text/", XML_N_CSS3TEXT ),
diff --git a/patches/vba/cws-vbasupportdev300-m13.diff b/patches/vba/cws-vbasupportdev300-m13.diff
index dfc18c5..4cfaaaa 100644
--- a/patches/vba/cws-vbasupportdev300-m13.diff
+++ b/patches/vba/cws-vbasupportdev300-m13.diff
@@ -47063,17 +47063,17 @@
                              XML_NAMESPACE_XSD );
 --- xmloff/source/core/xmltoken.cxx.old	2010-03-03 16:59:15.000000000 +0100
 +++ xmloff/source/core/xmltoken.cxx	2010-03-03 16:59:35.000000000 +0100
-@@ -156,6 +156,10 @@ namespace xmloff { namespace token {
-         TOKEN( "officeooo", XML_NP_OFFICE_EXT ),
-         TOKEN( "http://openoffice.org/2009/office", XML_N_OFFICE_EXT ),
+@@ -159,6 +159,10 @@ namespace xmloff { namespace token {
+         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
+         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
  
 +        // jonp: 2008-09-24 Excel Interop
 +        TOKEN( "formx",                           XML_NP_FORMX ),
 +        TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
 +
-         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
-         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
- 
+         // units
+         TOKEN( "mm",                              XML_UNIT_MM ),
+         TOKEN( "m",                               XML_UNIT_M ),
 --- xmloff/source/draw/eventimp.cxx.old	2009-10-07 15:07:04.000000000 +0200
 +++ xmloff/source/draw/eventimp.cxx	2010-03-03 16:59:35.000000000 +0100
 @@ -104,9 +104,6 @@ public:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 8775d05..122273d 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -48147,17 +48147,17 @@ diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
 index a1d20d7..5483d42 100644
 --- xmloff/source/core/xmltoken.cxx
 +++ xmloff/source/core/xmltoken.cxx
-@@ -153,6 +153,10 @@ namespace xmloff { namespace token {
-         TOKEN( "officeooo", XML_NP_OFFICE_EXT ),
-         TOKEN( "http://openoffice.org/2009/office", XML_N_OFFICE_EXT ),
+@@ -159,6 +159,10 @@ namespace xmloff { namespace token {
+         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
+         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
  
 +        // jonp: 2008-09-24 Excel Interop
 +        TOKEN( "formx",                           XML_NP_FORMX ),
 +        TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
 +
-         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
-         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
- 
+         // units
+         TOKEN( "mm",                              XML_UNIT_MM ),
+         TOKEN( "m",                               XML_UNIT_M ),
 diff --git xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx
 index 88db3fa..d07ffec 100644
 --- xmloff/source/draw/eventimp.cxx