From f5dca43c9a814b8955edf6968443737e521162dc Mon Sep 17 00:00:00 2001
From: Christian Lippka <cl@openoffice.org>
Date: Fri, 18 Jun 2010 15:27:12 +0200
Subject: #i102353# correct page number and page count field when printing
 handouts

---
 svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx')

diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 2320944afd03..089f75aa8ade 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -77,8 +77,16 @@ namespace
 
         if(pPage && pPage->GetModel())
         {
-            const sal_uInt16 nPageCount(pPage->GetModel()->GetPageCount());
-            nRetval = ((sal_Int16)nPageCount - 1) / 2;
+            if( (pPage->GetPageNum() == 0) && !pPage->IsMasterPage() )
+            {
+                // handout page!
+                return pPage->GetModel()->getHandoutPageCount();
+            }
+            else
+            {
+                const sal_uInt16 nPageCount(pPage->GetModel()->GetPageCount());
+                nRetval = ((sal_Int16)nPageCount - 1) / 2;
+            }
         }
 
         return nRetval;
-- 
cgit