include/vcl/outdev.hxx | 3 ++-
include/vcl/window.hxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0f6bb2dfa1288eba2d14b75b4988141c1e996095
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Apr 24 21:43:16 2014 +0300
Fix error: 'GetActiveClipRegion' is a protected member of 'OutputDevice'
Change-Id: Iea6797790c76f14a28c090f3d76ef8873302c4df
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index fbf0402..45986ee 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -466,9 +466,10 @@ public:
void IntersectClipRegion( const Rectangle& rRect );
void IntersectClipRegion( const Region& rRegion );
+ virtual Region GetActiveClipRegion() const;
+
protected:
virtual void InitClipRegion();
- virtual Region GetActiveClipRegion() const;
virtual void ClipToPaintRegion ( Rectangle& rDstRect );
private:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 56f6886..fb148d9 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -546,6 +546,8 @@ public:
SAL_DLLPRIVATE ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvas >
ImplGetCanvas( const Size& rFullscreenSize,
bool bFullscreen, bool bSpriteCanvas ) const;
+ virtual Region GetActiveClipRegion() const SAL_OVERRIDE;
+
private:
// Default construction is forbidden and not implemented.
SAL_DLLPRIVATE Window();
@@ -568,7 +570,6 @@ protected:
virtual void ReleaseGraphics( bool bRelease = true )
SAL_OVERRIDE;
virtual void InitClipRegion() SAL_OVERRIDE;
- virtual Region GetActiveClipRegion() const SAL_OVERRIDE;
// FIXME: this is a hack to workaround missing layout functionality
SAL_DLLPRIVATE void ImplAdjustNWFSizes();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
