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

[Kohei Yoshida]

 patches/dev300/cws-cbosdo03.diff              |    4 ++--
 patches/dev300/docx-vml-import.diff           |    4 ++--
 patches/dev300/oox-custom-shape-polygons.diff |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 514c1a68d27067e45d3f3776f164cc6eabead355
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu May 27 15:44:01 2010 -0400

    Fixed patch dependency issues.  Some patches failed to apply in fresh build.
    
    * patches/dev300/cws-cbosdo03.diff:
    * patches/dev300/docx-vml-import.diff:
    * patches/dev300/oox-custom-shape-polygons.diff:

diff --git a/patches/dev300/cws-cbosdo03.diff b/patches/dev300/cws-cbosdo03.diff
index f9d8b7c..c3fb30b 100644
--- a/patches/dev300/cws-cbosdo03.diff
+++ b/patches/dev300/cws-cbosdo03.diff
@@ -73,8 +73,8 @@ index d514781..7790a20 100644
 --- oox/source/shape/ShapeContextHandler.cxx
 +++ oox/source/shape/ShapeContextHandler.cxx
 @@ -31,11 +31,6 @@
+ #include "oox/vml/vmlshape.hxx"
  #include "oox/vml/vmlshapecontainer.hxx"
- #include "tokens.hxx"
  
 -#if DEBUG
 -#include <iostream>
@@ -4052,8 +4052,8 @@ index e661dcf..7374638 100644
 --- writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
 +++ writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
 @@ -51,6 +51,8 @@ class OOXMLDocumentImpl : public OOXMLDocument
+     uno::Reference<frame::XModel> mxModel;
      uno::Reference<drawing::XDrawPage> mxDrawPage;
-     uno::Reference<xml::sax::XFastShapeContextHandler> mxShapeContext;
  
 +    bool mbIsSubstream;
 +
diff --git a/patches/dev300/docx-vml-import.diff b/patches/dev300/docx-vml-import.diff
index 9d4e83d..8b043e9 100644
--- a/patches/dev300/docx-vml-import.diff
+++ b/patches/dev300/docx-vml-import.diff
@@ -398,8 +398,8 @@ index 7aa2d43..e661dcf 100644
      uno::Reference<drawing::XDrawPage> mxDrawPage;
 +    uno::Reference<xml::sax::XFastShapeContextHandler> mxShapeContext;
  
- protected:
-     virtual void resolveFastSubStream(Stream & rStream,
+     bool mbIsSubstream;
+ 
 @@ -107,6 +108,8 @@ public:
      virtual void setXNoteType(const Id & rId);
      virtual const Id & getXNoteType() const;
diff --git a/patches/dev300/oox-custom-shape-polygons.diff b/patches/dev300/oox-custom-shape-polygons.diff
index a985234..9c2e4b3 100644
--- a/patches/dev300/oox-custom-shape-polygons.diff
+++ b/patches/dev300/oox-custom-shape-polygons.diff
@@ -379,8 +379,8 @@ index bdd7833..d514781 100644
  #include "oox/vml/vmlshapecontainer.hxx"
 +#include "tokens.hxx"
  
- #if DEBUG
- #include <iostream>
+ namespace oox { namespace shape {
+ 
 diff --git oox/source/xls/themebuffer.cxx oox/source/xls/themebuffer.cxx
 index 502df78..a3b3970 100644
 --- oox/source/xls/themebuffer.cxx