From 08d8c9eb8ab37669083f3c7da2bc4a6632c41c8f Mon Sep 17 00:00:00 2001
From: Dieter Loeschky <dl@openoffice.org>
Date: Mon, 26 Feb 2001 09:28:07 +0000
Subject: [PATCH] Vertical AutoLayouts

---
 sd/source/core/drawdoc.cxx     | 8 ++++----
 sd/source/ui/func/fuinsfil.cxx | 4 ++--
 sd/source/ui/func/fupage.cxx   | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 7e775232d173..e3092c336656 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drawdoc.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: dl $ $Date: 2001-02-09 13:01:31 $
+ *  last change: $Author: dl $ $Date: 2001-02-26 10:28:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1271,7 +1271,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
         if ( GetMasterSdPageCount(PK_STANDARD) > 1 )
             RemoveUnnessesaryMasterPages( NULL, TRUE, FALSE );
 
-        for ( ULONG i = 0; i < GetPageCount(); i++ )
+        for ( USHORT i = 0; i < GetPageCount(); i++ )
         {
             // Check for correct layout names
             SdPage* pPage = (SdPage*) GetPage( i );
@@ -1287,7 +1287,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
         // previous version may moved other shapes behind the background
         // shape. For performance reason this has to be fixed because
         // the background shape should always have position 0
-        for ( ULONG nPage = 0; nPage < GetMasterSdPageCount( PK_STANDARD ); nPage++)
+        for ( USHORT nPage = 0; nPage < GetMasterSdPageCount( PK_STANDARD ); nPage++)
         {
             SdPage* pPage = GetMasterSdPage( nPage, PK_STANDARD );
             SdrObject* pPresObj = pPage->GetPresObj( PRESOBJ_BACKGROUND ) ;
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 27e9331c5b36..e3c62adce06a 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuinsfil.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: ka $ $Date: 2001-02-21 13:14:54 $
+ *  last change: $Author: dl $ $Date: 2001-02-26 10:26:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 5f0fe52ee130..a1c5e88c1ec3 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fupage.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-14 16:26:16 $
+ *  last change: $Author: dl $ $Date: 2001-02-26 10:26:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -224,8 +224,7 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
         SfxPrinter* pPrinter = ( (SdDrawDocShell*) pViewSh->GetViewFrame()->GetObjectShell() )->GetPrinter(TRUE);
 
         // paperbin
-        USHORT nPaperBin = (USHORT) pPage->GetPaperBin();
-        SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, nPaperBin );
+        SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, pPage->GetPaperBin() );
         aNewAttr.Put( aPaperBinItem );
 
         // Raender, Umrandung und das andere Zeug