vcl/source/gdi/virdev.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 1cc065d28d8613160459994f8ea28a096eb85816 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Mar 20 12:47:47 2014 +0200 Assume bit count 8 is OK for the other constructors, too Change-Id: I9245101f3affa495e8da545dccdeb6510e37f17c diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 3e962fd..0cdbc0d 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 << " )" ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits