diff options
Diffstat (limited to 'sw/source/core')
29 files changed, 112 insertions, 98 deletions
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index 32c87e82ebde..041698987d52 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -282,7 +282,7 @@ SwRect SwAccessibleChild::GetBounds( const SwAccessibleMap& rAccMap ) const aBound = SwRect( mpFrame->getFrameArea().Left(), mpFrame->getFrameArea().Top()-1, 0, 0 ); } else - aBound = mpFrame->PaintArea(); + aBound = mpFrame->GetPaintArea(); } else if( mpDrawObj ) { diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 1ff730d580fb..e064ec069a32 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -212,7 +212,7 @@ static void lcl_ClearArea( const SwFrame &rFrame, } } -void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwNoTextFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { if ( getFrameArea().IsEmpty() ) return; diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 56558e29b7fe..ce6670f4bd26 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -525,7 +525,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject( RestoreMapMode aRestoreMapModeIfNeeded( pShell ); // paint the FlyFrame (use standard VCL-Paint) - m_pFlyFrame->Paint( *pShell->GetOut(), GetFlyFrame()->getFrameArea() ); + m_pFlyFrame->PaintSwFrame( *pShell->GetOut(), GetFlyFrame()->getFrameArea() ); } } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index f4dc58a07fad..9b7d43e4c716 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -257,7 +257,7 @@ SwTextFrame* SwAutoFormat::GetFrame( const SwTextNode& rTextNd ) const pFrame->Calc(pFrame->getRootFrame()->GetCurrShell()->GetOut()); if( pFrame->getFrameArea() != aTmpFrame || pFrame->getFramePrintArea() != aTmpPrt || - ( pFrame->IsTextFrame() && !const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pFrame))->Paint().IsEmpty() ) ) + ( pFrame->IsTextFrame() && !const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pFrame))->GetPaintSwRect().IsEmpty() ) ) { pFrame->SetCompletePaint(); } diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 541bbb872600..d97e6cb40f46 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -43,7 +43,7 @@ public: SwCellFrame( const SwTableBox &, SwFrame*, bool bInsertContent ); virtual bool GetCursorOfst( SwPosition *, Point&, SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual void CheckDirection( bool bVert ) override; diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index d966f8716311..04c33f659732 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -149,7 +149,7 @@ public: // get client information virtual bool GetInfo( SfxPoolItem& ) const override; - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual Size ChgSize( const Size& aNewSize ) override; virtual bool GetCursorOfst( SwPosition *, Point&, diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 25b65a992ff6..b1bbc0cc629b 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -531,11 +531,11 @@ public: // #i28701# - change purpose of method and adjust its name void InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs = true ); - virtual void PaintBorder( const SwRect&, const SwPageFrame *pPage, + virtual void PaintSwFrameShadowAndBorder( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs & ) const; void PaintBaBo( const SwRect&, const SwPageFrame *pPage, const bool bOnlyTextBackground = false) const; - void PaintBackground( const SwRect&, const SwPageFrame *pPage, + void PaintSwFrameBackground( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs &, const bool bLowerMode = false, const bool bLowerBorder = false, @@ -702,7 +702,8 @@ public: // PaintArea is the area where content might be displayed. // The margin of a page or the space between columns belongs to it. - const SwRect PaintArea() const; + const SwRect GetPaintArea() const; + // UnionFrame is the union of Frame- and PrtArea, normally identical // to the FrameArea except in case of negative Prt margins. const SwRect UnionFrame( bool bBorder = false ) const; @@ -792,7 +793,7 @@ public: SwCursorMoveState* = nullptr, bool bTestBackground = false ) const; virtual bool GetCharRect( SwRect &, const SwPosition&, SwCursorMoveState* = nullptr, bool bAllowFarAway = true ) const; - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const; // HACK: shortcut between frame and formatting diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 3d3fbb38171b..6ba563cd3f31 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -43,7 +43,7 @@ public: virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; - virtual void PaintBorder( const SwRect &, const SwPageFrame *pPage, + virtual void PaintSwFrameShadowAndBorder( const SwRect &, const SwPageFrame *pPage, const SwBorderAttrs & ) const override; virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; void PaintLine( const SwRect &, const SwPageFrame * ) const; diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index aa5ea1d50a8c..4e7d210c0fff 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -95,7 +95,7 @@ public: SwLayoutFrame( SwFrameFormat*, SwFrame* ); - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; const SwFrame *Lower() const { return m_pLower; } SwFrame *Lower() { return m_pLower; } diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index 2726a4eb5071..8685aa948895 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -54,7 +54,7 @@ protected: public: SwNoTextFrame( SwNoTextNode * const, SwFrame* ); - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual bool GetCharRect( SwRect &, const SwPosition&, SwCursorMoveState* = nullptr, bool bAllowFarAway = true ) const override; diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx index bc041859c1d2..04c62873fc5a 100644 --- a/sw/source/core/inc/ptqueue.hxx +++ b/sw/source/core/inc/ptqueue.hxx @@ -23,14 +23,14 @@ * Unfortunately we have some problems with processing more than one Paint() * at a time. This happens especially often during printing. * - * SwRootFrame::Paint() determines that it's called a second time and adds the + * SwRootFrame::PaintSwFrame() determines that it's called a second time and adds the * rectangle and the corresponding Shell to the PaintCollector. * The call sites that are causing the double Paint() only need to process the * collected Paint()s at the right point in time. * Doing this during printing (after having printed one page) is very suitable * for doing that. * - * Invalidating windows directly from the RootFrame::Paint was not a successful + * Invalidating windows directly from the RootFrame::PaintSwFrame was not a successful * approach, because the Paint()s arrive at a very unfavourable point in time. * Triggering an update for all windows after printing each page does not seem * appropriate either: on the one hand we don't have direct access to the edit diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 8dfc3452dd94..c57135b0544f 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -221,7 +221,7 @@ public: virtual bool GetCursorOfst( SwPosition *, Point&, SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index aa74c3239699..288055e9e30a 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -125,7 +125,7 @@ public: SwTabFrame* FindMaster( bool bFirstMaster = false ) const; virtual bool GetInfo( SfxPoolItem &rHint ) const override; - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual void CheckDirection( bool bVert ) override; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index aec763d3cefd..e510ca4d5934 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -278,8 +278,8 @@ public: { return GetCursorOfst_( pPos, rPoint, false ); } void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. - SwRect Paint(); - virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, + SwRect GetPaintSwRect(); + virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual bool GetInfo( SfxPoolItem & ) const override; diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index fecae93accd2..969699fe6dbb 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -67,7 +67,7 @@ * program execution, then set the lowest bit (PROT::Init) of * SwProtocol::nRecord. This activates the function group of the following * macro and causes it to be logged in the future. - * 3. There's a special case for 2: If one uses 2. in SwRootFrame::Paint(..), + * 3. There's a special case for 2: If one uses 2. in SwRootFrame::PaintSwFrame(..), * the log settings are taken from the file "dbg_lay.ini"! * In this INI-file you can have comment lines starting with a '#'. * The sections "[frmid]", "[frmtype]" and "[record]" are relevant. diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 7b23377bb48d..af53d9e7a32e 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -205,7 +205,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if ( pCnt->IsCompletePaint() || !pCnt->IsTextFrame() ) { - SwRect aPaint( pCnt->PaintArea() ); + SwRect aPaint( pCnt->GetPaintArea() ); if ( !PaintContent_( pCnt, pPage, aPaint ) ) pCnt->ResetCompletePaint(); } @@ -219,14 +219,14 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if( bHeightDiff ) { // consider whole potential paint area. - SwRect aDrawRect( pCnt->PaintArea() ); + SwRect aDrawRect( pCnt->GetPaintArea() ); if( nOldHeight > nNewHeight ) nOldBottom = aRectFnSet.GetPrtBottom(*pCnt); aRectFnSet.SetTop( aDrawRect, nOldBottom ); PaintContent_( pCnt, pPage, aDrawRect ); } // paint content area - SwRect aPaintRect = static_cast<SwTextFrame*>(const_cast<SwContentFrame*>(pCnt))->Paint(); + SwRect aPaintRect = static_cast<SwTextFrame*>(const_cast<SwContentFrame*>(pCnt))->GetPaintSwRect(); PaintContent_( pCnt, pPage, aPaintRect ); } @@ -239,7 +239,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if( pSct->IsRetouche() && !pSct->GetNext() ) pTmp = pSct; } - SwRect aRect( pTmp->GetUpper()->PaintArea() ); + SwRect aRect( pTmp->GetUpper()->GetPaintArea() ); aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTmp) ); if ( !PaintContent_( pCnt, pPage, aRect ) ) pCnt->ResetRetouche(); @@ -1329,7 +1329,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa { // vertical layout support SwRectFnSet aRectFnSet(pLay); - SwRect aRect( pLay->GetUpper()->PaintArea() ); + SwRect aRect( pLay->GetUpper()->GetPaintArea() ); aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pLay) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) pLay->ResetRetouche(); @@ -1467,7 +1467,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) { bChanged = true; } - const SwRect aPaintFrame = pTab->PaintArea(); + const SwRect aPaintFrame = pTab->GetPaintArea(); if ( IsPaint() && bAddRect ) { @@ -1522,7 +1522,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) if ( pTab->IsRetouche() && !pTab->GetNext() ) { - SwRect aRect( pTab->GetUpper()->PaintArea() ); + SwRect aRect( pTab->GetUpper()->GetPaintArea() ); // vertical layout support aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTab) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) @@ -1540,7 +1540,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) { // set correct rectangle for retouche: area between bottom of table frame // and bottom of paint area of the upper frame. - SwRect aRect( pTab->GetUpper()->PaintArea() ); + SwRect aRect( pTab->GetUpper()->GetPaintArea() ); // vertical layout support aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTab) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 48534137c6c7..ad733b8ab63e 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -257,7 +257,7 @@ struct SwPaintProperties { SwViewShell *pSGlobalShell; // Retouch for transparent Flys is done by the background of the Flys. - // The Fly itself should certainly not be spared out. See PaintBackground and + // The Fly itself should certainly not be spared out. See PaintSwFrameBackground and // lcl_SubtractFlys() SwFlyFrame *pSRetoucheFly; SwFlyFrame *pSRetoucheFly2; @@ -277,7 +277,7 @@ struct SwPaintProperties { SfxProgress *pSProgress; // Sizes of a pixel and the corresponding halves. Will be reset when - // entering SwRootFrame::Paint + // entering SwRootFrame::PaintSwFrame long nSPixelSzW; long nSPixelSzH; long nSHalfPixelSzW; @@ -2179,7 +2179,7 @@ void DrawGraphic( } /** - * Local helper for SwRootFrame::Paint(..) - Adjust given rectangle to pixel size + * Local helper for SwRootFrame::PaintSwFrame(..) - Adjust given rectangle to pixel size * * By OD at 27.09.2002 for #103636# * In order to avoid paint errors caused by multiple alignments (e.g. ::SwAlignRect(..)) @@ -2956,7 +2956,7 @@ namespace * 3. Paint the document content (text) * 4. Paint the draw layer that is above the document |*/ -void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const pPrintData) const +void SwRootFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const pPrintData) const { OSL_ENSURE( Lower() && Lower()->IsPageFrame(), "Lower of root is no page." ); @@ -3171,7 +3171,7 @@ void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, gProp.pSSpecSubsLines->PaintSubsidiary( pSh->GetOut(), nullptr, gProp ); } - pPage->Paint( rRenderContext, aPaintRect ); + pPage->PaintSwFrame( rRenderContext, aPaintRect ); // no paint of page border and shadow, if writer is in place mode. if( pSh->GetWin() && pSh->GetDoc()->GetDocShell() && @@ -3370,7 +3370,7 @@ SwShortCut::SwShortCut( const SwFrame& rFrame, const SwRect& rRect ) } } -void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { // #i16816# tagged pdf support Frame_Info aFrameInfo( *this ); @@ -3396,7 +3396,7 @@ void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec while ( IsAnLower( pFrame ) ) { - SwRect aPaintRect( pFrame->PaintArea() ); + SwRect aPaintRect( pFrame->GetPaintArea() ); if( aShortCut.Stop( aPaintRect ) ) break; if ( bCnt && gProp.pSProgress ) @@ -3456,7 +3456,7 @@ void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec pFrame->ResetCompletePaint(); aPaintRect.Intersection_( rRect ); - pFrame->Paint( rRenderContext, aPaintRect ); + pFrame->PaintSwFrame( rRenderContext, aPaintRect ); if ( Lower() && Lower()->IsColumnFrame() ) { @@ -3881,10 +3881,10 @@ bool SwFlyFrame::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) return bPaint; } -void SwCellFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwCellFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { if ( GetLayoutRowSpan() >= 1 ) - SwLayoutFrame::Paint( rRenderContext, rRect ); + SwLayoutFrame::PaintSwFrame( rRenderContext, rRect ); } struct BorderLinesGuard @@ -3902,7 +3902,7 @@ private: BorderLines *const m_pBorderLines; }; -void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwFlyFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { //optimize thumbnail generation and store procedure to improve odt saving performance, #i120030# SwViewShell *pShell = getRootFrame()->GetCurrShell(); @@ -4017,7 +4017,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, const SwBorderAttrs &rAttrs = *aAccess.Get(); SwRect aPaintRect( aRect ); aPaintRect.Intersection_( pParentFlyFrame->getFrameArea() ); - pParentFlyFrame->PaintBackground( aPaintRect, pPage, rAttrs ); + pParentFlyFrame->PaintSwFrameBackground( aPaintRect, pPage, rAttrs ); gProp.pSRetoucheFly2 = pOldRet; } @@ -4025,8 +4025,8 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, if ( bPaintCompleteBack || bPaintMarginOnly ) { - //#24926# JP 01.02.96, PaintBaBo is here partially so PaintBorder - //receives the original Rect but PaintBackground only the limited + //#24926# JP 01.02.96, PaintBaBo is here partially so PaintSwFrameShadowAndBorder + //receives the original Rect but PaintSwFrameBackground only the limited //one. // OD 2004-04-23 #116347# @@ -4057,26 +4057,35 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, rRenderContext.Push(); // #i80822# // apply clip region under the same conditions, which are - // used in <SwNoTextFrame::Paint(..)> to set the clip region + // used in <SwNoTextFrame::PaintSwFrame(..)> to set the clip region // for painting the graphic/OLE. Thus, the clip region is // also applied for the PDF export. SwViewShell *pSh = getRootFrame()->GetCurrShell(); + if ( !rRenderContext.GetConnectMetaFile() || !pSh || !pSh->GetWin() ) { rRenderContext.SetClipRegion(vcl::Region(aPoly)); } + for ( size_t i = 0; i < aRegion.size(); ++i ) - PaintBackground( aRegion[i], pPage, rAttrs, false, true ); + { + PaintSwFrameBackground( aRegion[i], pPage, rAttrs, false, true ); + } + rRenderContext.Pop(); } else + { for ( size_t i = 0; i < aRegion.size(); ++i ) - PaintBackground( aRegion[i], pPage, rAttrs, false, true ); + { + PaintSwFrameBackground( aRegion[i], pPage, rAttrs, false, true ); + } + } } // OD 06.08.2002 #99657# - paint border before painting background // paint border - PaintBorder( rRect, pPage, rAttrs ); + PaintSwFrameShadowAndBorder( rRect, pPage, rAttrs ); rRenderContext.Pop(); } @@ -4137,7 +4146,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, } } - SwLayoutFrame::Paint( rRenderContext, aRect ); + SwLayoutFrame::PaintSwFrame( rRenderContext, aRect ); Validate(); @@ -4154,7 +4163,7 @@ void SwFlyFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, gProp.pSProgress->Reschedule(); } -void SwTabFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwTabFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { const SwViewOption* pViewOption = gProp.pSGlobalShell->GetViewOptions(); if (pViewOption->IsTable()) @@ -4177,7 +4186,7 @@ void SwTabFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, aHelper.PaintLines(rRenderContext, rRect); } - SwLayoutFrame::Paint( rRenderContext, rRect ); + SwLayoutFrame::PaintSwFrame( rRenderContext, rRect ); } // OD 10.01.2003 #i6467# - no light grey rectangle for page preview else if ( gProp.pSGlobalShell->GetWin() && !gProp.pSGlobalShell->IsPreview() ) @@ -5232,7 +5241,7 @@ void SwFrame::ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DCon } /// Paints shadows and borders -void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage, +void SwFrame::PaintSwFrameShadowAndBorder( const SwRect& rRect, const SwPageFrame *pPage, const SwBorderAttrs &rAttrs ) const { // There's nothing (Row,Body,Footnote,Root,Column,NoText) need to do here @@ -5374,7 +5383,7 @@ void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage, * Currently only the top frame needs to be taken into account * Other lines and shadows are set aside */ -void SwFootnoteContFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage, +void SwFootnoteContFrame::PaintSwFrameShadowAndBorder( const SwRect& rRect, const SwPageFrame *pPage, const SwBorderAttrs & ) const { //If the rectangle is completely inside the PrtArea, no border needs to @@ -6248,7 +6257,7 @@ void SwFrame::PaintBaBo( const SwRect& rRect, const SwPageFrame *pPage, const SwBorderAttrs &rAttrs = *aAccess.Get(); // OD 20.11.2002 #104598# - take care of page margin area - // Note: code move from <SwFrame::PaintBackground(..)> to new method + // Note: code move from <SwFrame::PaintSwFrameBackground(..)> to new method // <SwPageFrame::Paintmargin(..)>. if ( IsPageFrame() && !bOnlyTextBackground) { @@ -6257,7 +6266,7 @@ void SwFrame::PaintBaBo( const SwRect& rRect, const SwPageFrame *pPage, // paint background { - PaintBackground( rRect, pPage, rAttrs, false, true/*bLowerBorder*/, bOnlyTextBackground ); + PaintSwFrameBackground( rRect, pPage, rAttrs, false, true/*bLowerBorder*/, bOnlyTextBackground ); } // OD 06.08.2002 #99657# - paint border before painting background @@ -6267,7 +6276,7 @@ void SwFrame::PaintBaBo( const SwRect& rRect, const SwPageFrame *pPage, SwRect aRect( rRect ); if( IsPageFrame() ) static_cast<const SwPageFrame*>(this)->PaintGrid( pOut, aRect ); - PaintBorder( aRect, pPage, rAttrs ); + PaintSwFrameShadowAndBorder( aRect, pPage, rAttrs ); } pOut->Pop(); @@ -6285,7 +6294,7 @@ static bool lcl_compareFillAttributes(const drawinglayer::attribute::SdrAllFillA /// OD 05.09.2002 #102912# /// Do not paint background for fly frames without a background brush by /// calling <PaintBaBo> at the page or at the fly frame its anchored -void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage, +void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pPage, const SwBorderAttrs & rAttrs, const bool bLowerMode, const bool bLowerBorder, @@ -6489,7 +6498,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage, if ( pFrame ) { SwRect aFrameRect; - SwRect aRect( PaintArea() ); + SwRect aRect( GetPaintArea() ); aRect.Intersection_( rRect ); SwRect aBorderRect( aRect ); SwShortCut aShortCut( *pFrame, aBorderRect ); @@ -6497,17 +6506,21 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage, { if ( gProp.pSProgress ) gProp.pSProgress->Reschedule(); - aFrameRect = pFrame->PaintArea(); + aFrameRect = pFrame->GetPaintArea(); if ( aFrameRect.IsOver( aBorderRect ) ) { SwBorderAttrAccess aAccess( SwFrame::GetCache(), pFrame ); const SwBorderAttrs &rTmpAttrs = *aAccess.Get(); - if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) || - aFrameRect.IsOver( aRect ) ) - pFrame->PaintBackground( aRect, pPage, rTmpAttrs, bLowMode, + if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) || aFrameRect.IsOver( aRect ) ) + { + pFrame->PaintSwFrameBackground( aRect, pPage, rTmpAttrs, bLowMode, bLowerBorder, bOnlyTextBackground ); + } + if ( bLowerBorder ) - pFrame->PaintBorder( aBorderRect, pPage, rTmpAttrs ); + { + pFrame->PaintSwFrameShadowAndBorder( aBorderRect, pPage, rTmpAttrs ); + } } pFrame = pFrame->GetNext(); } while ( pFrame && pFrame->GetUpper() == this && @@ -7178,7 +7191,7 @@ const vcl::Font& SwPageFrame::GetEmptyPageFont() * * Retouch will only be done, if the Frame is the last one in his chain. * The whole area of the upper which is located below the Frame will be - * cleared using PaintBackground. + * cleared using PaintSwFrameBackground. */ void SwFrame::Retouch( const SwPageFrame * pPage, const SwRect &rRect ) const { @@ -7188,7 +7201,7 @@ void SwFrame::Retouch( const SwPageFrame * pPage, const SwRect &rRect ) const OSL_ENSURE( GetUpper(), "Retouche try without Upper." ); OSL_ENSURE( getRootFrame()->GetCurrShell() && gProp.pSGlobalShell->GetWin(), "Retouche on a printer?" ); - SwRect aRetouche( GetUpper()->PaintArea() ); + SwRect aRetouche( GetUpper()->GetPaintArea() ); aRetouche.Top( getFrameArea().Top() + getFrameArea().Height() ); aRetouche.Intersection( gProp.pSGlobalShell->VisArea() ); @@ -7515,7 +7528,7 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) &aSwRedirector ); gProp.pSLines->PaintLines( pDev, gProp ); if ( pFly->IsFlyInContentFrame() ) - pFly->Paint( *pDev, aOut ); + pFly->PaintSwFrame( *pDev, aOut ); gProp.pSLines->PaintLines( pDev, gProp ); // OD 30.08.2002 #102450# - add 3rd parameter pImp->PaintLayer( rIDDMA.GetHeavenId(), nullptr, diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 26b15e0e781f..ef7067aae000 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -593,7 +593,7 @@ SwLayoutFrame::~SwLayoutFrame() |* to be displayed. This region could be larger than the printarea (getFramePrintArea()) |* of the upper, it includes e.g. often the margin of the page. |*/ -const SwRect SwFrame::PaintArea() const +const SwRect SwFrame::GetPaintArea() const { // NEW TABLES // Cell frames may not leave their upper: @@ -623,7 +623,7 @@ const SwRect SwFrame::PaintArea() const else nTmpRight = (pNxt->getFrameArea().*fnRect->fnGetRight)(); } - OSL_ENSURE( pTmp, "PaintArea lost in time and space" ); + OSL_ENSURE( pTmp, "GetPaintArea lost in time and space" ); if( pTmp->IsPageFrame() || pTmp->IsFlyFrame() || pTmp->IsCellFrame() || pTmp->IsRowFrame() || //nobody leaves a table! pTmp->IsRootFrame() ) diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 1225e6f65f41..df410a56ceb2 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -154,7 +154,7 @@ bool SwLayoutFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint, const bool bContentCheck = pFrame->IsTextFrame() && pCMS && pCMS->m_bContentCheck; const SwRect aPaintRect( bContentCheck ? pFrame->UnionFrame() : - pFrame->PaintArea() ); + pFrame->GetPaintArea() ); if ( aPaintRect.IsInside( rPoint ) && ( bContentCheck || pFrame->GetCursorOfst( pPos, rPoint, pCMS ) ) ) @@ -358,7 +358,7 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint, bool SwLayoutFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) const { - if( rRect.IsOver(PaintArea()) ) + if( rRect.IsOver(GetPaintArea()) ) { const SwFrame* pFrame = Lower(); while( pFrame ) @@ -373,7 +373,7 @@ bool SwLayoutFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) bool SwPageFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) const { bool bRet = false; - if( rRect.IsOver(PaintArea()) ) + if( rRect.IsOver(GetPaintArea()) ) { bRet = SwLayoutFrame::FillSelection( rList, rRect ); if( GetSortedObjs() ) @@ -2106,11 +2106,11 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) Sw2LinesPos *pEnd2Pos = aTmpState.m_p2Lines; SwRect aStFrame ( pStartFrame->UnionFrame( true ) ); - aStFrame.Intersection( pStartFrame->PaintArea() ); + aStFrame.Intersection( pStartFrame->GetPaintArea() ); SwRect aEndFrame( pStartFrame == pEndFrame ? aStFrame : pEndFrame->UnionFrame( true ) ); if( pStartFrame != pEndFrame ) { - aEndFrame.Intersection( pEndFrame->PaintArea() ); + aEndFrame.Intersection( pEndFrame->GetPaintArea() ); } SwRectFnSet aRectFnSet(pStartFrame); const bool bR2L = pStartFrame->IsRightToLeft(); @@ -2475,7 +2475,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) ( !pCellBox || pCellBox == pTmpCellBox ) ) { SwRect aCRect( pContent->UnionFrame( true ) ); - aCRect.Intersection( pContent->PaintArea() ); + aCRect.Intersection( pContent->GetPaintArea() ); if( aCRect.IsOver( aRegion.GetOrigin() )) { SwRect aTmp( aPrvRect ); diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx index 4ad3f56bfee2..64df237862bd 100644 --- a/sw/source/core/layout/unusedf.cxx +++ b/sw/source/core/layout/unusedf.cxx @@ -26,9 +26,9 @@ void SwFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttr OSL_FAIL( "Format() of the base class called." ); } -void SwFrame::Paint(vcl::RenderContext&, SwRect const&, SwPrintData const*const) const +void SwFrame::PaintSwFrame(vcl::RenderContext&, SwRect const&, SwPrintData const*const) const { - OSL_FAIL( "Paint() of the base class called." ); + OSL_FAIL( "PaintSwFrame() of the base class called." ); } bool SwContentFrame::WouldFit( SwTwips &, bool&, bool ) diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index d4f4a9097b9c..794a90f1260a 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -404,10 +404,10 @@ void SwTextFrame::PaintExtraData( const SwRect &rRect ) const } -SwRect SwTextFrame::Paint() +SwRect SwTextFrame::GetPaintSwRect() { // finger layout - OSL_ENSURE( isFrameAreaPositionValid(), "+SwTextFrame::Paint: no Calc()" ); + OSL_ENSURE( isFrameAreaPositionValid(), "+SwTextFrame::GetPaintSwRect: no Calc()" ); SwRect aRet( getFramePrintArea() ); if ( IsEmpty() || !HasPara() ) @@ -569,7 +569,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const return false; } -void SwTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const +void SwTextFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const { ResetRepaint(); @@ -591,7 +591,7 @@ void SwTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, // It can happen that the IdleCollector withdrew my cached information if( !HasPara() ) { - OSL_ENSURE( isFrameAreaPositionValid(), "+SwTextFrame::Paint: no Calc()" ); + OSL_ENSURE( isFrameAreaPositionValid(), "+SwTextFrame::PaintSwFrame: no Calc()" ); // #i29062# pass info that we are currently // painting. @@ -603,7 +603,7 @@ void SwTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, } if( !HasPara() ) { - OSL_ENSURE( false, "+SwTextFrame::Paint: missing format information" ); + OSL_ENSURE( false, "+SwTextFrame::PaintSwFrame: missing format information" ); return; } } diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 373350c2f6d1..58c811ca7f90 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -1752,8 +1752,8 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoint, bool SwTextFrame::FillSelection( SwSelectionList& rSelList, const SwRect& rRect ) const { bool bRet = false; - // PaintArea() instead getFrameArea() for negative indents - SwRect aTmpFrame( PaintArea() ); + // GetPaintArea() instead getFrameArea() for negative indents + SwRect aTmpFrame( GetPaintArea() ); if( !rRect.IsOver( aTmpFrame ) ) return false; if( rSelList.checkContext( this ) ) diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 1d867836d1ca..e9cf3900f0d2 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -226,7 +226,7 @@ void sw::FlyContentPortion::Paint(const SwTextPaintInfo& rInf) const // GetFlyFrame() may change the layout mode at the output device. { SwLayoutModeModifier aLayoutModeModifier(*rInf.GetOut()); - m_pFly->Paint(const_cast<vcl::RenderContext&>(*rInf.GetOut()), aRect); + m_pFly->PaintSwFrame(const_cast<vcl::RenderContext&>(*rInf.GetOut()), aRect); } const_cast<SwTextPaintInfo&>(rInf).GetRefDev()->SetLayoutMode(rInf.GetOut()->GetLayoutMode()); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 8bbe425979bb..ae02157fff19 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1249,7 +1249,7 @@ SwSpaceManipulator::~SwSpaceManipulator() // Manages the paint for a SwMultiPortion. // External, for the calling function, it seems to be a normal Paint-function, -// internal it is like a SwTextFrame::Paint with multiple DrawTextLines +// internal it is like a SwTextFrame::PaintSwFrame with multiple DrawTextLines void SwTextPainter::PaintMultiPortion( const SwRect &rPaint, SwMultiPortion& rMulti, const SwMultiPortion* pEnvPor ) { diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 51b7adf14893..6759e1b47515 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2781,7 +2781,7 @@ void SwTextFrame::repaintTextFrames( const SwTextNode& rNode ) SwIterator<SwTextFrame,SwTextNode> aIter( rNode ); for( const SwTextFrame *pFrame = aIter.First(); pFrame; pFrame = aIter.Next() ) { - SwRect aRec( pFrame->PaintArea() ); + SwRect aRec( pFrame->GetPaintArea() ); const SwRootFrame *pRootFrame = pFrame->getRootFrame(); SwViewShell *pCurShell = pRootFrame ? pRootFrame->GetCurrShell() : nullptr; if( pCurShell ) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index c9b7abe9734e..53fb0d13d02d 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -273,14 +273,14 @@ static SwRect lcl_CalculateRepaintRect( SwTextFrame& rTextFrame, sal_Int32 nChgS if( pEndFrame != pStartFrame ) { bSameFrame = false; - SwRect aStFrame( pStartFrame->PaintArea() ); + SwRect aStFrame( pStartFrame->GetPaintArea() ); { SwRectFnSet aRectFnSet(pStartFrame); aRectFnSet.SetLeft( aTmp, aRectFnSet.GetLeft(aStFrame) ); aRectFnSet.SetRight( aTmp, aRectFnSet.GetRight(aStFrame) ); aRectFnSet.SetBottom( aTmp, aRectFnSet.GetBottom(aStFrame) ); } - aStFrame = pEndFrame->PaintArea(); + aStFrame = pEndFrame->GetPaintArea(); { SwRectFnSet aRectFnSet(pEndFrame); aRectFnSet.SetTop( aRect, aRectFnSet.GetTop(aStFrame) ); @@ -293,7 +293,7 @@ static SwRect lcl_CalculateRepaintRect( SwTextFrame& rTextFrame, sal_Int32 nChgS pStartFrame = pStartFrame->GetFollow(); if( pStartFrame == pEndFrame ) break; - aRect.Union( pStartFrame->PaintArea() ); + aRect.Union( pStartFrame->GetPaintArea() ); } } } @@ -304,7 +304,7 @@ static SwRect lcl_CalculateRepaintRect( SwTextFrame& rTextFrame, sal_Int32 nChgS aRectFnSet.SetLeft( aRect, aRectFnSet.GetLeft(aTmp) ); else { - SwRect aStFrame( pStartFrame->PaintArea() ); + SwRect aStFrame( pStartFrame->GetPaintArea() ); aRectFnSet.SetLeft( aRect, aRectFnSet.GetLeft(aStFrame) ); aRectFnSet.SetRight( aRect, aRectFnSet.GetRight(aStFrame) ); aRectFnSet.SetTop( aRect, aRectFnSet.GetTop(aTmp) ); diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 21c2767b4190..31efda9e789d 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -203,7 +203,7 @@ void SwViewShell::PrintProspect( aPos -= aShell.maVisArea.Pos(); aMapMode.SetOrigin( aPos ); pPrinter->SetMapMode( aMapMode ); - pStPage->GetUpper()->Paint( *pOutDev, pStPage->getFrameArea() ); + pStPage->GetUpper()->PaintSwFrame( *pOutDev, pStPage->getFrameArea() ); } pStPage = pNxtPage; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index bb1ab6b3f454..c085058fbde4 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -383,7 +383,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) mpOut = pVout.get(); if ( bPaintsFromSystem ) PaintDesktop(*mpOut, aRect); - pCurrentLayout->Paint( *mpOut, aRect ); + pCurrentLayout->PaintSwFrame( *mpOut, aRect ); pOld->DrawOutDev( aRect.Pos(), aRect.SSize(), aRect.Pos(), aRect.SSize(), *pVout ); mpOut = pOld; @@ -409,7 +409,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) if ( bPaintsFromSystem ) PaintDesktop(*GetOut(), aRect); if (!comphelper::LibreOfficeKit::isActive()) - pCurrentLayout->Paint( *mpOut, aRect ); + pCurrentLayout->PaintSwFrame( *mpOut, aRect ); else pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect()); @@ -1068,7 +1068,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) //When there a PaintRegion still exists and the VisArea has changed, //the PaintRegion is at least by now obsolete. The PaintRegion can - //have been created by RootFrame::Paint. + //have been created by RootFrame::PaintSwFrame. if ( !mbInEndAction && Imp()->GetRegion() && Imp()->GetRegion()->GetOrigin() != VisArea() ) Imp()->DelRegion(); @@ -1312,7 +1312,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle // SW paint stuff PaintDesktop(*GetOut(), aRect); SwViewShell::mbLstAct = true; - GetLayout()->Paint( *GetOut(), aRect ); + GetLayout()->PaintSwFrame( *GetOut(), aRect ); SwViewShell::mbLstAct = false; // end paint and destroy ObjectContact again @@ -1785,7 +1785,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang if ( aRect.IsInside( maInvalidRect ) ) ResetInvalidRect(); SwViewShell::mbLstAct = true; - GetLayout()->Paint( rRenderContext, aRect ); + GetLayout()->PaintSwFrame( rRenderContext, aRect ); SwViewShell::mbLstAct = false; } else @@ -1806,7 +1806,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang if ( aRect.IsInside( maInvalidRect ) ) ResetInvalidRect(); SwViewShell::mbLstAct = true; - GetLayout()->Paint( rRenderContext, aRect ); + GetLayout()->PaintSwFrame( rRenderContext, aRect ); SwViewShell::mbLstAct = false; // --> OD 2009-08-12 #i101192# // end Pre/PostPaint encapsulation diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index f88e26532356..1aadcc2d0071 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -530,7 +530,7 @@ bool SwViewShell::PrintOrPDFExport( ::SetSwVisArea( pViewSh2, pStPage->getFrameArea() ); - pStPage->GetUpper()->Paint( *pOutDev, pStPage->getFrameArea(), &rPrintData ); + pStPage->GetUpper()->PaintSwFrame( *pOutDev, pStPage->getFrameArea(), &rPrintData ); SwPaintQueue::Repaint(); @@ -606,14 +606,14 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD } // CalcPagesForPrint() should not be necessary here. The pages in the - // visible area will be formatted in SwRootFrame::Paint(). + // visible area will be formatted in SwRootFrame::PaintSwFrame(). // Removing this gives us a performance gain during saving the // document because the thumbnail creation will not trigger a complete // formatting of the document. rRenderContext.Push( PushFlags::CLIPREGION ); rRenderContext.IntersectClipRegion( aSwRect.SVRect() ); - pSh->GetLayout()->Paint( rRenderContext, aSwRect ); + pSh->GetLayout()->PaintSwFrame( rRenderContext, aSwRect ); rRenderContext.Pop(); // first the CurrShell object needs to be destroyed! |