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 /chart2/source/controller/main | |
| parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) | |
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 'chart2/source/controller/main')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 71a233a79527..c367f6563e40 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -495,7 +495,7 @@ void ChartController::execute_Paint( const Rectangle& rRect ) SolarMutexGuard aGuard; DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper; if(pDrawViewWrapper) - pDrawViewWrapper->CompleteRedraw(m_pChartWindow, Region(rRect) ); + pDrawViewWrapper->CompleteRedraw(m_pChartWindow, vcl::Region(rRect) ); } } catch( const uno::Exception & ex ) diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 93712142427c..d54441be729b 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -290,7 +290,7 @@ void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) m_pOpenGLWindow->Invalidate( rRect, nFlags ); } } -void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) +void ChartWindow::Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 9dee31b22219..2afa38a986d6 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -60,7 +60,7 @@ public: void ForceInvalidate(); virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; |