INTEGRATION: CWS impressodf12 (1.15.6); FILE MERGED

2008/05/30 14:09:17 cl 1.15.6.6: #i75927# fixed send to outliner after bullet rework
2008/05/26 12:22:54 cl 1.15.6.5: #i35937# code cleanup after bullet rework
2008/04/25 08:50:30 cl 1.15.6.4: RESYNC: (1.15-1.16); FILE MERGED
2008/04/22 20:01:55 cl 1.15.6.3: added paint first line hdl
2008/04/17 09:02:36 cl 1.15.6.2: #i35937# moved paint of page number to sd
2008/04/13 19:05:20 cl 1.15.6.1: #i35937# allow paragraph depth of -1 to switch of numbering

1 files changed, 28 insertions, 7 deletions

diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 1c24d254dbd9..03b017c2c646 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: OutlineView.hxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,9 +31,10 @@
 #ifndef SD_OUTLINE_VIEW_HXX
 #define SD_OUTLINE_VIEW_HXX
 
+#include <vcl/image.hxx>
+#include <svx/lrspitem.hxx>
 #include "View.hxx"
 
-
 class SdPage;
 class SdrPage;
 class EditStatus;
@@ -41,6 +42,8 @@ class Paragraph;
 class SdrTextObj;
 class Outliner;
 class SfxProgress;
+struct PaintFirstLineInfo;
+struct PasteOrDropInfos;
 
 namespace sd { namespace tools {
 class EventMultiplexerEvent;
@@ -96,7 +99,7 @@ public:
     Paragraph*      GetPrevTitle(const Paragraph* pPara);
     Paragraph*      GetNextTitle(const Paragraph* pPara);
     SdPage*         GetActualPage();
-    SdPage*         GetPageForParagraph( ::Outliner* pOutl, Paragraph* pPara );
+    SdPage*         GetPageForParagraph( Paragraph* pPara );
     Paragraph*      GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage );
 
     /** selects the paragraph for the given page at the outliner view*/
@@ -119,8 +122,9 @@ public:
     DECL_LINK( IndentingPagesHdl, OutlinerView * );
     DECL_LINK( BeginDropHdl, void * );
     DECL_LINK( EndDropHdl, void * );
+    DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* );
 
-    ULONG         GetPaperWidth() const { return 21000; }  // DIN A4 Breite
+    ULONG         GetPaperWidth() const { return 2*21000; }  // DIN A4 Breite
 
     BOOL          PrepareClose(BOOL bUI = TRUE);
 
@@ -161,6 +165,19 @@ public:
     */
     void IgnoreCurrentPageChanges (bool bIgnore);
 
+    sal_Int32 GetPageNumberWidthPixel();
+
+    void InvalidateSlideNumberArea();
+
+    /** creates and inserts an empty slide for the given paragraph. */
+    SdPage* InsertSlideForParagraph( Paragraph* pPara );
+
+    void UpdateParagraph( USHORT nPara );
+
+protected:
+    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos );
+    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos );
+
 private:
     /** call this method before you do anything that can modify the outliner
         and or the drawing document model. It will create needed undo actions */
@@ -176,9 +193,6 @@ private:
     /** updates all changes in the outliner model to the draw model */
     void UpdateDocument();
 
-    /** creates and inserts an empty slide for the given paragraph */
-    SdPage* InsertSlideForParagraph( Paragraph* pPara );
-
     OutlineViewShell*   mpOutlineViewShell;
     SdrOutliner*        mpOutliner;
     OutlinerView*       mpOutlinerView[MAX_OUTLINERVIEWS];
@@ -217,6 +231,13 @@ private:
 
     /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */
     std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard;
+
+    Font maPageNumberFont;
+    sal_Int32 mnPageNumberWidthPixel;
+    Font maBulletFont;
+
+    SvxLRSpaceItem maLRSpaceItem;
+    Image maSlideImage;
 };
 
 // calls IgnoreCurrentPageChangesLevel with true in ctor and with false in dtor