diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-01 15:09:25 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-09-01 15:16:08 +0100 |
| commit | 6a12aecf6f7791f00894b08bb394ee0139e10d6f (patch) | |
| tree | f85f363162ab3da63ce35d7e07dfeb9536f98f5b /vcl/win | |
| parent | sids unsorted (diff) | |
| download | core-6a12aecf6f7791f00894b08bb394ee0139e10d6f.tar.gz core-6a12aecf6f7791f00894b08bb394ee0139e10d6f.zip | |
tdf#93839 - Encourage vdevs to pick up new GL Contexts when they go invalid.
Change-Id: I21726d0dd052fdc87e8dd36ff7122518325f6313
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salvd.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index cf77cf1e1ae2..58c0f7e0ca91 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -497,6 +497,8 @@ void WinSalGraphics::DeInitGraphics() SelectBrush( getHDC(), mhDefBrush ); if ( mhDefFont ) SelectFont( getHDC(), mhDefFont ); + + mpImpl->DeInit(); } HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index ac01d92e86af..2a492b83413b 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -181,7 +181,7 @@ WinSalVirtualDevice::~WinSalVirtualDevice() // destroy saved DC if( mpGraphics->getDefPal() ) SelectPalette( mpGraphics->getHDC(), mpGraphics->getDefPal(), TRUE ); - mpGraphics->InitGraphics(); + mpGraphics->DeInitGraphics(); if( mhDefBmp ) SelectBitmap( mpGraphics->getHDC(), mhDefBmp ); if( !mbForeignDC ) |