summaryrefslogtreecommitdiff
path: root/vcl/source/helper/canvasbitmap.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-24 01:53:13 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-28 03:19:47 -0600
commit381f8a5673b70e31fda2739da25f3863895ae665 (patch)
treed9366671e0e2794164ef6cbffbf3e53242139efb /vcl/source/helper/canvasbitmap.cxx
parentcd56e54df1df9c9e1a455f81bd86457f1d832604 (diff)
sal_Bool -> bool in mostly vcl module
Conflicts: include/vcl/settings.hxx svtools/source/table/tablecontrol_impl.cxx sw/source/core/frmedt/fecopy.cxx vcl/inc/canvasbitmap.hxx vcl/inc/headless/svpframe.hxx vcl/inc/unx/salframe.h vcl/inc/win/salframe.h vcl/inc/win/salprn.h vcl/inc/win/salvd.h vcl/osx/DragSource.cxx vcl/osx/DragSource.hxx vcl/osx/DropTarget.cxx vcl/osx/DropTarget.hxx vcl/osx/OSXTransferable.cxx vcl/osx/OSXTransferable.hxx vcl/osx/clipboard.cxx vcl/osx/clipboard.hxx vcl/osx/salprn.cxx vcl/qa/cppunit/canvasbitmaptest.cxx vcl/source/components/fontident.cxx vcl/source/control/edit.cxx vcl/source/control/spinfld.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/virdev.cxx vcl/source/helper/canvasbitmap.cxx vcl/source/window/dockwin.cxx vcl/unx/generic/dtrans/X11_selection.hxx vcl/unx/kde/UnxFilePicker.cxx vcl/unx/kde/UnxFilePicker.hxx vcl/unx/kde4/KDE4FilePicker.cxx vcl/unx/kde4/KDE4FilePicker.hxx vcl/unx/kde4/KDESalFrame.hxx Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0 Reviewed-on: https://gerrit.libreoffice.org/8219 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/helper/canvasbitmap.cxx')
-rw-r--r--vcl/source/helper/canvasbitmap.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index ee9d63ce1071..82af07a555f3 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -127,7 +127,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_aLayout.PlaneStride = 0;
m_aLayout.ColorSpace.clear();
m_aLayout.Palette.clear();
- m_aLayout.IsMsbFirst = sal_False;
+ m_aLayout.IsMsbFirst = false;
if( m_pBmpAcc )
{
@@ -142,42 +142,42 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = true;
m_nBitsPerInputPixel = 1;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_True;
+ m_aLayout.IsMsbFirst = true;
break;
case BMP_FORMAT_1BIT_LSB_PAL:
m_bPalette = true;
m_nBitsPerInputPixel = 1;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_False;
+ m_aLayout.IsMsbFirst = false;
break;
case BMP_FORMAT_4BIT_MSN_PAL:
m_bPalette = true;
m_nBitsPerInputPixel = 4;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_True;
+ m_aLayout.IsMsbFirst = true;
break;
case BMP_FORMAT_4BIT_LSN_PAL:
m_bPalette = true;
m_nBitsPerInputPixel = 4;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_False;
+ m_aLayout.IsMsbFirst = false;
break;
case BMP_FORMAT_8BIT_PAL:
m_bPalette = true;
m_nBitsPerInputPixel = 8;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
break;
case BMP_FORMAT_8BIT_TC_MASK:
m_bPalette = false;
m_nBitsPerInputPixel = 8;
m_nEndianness = util::Endianness::LITTLE; // doesn't matter
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
m_pBmpAcc->GetColorMask().GetGreenMask(),
m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -187,7 +187,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 16;
m_nEndianness = util::Endianness::BIG;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
m_pBmpAcc->GetColorMask().GetGreenMask(),
m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -197,7 +197,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 16;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
m_pBmpAcc->GetColorMask().GetGreenMask(),
m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -207,7 +207,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 24;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( 0xff0000LL,
0x00ff00LL,
0x0000ffLL );
@@ -217,7 +217,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 24;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( 0x0000ffLL,
0x00ff00LL,
0xff0000LL );
@@ -227,7 +227,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 24;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
m_pBmpAcc->GetColorMask().GetGreenMask(),
m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -238,7 +238,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 32;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
m_aComponentTags.realloc(4);
sal_Int8* pTags = m_aComponentTags.getArray();
@@ -266,7 +266,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 32;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
m_aComponentTags.realloc(4);
sal_Int8* pTags = m_aComponentTags.getArray();
@@ -294,7 +294,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 32;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
m_aComponentTags.realloc(4);
sal_Int8* pTags = m_aComponentTags.getArray();
@@ -322,7 +322,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 32;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
m_aComponentTags.realloc(4);
sal_Int8* pTags = m_aComponentTags.getArray();
@@ -349,7 +349,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
m_bPalette = false;
m_nBitsPerInputPixel = 32;
m_nEndianness = util::Endianness::LITTLE;
- m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+ m_aLayout.IsMsbFirst = false; // doesn't matter
setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
m_pBmpAcc->GetColorMask().GetGreenMask(),
m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -438,7 +438,7 @@ geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeE
return integerSize2DFromSize( m_aBitmap.GetSizePixel() );
}
-::sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return m_aBmpEx.IsTransparent();