diff options
Diffstat (limited to 'sw/source/core/inc')
| -rw-r--r-- | sw/source/core/inc/frmtool.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/pagefrm.hrc | 6 | ||||
| -rw-r--r-- | sw/source/core/inc/pagefrm.hxx | 46 |
3 files changed, 19 insertions, 35 deletions
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 0cc9898089b6..ba1b0f43d539 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -72,7 +72,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *, // - method to align rectangle // Created declaration here to avoid <extern> declarations -void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +void MA_FASTCALL SwAlignRect( SwRect &rRect, const ViewShell *pSh ); // - method to align graphic rectangle // Created declaration here to avoid <extern> declarations diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc index 302ba9a76b16..b8f89e091c15 100644 --- a/sw/source/core/inc/pagefrm.hrc +++ b/sw/source/core/inc/pagefrm.hrc @@ -31,13 +31,11 @@ #include "rcid.hrc" // Bitmaps for page shadow -#define BMP_PAGE_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 0 -#define BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 1 -#define BMP_PAGE_BOTTOM_SHADOW_MASK RC_PAGEFRM_BEGIN + 2 +#define BMP_PAGE_SHADOW_MASK RC_PAGEFRM_BEGIN + 0 // If you add resources, don't forget to update this -#define PAGEFRM_ACT_END BMP_PAGE_BOTTOMLEFT_SHADOW +#define PAGEFRM_ACT_END BMP_PAGE_SHADOW_MASK // Sanity check #if PAGEFRM_ACT_END > RC_PAGEFRM_END diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 92b11aed27ea..1fb456dea39d 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -95,29 +95,7 @@ class SwPageFrm: public SwFtnBossFrm // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten void SetColMaxFtnHeight(); - /** determine rectangle for right page shadow - - #i9719# - - @param _rPageRect - input parameter - constant instance reference of the page rectangle. - Generally, it's the frame area of the page, but for empty pages in print - preview, this parameter is useful. - - @param _pViewShell - input parameter - instance of the view shell, for which the rectangle - has to be generated. - - @param _orRightShadowRect - output parameter - instance reference of the right shadow rectangle for - the given page rectangle - */ - static void GetRightShadowRect( const SwRect& _rPageRect, - ViewShell* _pViewShell, - SwRect& _orRightShadowRect, - bool bRightSidebar ); - - /** determine rectangle for bottom page shadow + /** determine rectangle for horizontal page shadow #i9719# @@ -135,10 +113,11 @@ class SwPageFrm: public SwFtnBossFrm the given page rectangle */ - static void GetBottomShadowRect( const SwRect& _rPageRect, - ViewShell* _pViewShell, + static void GetHorizontalShadowRect( const SwRect& _rPageRect, + const ViewShell* _pViewShell, SwRect& _orBottomShadowRect, - bool bFullBottomShadow, + bool bPaintLeftShadow, + bool bPaintRightShadow, bool bRightSidebar ); /** adds the sidebar used for notes to right and left border @@ -193,6 +172,8 @@ public: inline const SwCntntFrm *FindFirstBodyCntnt() const; inline const SwCntntFrm *FindLastBodyCntnt() const; + SwRect GetBoundRect() const; + //Spezialisiertes GetCntntPos() fuer Felder in Rahmen. void GetCntntPosition( const Point &rPt, SwPosition &rPos ) const; @@ -267,6 +248,8 @@ public: inline void ValidateWordCount() const; inline sal_Bool IsInvalid() const; inline sal_Bool IsInvalidFly() const; + sal_Bool IsRightShadowNeeded() const; + sal_Bool IsLeftShadowNeeded() const; sal_Bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; } sal_Bool IsInvalidFlyCntnt() const { return bInvalidFlyCntnt; } sal_Bool IsInvalidFlyInCnt() const { return bInvalidFlyInCnt; } @@ -328,9 +311,9 @@ public: shadow with & position). */ static void PaintBorderAndShadow( const SwRect& _rPageRect, - ViewShell* _pViewShell, + const ViewShell* _pViewShell, + bool bPaintLeftShadow, bool bPaintRightShadow, - bool bFullBottomShadow, bool bRightSidebar ); /** get bound rectangle of border and shadow for repaints @@ -351,9 +334,12 @@ public: rectangle for the given page rectangle */ static void GetBorderAndShadowBoundRect( const SwRect& _rPageRect, - ViewShell* _pViewShell, + const ViewShell* _pViewShell, SwRect& _orBorderAndShadowBoundRect, - const bool bRightSidebar ); + const bool bLeftShadow, + const bool bRightShadow, + const bool bRightSidebar + ); static void PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight); static void PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown); |