From a4b2faf08ac74a2260fb30eddac41c8849335106 Mon Sep 17 00:00:00 2001 From: mseidel Date: Mon, 22 Aug 2022 16:12:05 +0200 Subject: [PATCH] Rename PaintBorderAndShadow -> PaintPageBorder (cherry picked from commit 349543177130a4ef2aa2828e9e63c9dfa2ad2986) --- main/sw/source/core/inc/pagefrm.hxx | 6 +++--- main/sw/source/core/layout/paintfrm.cxx | 12 ++++++------ main/sw/source/core/view/pagepreviewlayout.cxx | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/main/sw/source/core/inc/pagefrm.hxx b/main/sw/source/core/inc/pagefrm.hxx index 255f8731d2..335a083e92 100644 --- a/main/sw/source/core/inc/pagefrm.hxx +++ b/main/sw/source/core/inc/pagefrm.hxx @@ -354,9 +354,9 @@ public: input parameter - instance of the view shell, on which the output has to be generated. */ - static void PaintBorderAndShadow( const SwRect& _rPageRect, - ViewShell* _pViewShell, - bool bRightSidebar ); + static void PaintPageBorder( const SwRect& _rPageRect, + ViewShell* _pViewShell, + bool bRightSidebar ); /** get bound rectangle of border and shadow for repaints diff --git a/main/sw/source/core/layout/paintfrm.cxx b/main/sw/source/core/layout/paintfrm.cxx index b73c24cdfb..4522f2a7a8 100644 --- a/main/sw/source/core/layout/paintfrm.cxx +++ b/main/sw/source/core/layout/paintfrm.cxx @@ -3053,11 +3053,11 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const pPage->Paint( aPaintRect ); - // no paint of page border and shadow, if writer is in place mode. + // no paint of page border if writer is in place mode. if( pSh->GetWin() && pSh->GetDoc()->GetDocShell() && !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() ) { - SwPageFrm::PaintBorderAndShadow( pPage->Frm(), pSh, bRightSidebar ); + SwPageFrm::PaintPageBorder( pPage->Frm(), pSh, bRightSidebar ); SwPageFrm::PaintNotesSidebar( pPage->Frm(), pSh, pPage->GetPhyPageNum(), bRightSidebar); } @@ -3151,7 +3151,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const pSh->GetOut()->SetFont( aOldFont ); // paint border for empty page (shadow removed now) // OD 19.02.2003 #107369# - use new method to paint page border - SwPageFrm::PaintBorderAndShadow( aEmptyPageRect, pSh, bRightSidebar ); + SwPageFrm::PaintPageBorder( aEmptyPageRect, pSh, bRightSidebar ); SwPageFrm::PaintNotesSidebar( aEmptyPageRect, pSh, pPage->GetPhyPageNum(), bRightSidebar); { @@ -5523,9 +5523,9 @@ const sal_Int8 SwPageFrm::mnBorderPxWidth = 1; @author OD */ -/*static*/ void SwPageFrm::PaintBorderAndShadow( const SwRect& _rPageRect, - ViewShell* _pViewShell, - bool bRightSidebar ) +/*static*/ void SwPageFrm::PaintPageBorder( const SwRect& _rPageRect, + ViewShell* _pViewShell, + bool bRightSidebar ) { // --> FME 2004-06-24 #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *_pViewShell->GetOut() ); diff --git a/main/sw/source/core/view/pagepreviewlayout.cxx b/main/sw/source/core/view/pagepreviewlayout.cxx index 1302128695..74a90b11c4 100644 --- a/main/sw/source/core/view/pagepreviewlayout.cxx +++ b/main/sw/source/core/view/pagepreviewlayout.cxx @@ -1149,7 +1149,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const pOutputDev->SetFont( aOldFont ); // paint border for empty page (shadow removed now) // OD 19.02.2003 #107369# - use new method to paint page border - SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true ); + SwPageFrm::PaintPageBorder( aPageRect, &mrParentViewShell, true ); } else { @@ -1164,7 +1164,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const SwPageFrm::GetBorderAndShadowBoundRect( SwRect( aPageRect ), &mrParentViewShell, aPageBorderRect, true ); const Region aDLRegion(aPageBorderRect.SVRect()); mrParentViewShell.DLPrePaint2(aDLRegion); - SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true ); + SwPageFrm::PaintPageBorder( aPageRect, &mrParentViewShell, true ); mrParentViewShell.DLPostPaint2(true); } // <-- @@ -1289,7 +1289,7 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage( SwRect aPageRect( _aSelectedPrevwPage->aLogicPos, _aSelectedPrevwPage->aPageSize ); // OD 19.02.2003 #107369# - use aligned page rectangle, as it is used for - // page border paint - see + // page border paint - see ::SwAlignRect( aPageRect, &mrParentViewShell); Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() );