diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-03-07 12:48:59 +0100 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-03-08 15:13:49 +0100 |
commit | c15ea73f960bbd3d2a4b0c43b467ac62eeba3505 (patch) | |
tree | 31dbe919b97f872bb3a93a134431384ea5cb1599 /vcl/inc/win/salframe.h | |
parent | 21ef6e1157ccaca2916ec124e116fe85c74bb4ec (diff) |
tdf#115420 WIN clean up WinSalFrames DC handling
We still don't return a SalGraphics object from AcquireGraphics
without a valid DC. But internally we keep the WinSalGraphics
objects around, so we now have to verify the DC before using it.
In the end this also fixes the leak of the threaded SalGraphics
of the frame.
Change-Id: I267c96c04b7d00cb66a6c84c63d1373ebe0f529f
Reviewed-on: https://gerrit.libreoffice.org/50908
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/win/salframe.h')
-rw-r--r-- | vcl/inc/win/salframe.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 002b6731c72b..77902a40034e 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -82,6 +82,12 @@ public: bool mbPropertiesStored; // has values stored in the window property store void updateScreenNumber(); + +private: + void ImplSetParentFrame( HWND hNewParentWnd, bool bAsChild ); + bool InitFrameGraphicsDC( WinSalGraphics *pGraphics, HDC hDC, HWND hWnd ); + bool ReleaseFrameGraphicsDC( WinSalGraphics* pGraphics ); + public: WinSalFrame(); virtual ~WinSalFrame() override; |