include/vcl/outdev.hxx | 2 +-
include/vcl/window.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0de3b50ff85f8a2ca1fed00c20a68cb51622dc71
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Feb 3 09:42:56 2014 +1100
fdo#74424 OutputDevice no longer inherits Resource
OutputDevice does not need to inherit Resource. Window now inherits
OutputDevice and Resource. This decouples OutputDevice from Resource,
which was unnecessary.
Change-Id: I9bc0d7ce65c026a8e38110e17fafdde9d8744392
Reviewed-on: https://gerrit.libreoffice.org/7785
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index df78af3..4f22436 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -254,7 +254,7 @@ typedef ::std::vector< VCLXGraphics* >
VCLXGraphicsList_impl;
const char* ImplDbgCheckOutputDevice( const void* pObj );
-class VCL_DLLPUBLIC OutputDevice : public Resource
+class VCL_DLLPUBLIC OutputDevice
{
friend class Application;
friend class Bitmap;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 0a3cf45..2adcc5d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -325,7 +325,7 @@ struct WindowResHeader
sal_uLong nRSStyle;
};
-class VCL_DLLPUBLIC Window : public OutputDevice
+class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
{
friend class Cursor;
friend class OutputDevice;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
