diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /editeng | |
parent | Use constants for ST_VerticalJc values (diff) | |
download | core-8dbde0845a3989528614addb9bd0333f60c522a5.tar.gz core-8dbde0845a3989528614addb9bd0333f60c522a5.zip |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7d292e34ec0d..133d2e9d3cdf 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -262,7 +262,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P bool bClipRegion = pOutDev->IsClipRegion(); bool bMetafile = pOutDev->GetConnectMetaFile(); - Region aOldRegion = pOutDev->GetClipRegion(); + vcl::Region aOldRegion = pOutDev->GetClipRegion(); // If one existed => intersection! // Use Push/pop for creating the Meta file diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index bdd5065ec6a9..d9d5810b9019 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -141,7 +141,7 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection ) } -void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputDevice* pTargetDevice ) +void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, OutputDevice* pTargetDevice ) { if ( GetSelectionMode() == EE_SELMODE_HIDDEN ) return; @@ -159,7 +159,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD OutputDevice* pTarget = pTargetDevice ? pTargetDevice : pOutWin; bool bClipRegion = pTarget->IsClipRegion(); - Region aOldRegion = pTarget->GetClipRegion(); + vcl::Region aOldRegion = pTarget->GetClipRegion(); if ( !pRegion ) { @@ -286,7 +286,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD if ( pRegion ) { - *pRegion = Region( *pPolyPoly ); + *pRegion = vcl::Region( *pPolyPoly ); delete pPolyPoly; } else diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index b0756c7c73a6..2e3a1cc04bf1 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -308,7 +308,7 @@ public: bool HasSelection() const { return aEditSelection.HasRange(); } void DrawSelection() { DrawSelection( aEditSelection ); } - void DrawSelection( EditSelection, Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); + void DrawSelection( EditSelection, vcl::Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); vcl::Window* GetWindow() const { return pOutWin; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 0b26a0738656..f807a4af35f1 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3771,7 +3771,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev Paint( pVDev, aTmpRect, aStartPos ); bool bClipRegion = false; - Region aOldRegion; + vcl::Region aOldRegion; MapMode aOldMapMode; if ( GetTextRanger() ) { @@ -3790,7 +3790,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev MapMode aNewMapMode( aOldMapMode ); aNewMapMode.SetOrigin( aOrigin ); pTarget->SetMapMode( aNewMapMode ); - pTarget->SetClipRegion( Region( GetTextRanger()->GetPolyPolygon() ) ); + pTarget->SetClipRegion( vcl::Region( GetTextRanger()->GetPolyPolygon() ) ); } pTarget->DrawOutDev( aClipRect.TopLeft(), aClipRect.GetSize(), @@ -3839,7 +3839,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev } bool bClipRegion = pTarget->IsClipRegion(); - Region aOldRegion = pTarget->GetClipRegion(); + vcl::Region aOldRegion = pTarget->GetClipRegion(); pTarget->IntersectClipRegion( aClipRect ); Paint( pTarget, aClipRect, aStartPos ); |