[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source

[Michael Meeks]

 sd/source/ui/view/DocumentRenderer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6c0f9cc00e81862e888b680a83bd14c0f16811aa
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Feb 27 16:26:39 2012 +0400

    fdo#31966: do not create an empty slide when printing handouts
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 758e5ed..64cd478 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1967,8 +1967,8 @@ private:
 
             // Create a printer page when we have found one page for each
             // placeholder or when this is the last (and special) loop.
-            if (aPageIndices.size() == nShapeCount
-                || nIndex==nCount)
+            if (!aPageIndices.empty() &&
+                (aPageIndices.size() == nShapeCount || nIndex == nCount))
             {
                 maPrinterPages.push_back(
                     ::boost::shared_ptr<PrinterPage>(