summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx14
-rw-r--r--filter/source/graphicfilter/icgm/class0.cxx8
-rw-r--r--filter/source/graphicfilter/icgm/class3.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/class5.cxx6
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx2
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 9037313db95e..7cf09e88b0af 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -207,7 +207,7 @@ private:
void ImplPolyPoly( const PolyPolygon & rPolyPolygon, bool bTextOutline = false );
void ImplPolyLine( const Polygon & rPolygon );
- void ImplSetClipRegion( Region& rRegion );
+ void ImplSetClipRegion( vcl::Region& rRegion );
void ImplBmp( Bitmap*, Bitmap*, const Point &, double nWidth, double nHeight );
void ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
void ImplSetAttrForText( const Point & rPoint );
@@ -994,7 +994,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_ISECTRECTCLIPREGION_ACTION:
{
const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*) pMA;
- Region aRegion( pA->GetRect() );
+ vcl::Region aRegion( pA->GetRect() );
ImplSetClipRegion( aRegion );
}
break;
@@ -1002,7 +1002,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_CLIPREGION_ACTION:
{
const MetaClipRegionAction* pA = (const MetaClipRegionAction*) pMA;
- Region aRegion( pA->GetRegion() );
+ vcl::Region aRegion( pA->GetRegion() );
ImplSetClipRegion( aRegion );
}
break;
@@ -1010,7 +1010,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_ISECTREGIONCLIPREGION_ACTION:
{
const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*) pMA;
- Region aRegion( pA->GetRegion() );
+ vcl::Region aRegion( pA->GetRegion() );
ImplSetClipRegion( aRegion );
}
break;
@@ -1692,7 +1692,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly )
-void PSWriter::ImplSetClipRegion( Region& rClipRegion )
+void PSWriter::ImplSetClipRegion( vcl::Region& rClipRegion )
{
if ( !rClipRegion.IsEmpty() )
{
@@ -1782,7 +1782,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
bool bDoTrans = false;
Rectangle aRect;
- Region aRegion;
+ vcl::Region aRegion;
if ( pMaskBitmap )
{
@@ -1795,7 +1795,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
nHeight = 8;
}
aRect = Rectangle( Point( 0, nHeightOrg - nHeightLeft ), Size( (long)nWidth, (long)nHeight ) );
- aRegion = Region( pMaskBitmap->CreateRegion( COL_BLACK, aRect ) );
+ aRegion = vcl::Region( pMaskBitmap->CreateRegion( COL_BLACK, aRect ) );
if( mnLevel == 1 )
{
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index 9b0abed2b2f8..76691416eb73 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -102,8 +102,8 @@ void CGM::ImplDoClass0()
mpOutAct->EndFigure();
mbFigure = false;
break;
- case 0x0d : /*Begin Protection Region */break;
- case 0x0e : /*End Protection Region */break;
+ case 0x0d : /*Begin Protection vcl::Region */break;
+ case 0x0e : /*End Protection vcl::Region */break;
case 0x0f : /*Begin Compound Line */break;
case 0x10 : /*End Compound Line */break;
case 0x11 : /*Begin Compound Text Path */break;
@@ -111,8 +111,8 @@ void CGM::ImplDoClass0()
case 0x13 : /*Begin Tile Array */break; // NS
case 0x14 : /*End Tile Array */break; // NS
case 0xff : /*Filter Setup */break;
- case 0xfe : /*Begin Block Text Region */break;
- case 0xfd : /*End Block Text Region */break;
+ case 0xfe : /*Begin Block Text vcl::Region */break;
+ case 0xfd : /*End Block Text vcl::Region */break;
case 0xfc : /*Begin Group*/
mpOutAct->BeginGroup();
break;
diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx
index 7af697124f5c..389149050529 100644
--- a/filter/source/graphicfilter/icgm/class3.cxx
+++ b/filter/source/graphicfilter/icgm/class3.cxx
@@ -117,7 +117,7 @@ void CGM::ImplDoClass3()
break;
case 0x0b : /*Save Primitive Context */break; // NS
case 0x0c : /*Restore Primitive Context */break; // NS
- case 0x11 : /*Protection Region Indicator */break;
+ case 0x11 : /*Protection vcl::Region Indicator */break;
case 0x12 : /*Generalized Text Path Mode */break; // NS
case 0x13 : /*Mitre Limit*/
pElement->nMitreLimit = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx
index 962f3556ef75..5e6fdb2f85f4 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -416,9 +416,9 @@ void CGM::ImplDoClass5()
case 0x31 : /*Symbol Color*/ break; // NS
case 0x32 : /*Symbol Size*/ break; // NS
case 0x33 : /*Symbol Orientation*/ break; // NS
- case 0x50 : /*Block Text Region Margins*/ break;
- case 0x51 : /*Block Text Region Expansion*/ break;
- case 0x52 : /*Block Text Region Anchor*/ break;
+ case 0x50 : /*Block Text vcl::Region Margins*/ break;
+ case 0x51 : /*Block Text vcl::Region Expansion*/ break;
+ case 0x52 : /*Block Text vcl::Region Anchor*/ break;
case 0x53 : /*Block Text Paragraph Horizontal Alignment*/ break;
case 0x54 : /*Block Text Paragraph Vertical Alignment*/ break;
case 0x55 : /*Block Text Line Flow*/ break;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index d79aad38072f..89e1c9b6ad4e 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1634,7 +1634,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
pOS2MET->ReadUInt32( nID );
if (nID==0) p=NULL;
while (p!=NULL && p->nID!=nID) p=p->pSucc;
- if (p!=NULL) pVirDev->SetClipRegion(Region(p->aPPoly));
+ if (p!=NULL) pVirDev->SetClipRegion(vcl::Region(p->aPPoly));
else pVirDev->SetClipRegion();
break;
}
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 7b313364c02f..2ce4b3d311e2 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1274,7 +1274,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
// but this can be discutable...
aRect.setWidth(aRect.getWidth()+1);
aRect.setHeight(aRect.getHeight()+1);
- pVirDev->SetClipRegion( Region( aRect ) );
+ pVirDev->SetClipRegion( vcl::Region( aRect ) );
break;
}
case 0x0002: // BkPat
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 20:56:40 +0000