Kaydet (Commit) e811ac44 authored tarafından Armin Le Grand's avatar Armin Le Grand

#121504# corrected error in canvas module when cairo is used

üst 306d33a8
...@@ -19,28 +19,21 @@ ...@@ -19,28 +19,21 @@
* *
*************************************************************/ *************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx" #include "precompiled_canvas.hxx"
#include <canvas/debug.hxx> #include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx> #include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx> #include <canvas/canvastools.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase1.hxx>
#include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/NoSupportException.hpp>
#include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/vclunohelper.hxx>
#include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/unopolypolygon.hxx> #include <basegfx/tools/unopolypolygon.hxx>
#include <vcl/canvastools.hxx> #include <vcl/canvastools.hxx>
#include <vcl/dibtools.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include "cairo_spritecanvas.hxx" #include "cairo_spritecanvas.hxx"
#include "cairo_canvasbitmap.hxx" #include "cairo_canvasbitmap.hxx"
#include "cairo_devicehelper.hxx" #include "cairo_devicehelper.hxx"
...@@ -267,8 +260,8 @@ namespace cairocanvas ...@@ -267,8 +260,8 @@ namespace cairocanvas
const ::Point aEmptyPoint; const ::Point aEmptyPoint;
bool bOldMap( mpRefDevice->IsMapModeEnabled() ); bool bOldMap( mpRefDevice->IsMapModeEnabled() );
mpRefDevice->EnableMapMode( sal_False ); mpRefDevice->EnableMapMode( sal_False );
aStream << mpRefDevice->GetBitmap(aEmptyPoint, const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel()));
mpRefDevice->GetOutputSizePixel()); WriteDIB(aTempBitmap, aStream, false, true);
mpRefDevice->EnableMapMode( bOldMap ); mpRefDevice->EnableMapMode( bOldMap );
++nFilePostfixCount; ++nFilePostfixCount;
......
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