[ooo-build-commit] 3 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    7 ++++++-
 patches/dev300/oox-custom-shape-polygons.diff |   22 +++++++---------------
 2 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 36a3e41beaa3d1e4103245b813d6c04f7aa6969e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:38:30 2009 +0300

    Adapt oox-custom-shape-polygons.diff for dev300-m54
    
    * patches/dev300/oox-custom-shape-polygons.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/oox-custom-shape-polygons.diff b/patches/dev300/oox-custom-shape-polygons.diff
index a07c7c7..dc8651c 100644
--- a/patches/dev300/oox-custom-shape-polygons.diff
+++ b/patches/dev300/oox-custom-shape-polygons.diff
@@ -77,8 +77,6 @@ index f3baa2c..ce6e3e7 100644
  #include <com/sun/star/drawing/ShadeMode.hpp>
  #include <com/sun/star/chart2/XChartDocument.hpp>
  #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-diff --git oox/source/drawingml/customshapegeometry.cxx oox/source/drawingml/customshapegeometry.cxx
-index 752c7b1..e4b99d6 100644
 --- oox/source/drawingml/customshapegeometry.cxx
 +++ oox/source/drawingml/customshapegeometry.cxx
 @@ -29,10 +29,12 @@
@@ -95,9 +93,9 @@ index 752c7b1..e4b99d6 100644
  #include "oox/helper/helper.hxx"
  #include "oox/helper/propertymap.hxx"
 @@ -41,6 +43,7 @@
+ #include "tokens.hxx"
  
  using ::rtl::OUString;
- using ::com::sun::star::beans::NamedValue;
 +using namespace ::basegfx;
  using namespace ::oox::core;
  using namespace ::com::sun::star::uno;
@@ -239,14 +237,12 @@ index fc5fe05..f666fb8 100644
  
  using namespace ::oox::core;
  using namespace ::com::sun::star::xml::sax;
-diff --git oox/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/graphicshapecontext.cxx
-index 42e6156..da97719 100644
 --- oox/source/drawingml/graphicshapecontext.cxx
 +++ oox/source/drawingml/graphicshapecontext.cxx
 @@ -32,6 +32,7 @@
+ #include <com/sun/star/chart2/XChartDocument.hpp>
  
  #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
- #include "oox/drawingml/graphicshapecontext.hxx"
 +#include "oox/drawingml/customshapeproperties.hxx"
  #include "oox/drawingml/diagram/diagramfragmenthandler.hxx"
  #include "oox/drawingml/table/tablecontext.hxx"
@@ -348,27 +344,23 @@ index e1a7f63..84e1506 100644
  
  using ::rtl::OUString;
  
-diff --git oox/source/shape/ShapeContextHandler.cxx oox/source/shape/ShapeContextHandler.cxx
-index fd72690..90239fa 100644
 --- oox/source/shape/ShapeContextHandler.cxx
 +++ oox/source/shape/ShapeContextHandler.cxx
 @@ -30,6 +30,7 @@
- 
- #include "ShapeContextHandler.hxx"
- #include "oox/vml/drawingfragmenthandler.hxx"
+ #include "oox/vml/vmldrawingfragment.hxx"
+ #include "oox/vml/vmlshape.hxx"
+ #include "oox/vml/vmlshapecontainer.hxx"
 +#include "tokens.hxx"
  
  namespace oox { namespace shape {
  
-diff --git oox/source/xls/themebuffer.cxx oox/source/xls/themebuffer.cxx
-index 65f9a2f..ca499c5 100644
 --- oox/source/xls/themebuffer.cxx
 +++ oox/source/xls/themebuffer.cxx
 @@ -31,6 +31,7 @@
+ 
  #include "oox/xls/themebuffer.hxx"
  #include "oox/xls/stylesbuffer.hxx"
- #include "oox/xls/stylespropertyhelper.hxx"
 +#include "tokens.hxx"
  
  using ::oox::drawingml::ClrScheme;
- using ::oox::drawingml::Color;
+ 
commit c34acf55979543ae22bcdedb09abc52ce7431745
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:37:41 2009 +0300

    Just a comment edit
    
    * patches/dev300/apply: Edit a comment slightly.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 929af0b..e09130b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1840,7 +1840,7 @@ oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 
 # FIXME: 2009-08-12: Like docx-import-fixes.diff, this is related to
 # the vml shape code which has been significantly restructured
-# upstream Does not apply at all. --tml
+# upstream. --tml
 # oox-fix-ole2.diff, n#485418, rodo
 
 oox-custom-shape-polygons.diff, n#485418, rodo
commit 26d91039fac6427952532ca7e7e768c533d6a2d0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:26:21 2009 +0300

    Bypass oox-fix-ole2.diff for now
    
    * patches/dev300/apply: Bypass oox-fix-ole2.diff for now. Does not
      apply, upstream code has been restructured.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 750b7e4..929af0b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1837,7 +1837,12 @@ oox-import-chart-externalref.diff, n#480868, janneke
 # oox-import-table-autofilter.diff, n#479381, janneke
 
 oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
-oox-fix-ole2.diff, n#485418, rodo
+
+# FIXME: 2009-08-12: Like docx-import-fixes.diff, this is related to
+# the vml shape code which has been significantly restructured
+# upstream Does not apply at all. --tml
+# oox-fix-ole2.diff, n#485418, rodo
+
 oox-custom-shape-polygons.diff, n#485418, rodo
 oox-import-comments-fix-add-annotation.diff, n#480876, janneke
 oox-import-sheet-protect.diff, n#481317, janneke