Update from master repository (DEV300_m98).

1 files changed, 12 insertions, 4 deletions

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 379344667a0c..fb356087245a 100755
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -382,6 +382,7 @@ SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPa
         SdUnoSearchReplaceShape(this),
         mpModel     ( _pModel ),
         mpSdrModel(0),
+        mnTempPageNumber(0),
         mpPropSet   ( _pSet ),
         mbIsImpressDocument(false)
 {
@@ -924,9 +925,18 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
             break;
         }
 
+        case WID_PAGE_NUMBER:
+            if( (GetPage()->GetPageKind() == PK_HANDOUT) && !GetPage()->IsMasterPage() )
+            {
+                if( !(aValue >>= mnTempPageNumber) )
+                    throw lang::IllegalArgumentException();
+
+                break;
+            }
+            throw beans::PropertyVetoException();
+
         case WID_PAGE_LDBITMAP:
         case WID_PAGE_LDNAME:
-        case WID_PAGE_NUMBER:
         case WID_PAGE_ISDARK:
             throw beans::PropertyVetoException();
 
@@ -1053,9 +1063,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
             }
             else
             {
-                // for pages with number 0 (Handout Master, Handout page)
-                // return 0
-                aAny <<= (sal_Int16)0;
+                aAny <<= mnTempPageNumber;
             }
         }
         break;