diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-03 09:42:56 +1100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-02-03 16:45:19 +0000 |
| commit | 0de3b50ff85f8a2ca1fed00c20a68cb51622dc71 (patch) | |
| tree | 2000d27d6e6f4a6fad676f30fe9413ab0a556c3f | |
| parent | fc5eefc903529d1c3548c680b3077eee4e2c7a73 (diff) | |
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.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index df78af3a4687..4f2243658c59 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 0a3cf4588493..2adcc5d7783a 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; |