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

[Thorsten Behrens]

 patches/dev300/apply                      |    3 ---
 patches/dev300/oox-ooo330-import-fix.diff |   10 ----------
 patches/dev300/oox-smartart-import.diff   |    3 ++-
 3 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit e45d949eb8ebd302823c4802271f8609fb61f6f3
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Aug 18 18:31:45 2010 +0200

    Rolled oox-ooo330-import-fix into smartart import
    
    * patches/dev300/apply: binned oox-ooo330-import-fix
    * patches/dev300/oox-ooo330-import-fix.diff: added fix from below
    * patches/dev300/oox-smartart-import.diff: rm-ed

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 95551bd..57ebd03 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3653,9 +3653,6 @@ sfx2-style-edit-greyentry.diff, i#85003, simonaw
 [ Netbook ]
 netbook-window-decoration-update.diff, n#621116, rodo
 
-[ Fixes >= ooo330-m2 ]
-oox-ooo330-import-fix.diff, muthusuba
-
 [ CalcFixes >= ooo330-m2 ]
 sc-ooo330-m2-fixes.diff, muthusuba
 
diff --git a/patches/dev300/oox-ooo330-import-fix.diff b/patches/dev300/oox-ooo330-import-fix.diff
deleted file mode 100644
index 1175756..0000000
--- a/patches/dev300/oox-ooo330-import-fix.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- oox/source/core/xmlfilterbase.cxx	2010-08-12 18:51:46.000000000 +0530
-+++ oox/source/core/xmlfilterbase.cxx	2010-08-12 18:51:48.000000000 +0530
-@@ -196,6 +196,7 @@ namespace
-                 NMSP_DRAWINGML,
-                 NMSP_DIAGRAM,
-                 NMSP_CHART,
-+                NMSP_CDR,
-                 NMSP_VML,
-                 NMSP_OFFICE,
-                 NMSP_VML_DOC,
diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index 7ebf549..bcee60d 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -1521,7 +1521,7 @@ index 5ee4052..615cc8f 100644
      OUString            maBinSuffix;
      OUString            maVmlSuffix;
      RelationsMap        maRelationsMap;
-@@ -151,6 +161,65 @@ static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiS
+@@ -151,6 +161,66 @@ static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiS
  
  // ============================================================================
  
@@ -1560,6 +1560,7 @@ index 5ee4052..615cc8f 100644
 +                NMSP_DRAWINGML,
 +                NMSP_DIAGRAM,
 +                NMSP_CHART,
++                NMSP_CDR,
 +                NMSP_VML,
 +                NMSP_OFFICE,
 +                NMSP_VML_DOC,