summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-03-20 12:47:47 +0200
committerTor Lillqvist <tml@collabora.com>2014-03-20 12:49:00 +0200
commit1cc065d28d8613160459994f8ea28a096eb85816 (patch)
tree684263aa74cc7ce7ab3056baae6cd24ba0a7701f /vcl
parentf3854df014f94884492b7a81b7bc865d922cfda3 (diff)
Assume bit count 8 is OK for the other constructors, too
Change-Id: I9245101f3affa495e8da545dccdeb6510e37f17c
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/virdev.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 3e962fdbb54d..0cdbc0de75b4 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -173,8 +173,8 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
- SAL_WARN_IF( (nBitCount > 1 && nBitCount != 8), "vcl.gdi",
- "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount" );
+ SAL_WARN_IF( nBitCount > 1 && nBitCount != 8, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount, not " << nBitCount );
SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
@@ -186,8 +186,8 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
- SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
- "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
+ SAL_WARN_IF( nBitCount > 1 && nBitCount != 8, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount, not " << nBitCount );
SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
@@ -199,8 +199,8 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
: mpVirDev( NULL ),
meRefDevMode( REFDEV_NONE )
{
- SAL_WARN_IF( nBitCount > 1, "vcl.gdi",
- "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" );
+ SAL_WARN_IF( nBitCount > 1 && nBitCount != 8, "vcl.gdi",
+ "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount, not " << nBitCount );
SAL_INFO( "vcl.gdi",
"VirtualDevice::VirtualDevice( " << nBitCount << ", " << nAlphaBitCount << " )" );