summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/viewsh.hxx6
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx10
-rw-r--r--sw/source/core/text/txtpaint.cxx2
-rw-r--r--sw/source/core/text/txtpaint.hxx2
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx2
-rw-r--r--sw/source/core/view/viewsh.cxx22
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx2
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx2
11 files changed, 27 insertions, 27 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 33dec73e14ea..7a5af46ab5a9 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -71,7 +71,7 @@ class SwTxtFrm;
class BitmapEx;
struct SwAccessibilityOptions;
-class Region;
+namespace vcl { class Region; }
class SwPostItMgr;
class SdrPaintWindow;
class SwAccessibleMap;
@@ -231,12 +231,12 @@ public:
// #i72754# set of Pre/PostPaints with lock counter and initial target OutDev
protected:
- std::stack<Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked)
+ std::stack<vcl::Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked)
OutputDevice* mpPrePostOutDev;
MapMode maPrePostMapMode;
public:
void PrePaint();
- void DLPrePaint2(const Region& rRegion);
+ void DLPrePaint2(const vcl::Region& rRegion);
void DLPostPaint2(bool bPaintFormLayer);
const MapMode& getPrePostMapMode() const { return maPrePostMapMode; }
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4045abfa8fff..4ba7002e59a1 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -260,7 +260,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
FindFlyFrm()->GetContour( aPoly, true )
)
{
- pOut->SetClipRegion(Region(aPoly));
+ pOut->SetClipRegion(vcl::Region(aPoly));
bClip = false;
}
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index e0c1b020a661..1902a01dc0ba 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -196,7 +196,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
}
// OD 19.08.2002 #99657#
- // Region of a fly frame with transparent background or a transparent
+ // vcl::Region of a fly frame with transparent background or a transparent
// shadow have not to be subtracted from paint region
if ( pFly->IsBackgroundTransparent() ||
pFly->IsShadowTransparent() )
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b3a538a6ee68..a661fd5172a2 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3247,7 +3247,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
(pPage->Frm().*fnRect->fnGetLeft)(),
(pPage->Frm().*fnRect->fnGetWidth)() );
aPageRectTemp._Intersection( pSh->VisArea() );
- Region aPageRectRegion( aPageRectTemp.SVRect() );
+ vcl::Region aPageRectRegion( aPageRectTemp.SVRect() );
aPageRectRegion.Exclude( aPaintRect.SVRect() );
pSh->GetWin()->Invalidate( aPageRectRegion, INVALIDATE_CHILDREN );
}
@@ -3263,7 +3263,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
{
// #i75172# if called from SwViewShell::ImplEndAction it sould no longer
// really be used but handled by SwViewShell::ImplEndAction already
- const Region aDLRegion(aPaintRect.SVRect());
+ const vcl::Region aDLRegion(aPaintRect.SVRect());
pSh->DLPrePaint2(aDLRegion);
}
@@ -3395,7 +3395,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
// #i75172# if called from SwViewShell::ImplEndAction it sould no longer
// really be used but handled by SwViewShell::ImplEndAction already
{
- const Region aDLRegion(aPaintRect.SVRect());
+ const vcl::Region aDLRegion(aPaintRect.SVRect());
pSh->DLPrePaint2(aDLRegion);
}
@@ -4222,7 +4222,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
SwViewShell *pSh = getRootFrm()->GetCurrShell();
if ( !pOut->GetConnectMetaFile() || !pSh || !pSh->GetWin() )
{
- pOut->SetClipRegion(Region(aPoly));
+ pOut->SetClipRegion(vcl::Region(aPoly));
}
for ( sal_uInt16 i = 0; i < aRegion.size(); ++i )
PaintBackground( aRegion[i], pPage, rAttrs, false, true );
@@ -7597,7 +7597,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
aOut.SSize().Height()+= 2*nPixelSzH;
// #i92711# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev
- const Region aRepaintRegion(aOut.SVRect());
+ const vcl::Region aRepaintRegion(aOut.SVRect());
pSh->DLPrePaint2(aRepaintRegion);
vcl::Window *pWin = pSh->GetWin();
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index a872a1111c9b..c7328401e79b 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -91,7 +91,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
pOut->SetClipRegion();
else
{
- const Region aClipRegion( aRect );
+ const vcl::Region aClipRegion( aRect );
pOut->SetClipRegion( aClipRegion );
}
#ifdef DBG_UTIL
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index f3ef7296f95e..c14c6560cf81 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -25,7 +25,7 @@ class SwRect; // SwSaveClip
class SwSaveClip
{
- Region aClip;
+ vcl::Region aClip;
const bool bOn;
bool bChg;
protected:
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 65e70589d036..3e8004ab1776 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1101,7 +1101,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
SwRect aPageBorderRect;
SwPageFrm::GetBorderAndShadowBoundRect( SwRect( aPageRect ), &mrParentViewShell, aPageBorderRect,
(*aPageIter)->pPage->IsLeftShadowNeeded(), (*aPageIter)->pPage->IsRightShadowNeeded(), true );
- const Region aDLRegion(aPageBorderRect.SVRect());
+ const vcl::Region aDLRegion(aPageBorderRect.SVRect());
mrParentViewShell.DLPrePaint2(aDLRegion);
SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true );
mrParentViewShell.DLPostPaint2(true);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 57e66a4b8719..0731c2b07298 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -147,7 +147,7 @@ void SwViewShell::PrePaint()
}
}
-void SwViewShell::DLPrePaint2(const Region& rRegion)
+void SwViewShell::DLPrePaint2(const vcl::Region& rRegion)
{
if(mPrePostPaintRegions.empty())
{
@@ -188,7 +188,7 @@ void SwViewShell::DLPostPaint2(bool bPaintFormLayer)
if( mPrePostPaintRegions.size() > 1 )
{
- Region current = mPrePostPaintRegions.top();
+ vcl::Region current = mPrePostPaintRegions.top();
mPrePostPaintRegions.pop();
if( current != mPrePostPaintRegions.top())
Imp()->GetDrawView()->UpdateDrawLayersRegion(mpPrePostOutDev, mPrePostPaintRegions.top());
@@ -345,7 +345,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
// --> OD 2007-07-26 #i79947#
// #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev
- const Region aRepaintRegion(aRect.SVRect());
+ const vcl::Region aRepaintRegion(aRect.SVRect());
DLPrePaint2(aRepaintRegion);
// <--
@@ -377,7 +377,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
// seems to work (and does technically) but fails with transparent objects. Since the
// region given to BeginDarwLayers() defines the clip region for DrawingLayer paint,
// transparent objects in the single rectangles will indeed be painted multiple times.
- DLPrePaint2(Region(aRect.SVRect()));
+ DLPrePaint2(vcl::Region(aRect.SVRect()));
if ( bPaintsFromSystem )
PaintDesktop( aRect );
@@ -458,7 +458,7 @@ void SwViewShell::ImplUnlockPaint( bool bVirDev )
pVout->SetFillColor( mpOut->GetFillColor() );
// #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev
- const Region aRepaintRegion(VisArea().SVRect());
+ const vcl::Region aRepaintRegion(VisArea().SVRect());
DLPrePaint2(aRepaintRegion);
OutputDevice *pOld = mpOut;
@@ -1243,7 +1243,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
// is used when mpWin == 0 (wrong but widely used).
vcl::Window* pOldWin = mpWin;
mpWin = 0;
- DLPrePaint2(Region(aRect.SVRect()));
+ DLPrePaint2(vcl::Region(aRect.SVRect()));
mpWin = pOldWin;
// SW paint stuff
@@ -1337,7 +1337,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
{
// start paint on logic base
const Rectangle aTargetLogic(Imp()->aSmoothRect.SVRect());
- DLPrePaint2(Region(aTargetLogic));
+ DLPrePaint2(vcl::Region(aTargetLogic));
// get target rectangle in discrete pixels
OutputDevice& rTargetDevice = mpTargetPaintWindow->GetTargetOutputDevice();
@@ -1507,7 +1507,7 @@ void SwViewShell::_PaintDesktop( const SwRegionRects &rRegion )
// to be removed again
// #i68597# inform Drawinglayer about display change
- DLPrePaint2(Region(aRectangle));
+ DLPrePaint2(vcl::Region(aRectangle));
// #i75172# needed to move line/Fill color setters into loop since DLPrePaint2
// may exchange GetOut(), that's it's purpose. This happens e.g. at print preview.
@@ -1690,7 +1690,7 @@ void SwViewShell::Paint(const Rectangle &rRect)
{
// --> OD 2009-08-12 #i101192#
// start Pre/PostPaint encapsulation to avoid screen blinking
- const Region aRepaintRegion(aRect.SVRect());
+ const vcl::Region aRepaintRegion(aRect.SVRect());
DLPrePaint2(aRepaintRegion);
// <--
@@ -1722,7 +1722,7 @@ void SwViewShell::Paint(const Rectangle &rRect)
if ( mbInEndAction && GetWin() )
{
- const Region aRegion(GetWin()->GetPaintRegion());
+ const vcl::Region aRegion(GetWin()->GetPaintRegion());
RectangleVector aRectangles;
aRegion.GetRegionRectangles(aRectangles);
@@ -1741,7 +1741,7 @@ void SwViewShell::Paint(const Rectangle &rRect)
GetOut() == GetWin() )
{
// #i68597#
- const Region aDLRegion(rRect);
+ const vcl::Region aDLRegion(rRect);
DLPrePaint2(aDLRegion);
mpOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index f8ad84f64c01..6d9fac261019 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -349,7 +349,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
Size aOutputSizePixel( GetOutputSizePixel() );
DrawRect(Rectangle(Point(0, 0), aOutputSizePixel ));
- SetClipRegion(Region(Rectangle(
+ SetClipRegion(vcl::Region(Rectangle(
Point(BORDER, BORDER),
Size (aOutputSizePixel.Width () - 2 * BORDER,
aOutputSizePixel.Height() - 2 * BORDER))));
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 51a9955e8267..dbc8d70c10da 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -156,7 +156,7 @@ void SwLabPreview::Paint(const Rectangle &)
DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Down
// Labels
- SetClipRegion(Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))));
+ SetClipRegion(vcl::Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))));
SetFillColor( COL_LIGHTGRAYBLUE );
const sal_Int32 nRows = std::min<sal_Int32>(2, aItem.nRows);
const sal_Int32 nCols = std::min<sal_Int32>(2, aItem.nCols);
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 076a04b6830c..92adafca85d7 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -425,7 +425,7 @@ void SwAddressPreview::StateChanged( StateChangedType nStateChange )
void SwAddressPreview::DrawText_Impl(
const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected)
{
- SetClipRegion( Region( Rectangle(rTopLeft, rSize)) );
+ SetClipRegion( vcl::Region( Rectangle(rTopLeft, rSize)) );
if(bIsSelected)
{
//selection rectangle
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 23:15:28 +0000