[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Radek Doulík]

 patches/dev300/apply                              |    1 
 patches/dev300/slideshow-fix-rendering-order.diff |   33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

New commits:
commit 3675719bec547225eb2dc3eb662a5a9e4aaafc63
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jan 5 23:07:26 2011 +0100

    fix shapes rendering order n#656934
    
      - it was broken for master pages containing group shapes
    
    * patches/dev300/apply:
    * patches/dev300/slideshow-fix-rendering-order.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ddb1158..cc72091 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4171,3 +4171,4 @@ oox-pptx-import-fix-table-style.diff, n#650008, rodo
 oox-pptx-import-backport-from-LO-fix-zero-sized-shapes.diff, n#650051, rodo
 vcl-canvastools-fix-crash.diff, n#654065, rodo
 filter-fix-too-broad-deep-search.diff, rodo
+slideshow-fix-rendering-order.diff, n#656934, rodo
diff --git a/patches/dev300/slideshow-fix-rendering-order.diff b/patches/dev300/slideshow-fix-rendering-order.diff
new file mode 100644
index 0000000..7dc4445
--- /dev/null
+++ b/patches/dev300/slideshow-fix-rendering-order.diff
@@ -0,0 +1,33 @@
+commit cffbb336ff4a19b2c70aa728535d2deac98fb7d4
+Author: Radek Doulik <rodo at novell.com>
+Date:   Wed Jan 5 22:43:00 2011 +0100
+
+    fix shapes rendering order n#656934
+    
+     - it was broken for master pages containing group shapes
+
+diff --git slideshow/source/engine/slide/slideimpl.cxx slideshow/source/engine/slide/slideimpl.cxx
+index 43eb012..95c047b 100644
+--- slideshow/source/engine/slide/slideimpl.cxx
++++ slideshow/source/engine/slide/slideimpl.cxx
+@@ -1140,7 +1140,7 @@ bool SlideImpl::loadShapes()
+                         mpLayerManager->addShape( rShape );
+                 }
+                 
+-                nCurrCount = xMasterPageShapes->getCount() + 1;
++                nCurrCount = aMPShapesFunctor.getImportedShapesCount();
+             }
+             catch( uno::RuntimeException& )
+             {
+diff --git slideshow/source/inc/shapeimporter.hxx slideshow/source/inc/shapeimporter.hxx
+index 0e7023b..384f35b 100644
+--- slideshow/source/inc/shapeimporter.hxx
++++ slideshow/source/inc/shapeimporter.hxx
+@@ -103,6 +103,7 @@ public:
+     */
+     bool isImportDone() const;
+ 	 
++    double getImportedShapesCount() { return mnAscendingPrio; }
+ private:
+     bool isSkip( ::com::sun::star::uno::Reference<
+                  ::com::sun::star::beans::XPropertySet> const& xPropSet,