summaryrefslogtreecommitdiff
path: root/vcl/source/outdev
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r--vcl/source/outdev/clipping.cxx22
-rw-r--r--vcl/source/outdev/gradient.cxx2
-rw-r--r--vcl/source/outdev/map.cxx36
-rw-r--r--vcl/source/outdev/nativecontrols.cxx4
-rw-r--r--vcl/source/outdev/outdev.cxx6
-rw-r--r--vcl/source/outdev/outdevstate.cxx2
-rw-r--r--vcl/source/outdev/text.cxx2
-rw-r--r--vcl/source/outdev/transparent.cxx2
8 files changed, 38 insertions, 38 deletions
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index f19a084fe483..fbd26785b4b2 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -31,7 +31,7 @@
#include <numeric>
-Region OutputDevice::GetClipRegion() const
+vcl::Region OutputDevice::GetClipRegion() const
{
return PixelToLogic( maRegion );
@@ -41,7 +41,7 @@ void OutputDevice::SetClipRegion()
{
if ( mpMetaFile )
- mpMetaFile->AddAction( new MetaClipRegionAction( Region(), false ) );
+ mpMetaFile->AddAction( new MetaClipRegionAction( vcl::Region(), false ) );
SetDeviceClipRegion( NULL );
@@ -49,7 +49,7 @@ void OutputDevice::SetClipRegion()
mpAlphaVDev->SetClipRegion();
}
-void OutputDevice::SetClipRegion( const Region& rRegion )
+void OutputDevice::SetClipRegion( const vcl::Region& rRegion )
{
if ( mpMetaFile )
@@ -61,7 +61,7 @@ void OutputDevice::SetClipRegion( const Region& rRegion )
}
else
{
- Region aRegion = LogicToPixel( rRegion );
+ vcl::Region aRegion = LogicToPixel( rRegion );
SetDeviceClipRegion( &aRegion );
}
@@ -69,7 +69,7 @@ void OutputDevice::SetClipRegion( const Region& rRegion )
mpAlphaVDev->SetClipRegion( rRegion );
}
-bool OutputDevice::SelectClipRegion( const Region& rRegion, SalGraphics* pGraphics )
+bool OutputDevice::SelectClipRegion( const vcl::Region& rRegion, SalGraphics* pGraphics )
{
DBG_TESTSOLARMUTEX();
@@ -118,7 +118,7 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
mpAlphaVDev->IntersectClipRegion( rRect );
}
-void OutputDevice::IntersectClipRegion( const Region& rRegion )
+void OutputDevice::IntersectClipRegion( const vcl::Region& rRegion )
{
if(!rRegion.IsNull())
@@ -126,7 +126,7 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion )
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaISectRegionClipRegionAction( rRegion ) );
- Region aRegion = LogicToPixel( rRegion );
+ vcl::Region aRegion = LogicToPixel( rRegion );
maRegion.Intersect( aRegion );
mbClipRegion = true;
mbInitClipRegion = true;
@@ -149,7 +149,7 @@ void OutputDevice::InitClipRegion()
mbOutputClipped = false;
// #102532# Respect output offset also for clip region
- Region aRegion( ImplPixelToDevicePixel( maRegion ) );
+ vcl::Region aRegion( ImplPixelToDevicePixel( maRegion ) );
const bool bClipDeviceBounds( ! GetPDFWriter()
&& GetOutDevType() != OUTDEV_PRINTER );
if( bClipDeviceBounds )
@@ -190,7 +190,7 @@ void OutputDevice::InitClipRegion()
mbInitClipRegion = false;
}
-Region OutputDevice::GetActiveClipRegion() const
+vcl::Region OutputDevice::GetActiveClipRegion() const
{
return GetClipRegion();
}
@@ -201,7 +201,7 @@ void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/)
// on in other clipping functions
}
-void OutputDevice::SetDeviceClipRegion( const Region* pRegion )
+void OutputDevice::SetDeviceClipRegion( const vcl::Region* pRegion )
{
DBG_TESTSOLARMUTEX();
@@ -209,7 +209,7 @@ void OutputDevice::SetDeviceClipRegion( const Region* pRegion )
{
if ( mbClipRegion )
{
- maRegion = Region(true);
+ maRegion = vcl::Region(true);
mbClipRegion = false;
mbInitClipRegion = true;
}
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 1f2a26c74b36..50a679c56ce2 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -85,7 +85,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly, rGradient ) );
Push( PUSH_CLIPREGION );
- IntersectClipRegion(Region(rPolyPoly));
+ IntersectClipRegion(vcl::Region(rPolyPoly));
DrawGradient( aBoundRect, rGradient );
Pop();
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 5c2f181abebf..2a6ceb7d51a4 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -648,12 +648,12 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co
maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY );
}
-Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const
+vcl::Region OutputDevice::ImplPixelToDevicePixel( const vcl::Region& rRegion ) const
{
if ( !mnOutOffX && !mnOutOffY )
return rRegion;
- Region aRegion( rRegion );
+ vcl::Region aRegion( rRegion );
aRegion.Move( mnOutOffX+mnOutOffOrigX, mnOutOffY+mnOutOffOrigY );
return aRegion;
}
@@ -1070,7 +1070,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo
return aTransformedPoly;
}
-Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
+vcl::Region OutputDevice::LogicToPixel( const vcl::Region& rLogicRegion ) const
{
if(!mbMap || rLogicRegion.IsNull() || rLogicRegion.IsEmpty())
@@ -1078,15 +1078,15 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
return rLogicRegion;
}
- Region aRegion;
+ vcl::Region aRegion;
if(rLogicRegion.getB2DPolyPolygon())
{
- aRegion = Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon()));
+ aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon()));
}
else if(rLogicRegion.getPolyPolygon())
{
- aRegion = Region(LogicToPixel(*rLogicRegion.getPolyPolygon()));
+ aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getPolyPolygon()));
}
else if(rLogicRegion.getRegionBand())
{
@@ -1240,7 +1240,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi
return aTransformedPoly;
}
-Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const
+vcl::Region OutputDevice::LogicToPixel( const vcl::Region& rLogicRegion, const MapMode& rMapMode ) const
{
if(rMapMode.IsDefault() || rLogicRegion.IsNull() || rLogicRegion.IsEmpty())
@@ -1248,15 +1248,15 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM
return rLogicRegion;
}
- Region aRegion;
+ vcl::Region aRegion;
if(rLogicRegion.getB2DPolyPolygon())
{
- aRegion = Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon(), rMapMode));
+ aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon(), rMapMode));
}
else if(rLogicRegion.getPolyPolygon())
{
- aRegion = Region(LogicToPixel(*rLogicRegion.getPolyPolygon(), rMapMode));
+ aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getPolyPolygon(), rMapMode));
}
else if(rLogicRegion.getRegionBand())
{
@@ -1375,7 +1375,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
return aTransformedPoly;
}
-Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
+vcl::Region OutputDevice::PixelToLogic( const vcl::Region& rDeviceRegion ) const
{
if(!mbMap || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty())
@@ -1383,15 +1383,15 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
return rDeviceRegion;
}
- Region aRegion;
+ vcl::Region aRegion;
if(rDeviceRegion.getB2DPolyPolygon())
{
- aRegion = Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon()));
+ aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon()));
}
else if(rDeviceRegion.getPolyPolygon())
{
- aRegion = Region(PixelToLogic(*rDeviceRegion.getPolyPolygon()));
+ aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getPolyPolygon()));
}
else if(rDeviceRegion.getRegionBand())
{
@@ -1549,7 +1549,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
return aTransformedPoly;
}
-Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const
+vcl::Region OutputDevice::PixelToLogic( const vcl::Region& rDeviceRegion, const MapMode& rMapMode ) const
{
if(rMapMode.IsDefault() || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty())
@@ -1557,15 +1557,15 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r
return rDeviceRegion;
}
- Region aRegion;
+ vcl::Region aRegion;
if(rDeviceRegion.getB2DPolyPolygon())
{
- aRegion = Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon(), rMapMode));
+ aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon(), rMapMode));
}
else if(rDeviceRegion.getPolyPolygon())
{
- aRegion = Region(PixelToLogic(*rDeviceRegion.getPolyPolygon(), rMapMode));
+ aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getPolyPolygon(), rMapMode));
}
else if(rDeviceRegion.getRegionBand())
{
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index b7edeb11ab05..157769967a56 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -294,9 +294,9 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
boost::shared_ptr< ImplControlValue > aScreenCtrlValue( TransformControlValue( aValue, *this ) );
Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
- Region aTestRegion( GetActiveClipRegion() );
+ vcl::Region aTestRegion( GetActiveClipRegion() );
aTestRegion.Intersect( rControlRegion );
- if (aTestRegion == Region(rControlRegion))
+ if (aTestRegion == vcl::Region(rControlRegion))
nState |= CTRL_CACHING_ALLOWED; // control is not clipped, caching allowed
bool bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index a5a19798a1da..cd43b519e595 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -467,7 +467,7 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
}
void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
- const OutputDevice& rOutDev, const Region& rRegion )
+ const OutputDevice& rOutDev, const vcl::Region& rRegion )
{
GDIMetaFile* pOldMetaFile = mpMetaFile;
@@ -813,11 +813,11 @@ void OutputDevice::ReMirror( Rectangle &rRect ) const
rRect.Right() = rRect.Left() + nWidth;
}
-void OutputDevice::ReMirror( Region &rRegion ) const
+void OutputDevice::ReMirror( vcl::Region &rRegion ) const
{
RectangleVector aRectangles;
rRegion.GetRegionRectangles(aRectangles);
- Region aMirroredRegion;
+ vcl::Region aMirroredRegion;
for(RectangleVector::iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter)
{
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 809408a1411d..d53bbf8664e7 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -130,7 +130,7 @@ void OutputDevice::Push( PushFlags nFlags )
if ( nFlags & PUSH_CLIPREGION )
{
if ( mbClipRegion )
- pState->mpClipRegion = new Region( maRegion );
+ pState->mpClipRegion = new vcl::Region( maRegion );
else
pState->mpClipRegion = NULL;
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 93de76c4ef84..2c0c028ea5ee 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -862,7 +862,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) );
if( pVector )
{
- Region aClip( GetClipRegion() );
+ vcl::Region aClip( GetClipRegion() );
if( meOutDevType == OUTDEV_WINDOW )
aClip.Intersect( Rectangle( Point(), GetOutputSize() ) );
if( mpOutDevData && mpOutDevData->mpRecordLayout )
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 2b94fb6dc5e3..512ca332a972 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -192,7 +192,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight );
// walk through all rectangles of mask
- const Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel())));
+ const vcl::Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel())));
RectangleVector aRectangles;
aWorkRgn.GetRegionRectangles(aRectangles);
generated by cgit (git 2.34.1) at 2024-08-20 21:20:40 +0000