diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-24 03:20:50 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-24 03:22:07 +1000 |
| commit | 6658367b2ee358417b602edfd5f0fb9d69e6caed (patch) | |
| tree | 5fdb923f57353cd9fbdcf8f0c0ec538b26db481c /vcl | |
| parent | 3dbed9ac7a5200b5c7fbaba2114c3ee1e14af8da (diff) | |
outdev/bitmap.cxx: remove unnecessary headers, fix SAL_WARN_IF statement
Change-Id: I01e380cf87c6c18ebfc15b1f2a1055d100074991
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index bb5c91bc438f..439bc6ca82ca 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -20,13 +20,13 @@ #include <tools/debug.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> #include <vcl/outdev.hxx> +#include <vcl/virdev.hxx> #include <vcl/image.hxx> + #include <bmpfast.hxx> #include <salbmp.hxx> #include <salgdi.hxx> @@ -36,6 +36,7 @@ #include <outdev.h> #include <window.h> #include <outdata.hxx> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <boost/scoped_array.hpp> @@ -1261,7 +1262,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha( int nX, nY; sal_uInt8 nResAlpha; - SAL_WARN_IF( !mpAlphaVDev, "BlendBitmapWithAlpha(): call me only with valid alpha VirtualDevice!" ); + SAL_WARN_IF( !mpAlphaVDev, "vcl.gdi", "BlendBitmapWithAlpha(): call me only with valid alpha VirtualDevice!" ); bool bOldMapMode( mpAlphaVDev->IsMapModeEnabled() ); mpAlphaVDev->EnableMapMode(false); |