diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-24 01:53:13 +1100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-28 03:19:47 -0600 |
commit | 381f8a5673b70e31fda2739da25f3863895ae665 (patch) | |
tree | d9366671e0e2794164ef6cbffbf3e53242139efb /vcl/qa/cppunit | |
parent | cd56e54df1df9c9e1a455f81bd86457f1d832604 (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/qa/cppunit')
-rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 16 | ||||
-rw-r--r-- | vcl/qa/cppunit/dndtest.cxx | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index a20a8951507c..f7da2df6b3f8 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -110,7 +110,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, bool(xBmp->hasAlpha()) == aContainedBmpEx.IsTransparent()); CPPUNIT_ASSERT_MESSAGE( "getScaledBitmap() failed", - xBmp->getScaledBitmap( geometry::RealSize2D(500,500), sal_False ).is()); + xBmp->getScaledBitmap( geometry::RealSize2D(500,500), false ).is()); rendering::IntegerBitmapLayout aLayout; uno::Sequence<sal_Int8> aPixelData = xBmp->getData(aLayout, geometry::IntegerRectangle2D(0,0,1,1)); @@ -196,7 +196,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, xPal->getNumberOfEntries() == 1L << nOriginalDepth); uno::Sequence<double> aIndex; CPPUNIT_ASSERT_MESSAGE( "Palette is not read-only", - xPal->setIndex(aIndex,sal_True,0) == sal_False); + xPal->setIndex(aIndex,true,0) == false); CPPUNIT_ASSERT_MESSAGE( "Palette entry 0 is not opaque", xPal->getIndex(aIndex,0)); CPPUNIT_ASSERT_MESSAGE( "Palette has no valid color space", @@ -348,7 +348,7 @@ private: return 255; } - virtual ::sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, + virtual sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, @@ -363,11 +363,11 @@ private: sal_uInt8(nIndex), sal_uInt8(nIndex)) ); - return sal_True; // no palette transparency here. + return true; // no palette transparency here. } - virtual ::sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, - ::sal_Bool, + virtual sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, + sal_Bool, ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, @@ -377,7 +377,7 @@ private: getPalette().is()); CPPUNIT_ASSERT_MESSAGE( "setIndex: index out of range", nIndex >= 0 && nIndex < 256); - return sal_False; + return false; } struct PaletteColorSpaceHolder: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>, @@ -679,7 +679,7 @@ public: maLayout.PlaneStride = 0; maLayout.ColorSpace.clear(); maLayout.Palette.clear(); - maLayout.IsMsbFirst = sal_False; + maLayout.IsMsbFirst = false; } }; diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx index 604d8702e4d6..e0f9d92cfa3f 100644 --- a/vcl/qa/cppunit/dndtest.cxx +++ b/vcl/qa/cppunit/dndtest.cxx @@ -126,7 +126,7 @@ public: virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException); virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); + virtual bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); }; @@ -178,7 +178,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -247,7 +247,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { - dtde.Context->dropComplete( sal_True ); + dtde.Context->dropComplete( true ); } @@ -324,7 +324,7 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -342,7 +342,7 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -368,10 +368,10 @@ Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors( ) -sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) +bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) throw(RuntimeException) { - return sal_True; + return true; } CPPUNIT_TEST_SUITE_REGISTRATION(VclDnDTest); |