diff options
| author | Armin Le Grand <alg@apache.org> | 2013-01-10 16:28:40 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-01-10 16:28:40 +0000 |
| commit | ef3931ff410117e1237b3bef7bc090e8b83b9519 (patch) | |
| tree | 8e02a7db820f632e343c984e9b327fe2578bcb23 /canvas | |
| parent | 534ef6b86ac9ef61e4e7ae98c12149fc9dc9c204 (diff) | |
#121504# Support for alpha channel in clipboard for all systems
Notes
merged as: e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/devicehelper.cxx | 8 | ||||
| -rw-r--r-- | canvas/source/vcl/spritedevicehelper.cxx | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index fa4942e6bcb8..3873ec618207 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -19,27 +19,24 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_canvas.hxx" #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> - #include <rtl/instance.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/canvastools.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/unopolypolygon.hxx> +#include <vcl/dibtools.hxx> #include "devicehelper.hxx" #include "spritecanvas.hxx" #include "spritecanvashelper.hxx" #include "canvasbitmap.hxx" - using namespace ::com::sun::star; namespace vclcanvas @@ -227,8 +224,7 @@ namespace vclcanvas OutputDevice& rOutDev = mpOutDev->getOutDev(); bool bOldMap( rOutDev.IsMapModeEnabled() ); rOutDev.EnableMapMode( sal_False ); - aStream << rOutDev.GetBitmap(aEmptyPoint, - rOutDev.GetOutputSizePixel()); + WriteDIB(rOutDev.GetBitmap(aEmptyPoint, rOutDev.GetOutputSizePixel()), aStream, false, true); rOutDev.EnableMapMode( bOldMap ); ++nFilePostfixCount; diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index f1a1ced09c39..1281db30c280 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -19,24 +19,21 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_canvas.hxx" #include <canvas/debug.hxx> #include <canvas/canvastools.hxx> - #include <toolkit/helper/vclunohelper.hxx> #include <vcl/canvastools.hxx> #include <basegfx/tools/canvastools.hxx> +#include <vcl/dibtools.hxx> #include "spritedevicehelper.hxx" #include "spritecanvas.hxx" #include "spritecanvashelper.hxx" #include "canvasbitmap.hxx" - using namespace ::com::sun::star; namespace vclcanvas @@ -144,8 +141,7 @@ namespace vclcanvas const ::Point aEmptyPoint; mpBackBuffer->getOutDev().EnableMapMode( sal_False ); - aStream << mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, - mpBackBuffer->getOutDev().GetOutputSizePixel()); + WriteDIB(mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false, true); } ++nFilePostfixCount; |