From 07e59117747d8d341164fda1f2078e3225ba1a68 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Wed, 5 Jan 2011 22:43:00 +0100
Subject: fix shapes rendering order n#656934

 - it was broken for master pages containing group shapes
---
 slideshow/source/engine/slide/slideimpl.cxx | 2 +-
 slideshow/source/inc/shapeimporter.hxx      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 3ea925fb976d..690b601c13ad 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -1140,7 +1140,7 @@ bool SlideImpl::loadShapes()
                 }
                 addPolygons(aMPShapesFunctor.getPolygons());
 
-                nCurrCount = xMasterPageShapes->getCount() + 1;
+                nCurrCount = aMPShapesFunctor.getImportedShapesCount();
             }
             catch( uno::RuntimeException& )
             {
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index c9fd7b738c2d..d8ebed25fba3 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -103,6 +103,8 @@ public:
     */
     bool isImportDone() const;
     PolyPolygonVector getPolygons();
+
+    double getImportedShapesCount() { return mnAscendingPrio; }
 private:
     bool isSkip( ::com::sun::star::uno::Reference<
                  ::com::sun::star::beans::XPropertySet> const& xPropSet,
-- 
cgit