diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
| commit | 932fb7b958f8e7204275cb709965b30e390c76ad (patch) | |
| tree | 75f695663a97693416f8a84e140fa61805cf5bd2 /vcl/win | |
| parent | bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590 (diff) | |
| parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/source/win32/dtobj/XTDataObject.cxx
dtrans/source/win32/dtobj/XTDataObject.hxx
sot/source/sdstor/stgio.cxx
tools/source/debug/debug.cxx
vcl/source/gdi/jobset.cxx
vcl/unx/kde4/KDEData.cxx
vcl/unx/kde4/KDEData.hxx
vcl/unx/kde4/KDESalDisplay.cxx
vcl/unx/kde4/KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.hxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.hxx
vcl/unx/kde4/KDESalInstance.cxx
vcl/unx/kde4/KDESalInstance.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/VCLKDEApplication.hxx
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 1e5a4c49eba2..14eeb89046a7 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -538,7 +538,9 @@ void ImplSalInitGraphics( WinSalGraphics* pData ) void ImplSalDeInitGraphics( WinSalGraphics* pData ) { - // Default Objekte selektieren + // clear clip region + SelectClipRgn( pData->mhDC, 0 ); + // select default objects if ( pData->mhDefPen ) SelectPen( pData->mhDC, pData->mhDefPen ); if ( pData->mhDefBrush ) |