Kaydet (Commit) 0de3b50f authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Michael Meeks

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/7785Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst fc5eefc9
...@@ -254,7 +254,7 @@ typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl; ...@@ -254,7 +254,7 @@ typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl;
const char* ImplDbgCheckOutputDevice( const void* pObj ); const char* ImplDbgCheckOutputDevice( const void* pObj );
class VCL_DLLPUBLIC OutputDevice : public Resource class VCL_DLLPUBLIC OutputDevice
{ {
friend class Application; friend class Application;
friend class Bitmap; friend class Bitmap;
......
...@@ -325,7 +325,7 @@ struct WindowResHeader ...@@ -325,7 +325,7 @@ struct WindowResHeader
sal_uLong nRSStyle; sal_uLong nRSStyle;
}; };
class VCL_DLLPUBLIC Window : public OutputDevice class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
{ {
friend class Cursor; friend class Cursor;
friend class OutputDevice; friend class OutputDevice;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment