diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-03-18 17:43:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-18 17:43:03 +0000 |
commit | 3d495712258359d14c3d08b29caaa8b66a9b621c (patch) | |
tree | 421955b973e6299d20ef6028bcaedbffba034b35 /vcl | |
parent | 641b6f2037bec26097574dd921219101d8386da5 (diff) |
revert work in progress
Change-Id: I1387b0ed7b2d8bb9df801c03cf59efc9c0e1cfd3
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 14 | ||||
-rw-r--r-- | vcl/headless/svpgdi.cxx | 14 | ||||
-rw-r--r-- | vcl/inc/generic/genpspgraphics.h | 4 | ||||
-rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 3 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 3 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 3 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 5 | ||||
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 33 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 14 | ||||
-rw-r--r-- | vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 15 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 5 |
15 files changed, 5 insertions, 123 deletions
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 53f6a579be38..a5457ce399f6 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -1214,20 +1214,6 @@ bool GenPspGraphics::SupportsCairo() const return false; } -bool GenPspGraphics::CanResizeCairoSurface() const -{ - return false; -} - -cairo_t* GenPspGraphics::GetCairoContext() const -{ - return NULL; -} - -void GenPspGraphics::FlushCairoContext(cairo_t*) const -{ -} - SystemFontData GenPspGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { return SystemFontData(); diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index d2822ebcf4de..f63ae479f31b 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -738,18 +738,4 @@ bool SvpSalGraphics::SupportsCairo() const return false; } -bool SvpSalGraphics::CanResizeCairoSurface() const -{ - return false; -} - -cairo_t* SvpSalGraphics::GetCairoContext() const -{ - return NULL; -} - -void SvpSalGraphics::FlushCairoContext(cairo_t *) const -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 094504c15ac1..25de8687b283 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -202,10 +202,6 @@ public: virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual bool CanResizeCairoSurface() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t *) const SAL_OVERRIDE; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE; virtual void BeginPaint() SAL_OVERRIDE { }; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index b6d2a7420f34..5bbf81607ef6 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -200,10 +200,6 @@ public: virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t *cr) const SAL_OVERRIDE; - virtual bool CanResizeCairoSurface() const SAL_OVERRIDE; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE; virtual void BeginPaint() SAL_OVERRIDE { }; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 7958af26d1f0..54bd2a932831 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -419,9 +419,6 @@ public: virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual bool CanResizeCairoSurface() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t*) const SAL_OVERRIDE; virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const SAL_OVERRIDE; virtual void BeginPaint() SAL_OVERRIDE { }; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 1beebfade5b5..ef1812077ee8 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -440,9 +440,6 @@ public: /// Check whether cairo will work virtual bool SupportsCairo() const = 0; - virtual bool CanResizeCairoSurface() const = 0; - virtual cairo_t* GetCairoContext() const = 0; - virtual void FlushCairoContext(cairo_t *cr) const = 0; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const = 0; diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 1a63e744710e..26f2efba05b9 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -49,14 +49,12 @@ public: const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE; - virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t *cr) const SAL_OVERRIDE; - void updateSettings( AllSettings& rSettings ); static void refreshFontconfig( GtkSettings *pSettings ); static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer ); + cairo_t* getCairoContext(); + void clipRegion(cairo_t* cr); private: diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 7851ca395179..b8a2a60972de 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -263,9 +263,6 @@ public: virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t*) const SAL_OVERRIDE; - virtual bool CanResizeCairoSurface() const SAL_OVERRIDE; virtual SystemFontData GetSysFontData( int nFallbackLevel ) const SAL_OVERRIDE; virtual void BeginPaint() SAL_OVERRIDE; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 6502dac34c2f..287daf4effb2 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -446,9 +446,6 @@ public: virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual bool CanResizeCairoSurface() const SAL_OVERRIDE; - virtual cairo_t* GetCairoContext() const SAL_OVERRIDE; - virtual void FlushCairoContext(cairo_t *) const SAL_OVERRIDE; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE; virtual void BeginPaint() SAL_OVERRIDE; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index e04b5586b9c5..b982dd4ff7bb 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1450,11 +1450,6 @@ bool AquaSalGraphics::SupportsCairo() const return true; } -bool AquaSalGraphics::CanResizeCairoSurface() const -{ - return false; -} - long AquaSalGraphics::GetGraphicsWidth() const { long w = 0; diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 8c3820f3060b..c64fbfffcc84 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -308,39 +308,6 @@ bool OutputDevice::SupportsCairo() const return mpGraphics->SupportsCairo(); } -bool OutputDevice::CanResizeCairoSurface() const -{ - if (!mpGraphics) - { - if (!AcquireGraphics()) - return false; - } - - return mpGraphics->CanResizeCairoSurface(); -} - -cairo_t* OutputDevice::GetCairoContext() const -{ - if (!mpGraphics) - { - if (!AcquireGraphics()) - return NULL; - } - - return mpGraphics->GetCairoContext(); -} - -void OutputDevice::FlushCairoContext(cairo_t* cr) const -{ - if (!mpGraphics) - { - if (!AcquireGraphics()) - return; - } - - mpGraphics->FlushCairoContext(cr); -} - css::uno::Any OutputDevice::GetSystemGfxDataAny() const { const SystemGraphicsData aSysData = GetSystemGfxData(); diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 1f70e9a4f52d..2a76110fe4fa 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -462,20 +462,6 @@ bool X11SalGraphics::SupportsCairo() const return XQueryExtension(pDisplay, "RENDER", &nDummy, &nDummy, &nDummy); } -bool X11SalGraphics::CanResizeCairoSurface() const -{ - return true; -} - -cairo_t* X11SalGraphics::GetCairoContext() const -{ - return NULL; -} - -void X11SalGraphics::FlushCairoContext(cairo_t*) const -{ -} - // draw a poly-polygon bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPolyPoly, double fTransparency ) { diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx b/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx index 032f20a39db0..f2f044e633af 100644 --- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx +++ b/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx @@ -21,7 +21,7 @@ GlyphCache& GtkCairoTextRender::getPlatformGlyphCache() cairo_t* GtkCairoTextRender::getCairoContext() { - return mrParent.GetCairoContext(); + return mrParent.getCairoContext(); } void GtkCairoTextRender::getSurfaceOffset(double& nDX, double& nDY) diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 9123e589b247..3006d62fdf81 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -922,7 +922,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co return false; } - cairo_t *cr = GetCairoContext(); + cairo_t *cr = getCairoContext(); clipRegion(cr); cairo_translate(cr, rControlRegion.Left(), rControlRegion.Top()); @@ -1447,11 +1447,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return false; } -bool GtkSalGraphics::SupportsCairo() const -{ - return true; -} - static GtkWidget* gCacheWindow; static GtkWidget* gDumbContainer; @@ -1556,17 +1551,11 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) gtk_widget_path_free(path); } -cairo_t* GtkSalGraphics::GetCairoContext() const +cairo_t* GtkSalGraphics::getCairoContext() { return mpFrame->getCairoContext(); } -void GtkSalGraphics::FlushCairoContext(cairo_t *) const -{ - //request gtk to sync the entire contents - gtk_widget_queue_draw(mpWindow); -} - void GtkSalGraphics::clipRegion(cairo_t* cr) { if (!m_aClipRegion.IsEmpty()) diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 614ec2736414..fc74d0567779 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -1077,11 +1077,6 @@ bool WinSalGraphics::SupportsCairo() const return true; } -bool WinSalGraphics::CanResizeCairoSurface() const -{ - return false; -} - void WinSalGraphics::BeginPaint() { return mpImpl->beginPaint(); |