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

[Petr Mladek]

 patches/dev300/apply                           |    8 +++++-
 patches/dev300/oox-pptx-import-fix-layout.diff |   30 +++++++------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 47e0bb59820acc4cf182db5679bb4760b3bf3909
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Jul 30 19:39:27 2010 +0200

    updated oox-pptx-import-fix-layout.diff for ooo320-m2
    
    * patches/dev300/oox-pptx-import-fix-layout.diff:
    * patches/dev300/apply: updated and enabled again; setPlaceholder method
      was used in more diffs and removed by upstream => it is suspicious

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c930441..a79c05a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2040,7 +2040,13 @@ oox-xlsx-import-fix-connector-shape.diff, n#549331, Fong
 oox-import-drawing-font-spacing.diff, n#479822, rodo
 # FIXME dev300-m83 oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
 
-# FIXME dev300-m83 oox-pptx-import-fix-layout.diff, n#480223, rodo
+# FIXME ooo330-m2: this diff has been disabled in dev300-m83; setPlaceholder was included in the upstream m83 source
+#                  setPlaceholder is missing in the upstream ooo330-m2 sources; it seems that they reverted the change
+#                  they also played with some placeholder in pptshape.cxx and commented it out again;
+#		   it seems that upstream added findPlaceholder methods
+#                  so ???
+#	           pmladek enabled this diff for ooo330-m2 because setPlaceholder was used in more diffs that were enabled with dev300-m83
+oox-pptx-import-fix-layout.diff, n#480223, rodo
 
 [ OpenGLTransitions and OOXML ]
 oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
diff --git a/patches/dev300/oox-pptx-import-fix-layout.diff b/patches/dev300/oox-pptx-import-fix-layout.diff
index 4d15409..9388e47 100644
--- a/patches/dev300/oox-pptx-import-fix-layout.diff
+++ b/patches/dev300/oox-pptx-import-fix-layout.diff
@@ -13,15 +13,19 @@ diff --git oox/inc/oox/ppt/pptshape.hxx oox/inc/oox/ppt/pptshape.hxx
 index a3c1384..f001e03 100644
 --- oox/inc/oox/ppt/pptshape.hxx
 +++ oox/inc/oox/ppt/pptshape.hxx
-@@ -61,9 +61,11 @@ public:
+@@ -61,10 +61,15 @@ public:
      ShapeLocation getShapeLocation() const { return meShapeLocation; };
      sal_Bool isReferenced() const { return mbReferenced; };
      void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; };
-+        void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; }
++    void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; }
  
- protected:
- 
-+        oox::drawingml::ShapePtr mpPlaceholder;
+     static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes );
+     static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes );
+     static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes );
++
++protected: 
++
++    oox::drawingml::ShapePtr mpPlaceholder; 
  };
  
  } }
@@ -29,22 +33,6 @@ diff --git oox/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx
 index 61678d1..548562d 100644
 --- oox/source/ppt/pptshape.cxx
 +++ oox/source/ppt/pptshape.cxx
-@@ -28,6 +28,7 @@
- #include "oox/ppt/pptshape.hxx"
- #include "oox/core/namespaces.hxx"
- #include "oox/core/xmlfilterbase.hxx"
-+#include "oox/drawingml/textbody.hxx"
- #include "tokens.hxx"
- 
- #include <com/sun/star/container/XNamed.hpp>
-@@ -40,6 +41,7 @@
- 
- using rtl::OUString;
- using namespace ::oox::core;
-+using namespace ::oox::drawingml;
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::awt;
- using namespace ::com::sun::star::uno;
 @@ -167,6 +169,18 @@ void PPTShape::addShape(
              // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation
                  if ( !aMasterTextListStyle.get() )