summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-08 11:44:15 +0200
committerNoel Grandin <noel@peralex.com>2014-05-08 11:48:14 +0200
commit78b9537b6aca0f998f939988e6e1a56528d28baf (patch)
tree6b96ba6b37c32c3ba2ffa112aff990739642e063 /testtools
parente5d0a9ad78ceb531018cb49c1d78b0f63ba92995 (diff)
various: sal_Bool->bool
Change-Id: I30fa5227f30373f95060148f269450d2945c1bb9
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx30
-rw-r--r--testtools/source/bridgetest/constructors.cxx12
-rw-r--r--testtools/source/bridgetest/cppobj.cxx4
3 files changed, 23 insertions, 23 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index a29ca660d9c0..c0be052df2e0 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -124,7 +124,7 @@ public:
};
-static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
+static bool equals( const TestElement & rData1, const TestElement & rData2 )
{
check( rData1.Bool == rData2.Bool, "### bool does not match!" );
check( rData1.Char == rData2.Char, "### char does not match!" );
@@ -159,7 +159,7 @@ static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
rData1.Any == rData2.Any);
}
-static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
+static bool equals( const TestData & rData1, const TestData & rData2 )
{
sal_Int32 nLen;
@@ -175,16 +175,16 @@ static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
if (! equals( pElements1[nLen], pElements2[nLen] ))
{
check( false, "### sequence element did not match!" );
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
static void assign( TestElement & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,
@@ -248,7 +248,7 @@ bool testAny(
}
-static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data)
+static bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data)
{
bool bReturn = true;
bReturn = testAny( data.Byte ,xLBT ) && bReturn;
@@ -283,7 +283,7 @@ static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const Test
}
-static sal_Bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT )
+static bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT )
{
sal_Int32 i,nRounds;
sal_Int32 nGlobalIndex = 0;
@@ -328,11 +328,11 @@ public:
-static sal_Bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT )
+static bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT )
{
xLBT->startRecursiveCall( new ORecursiveCall , 50 );
// on failure, the test would lock up or crash
- return sal_True;
+ return true;
}
class MyClass : public osl::DebugBase<MyClass>, public OWeakObject
@@ -364,7 +364,7 @@ void MyClass::release() throw ()
}
-static sal_Bool performTest(
+static bool performTest(
const Reference<XComponentContext> & xContext,
const Reference<XBridgeTest > & xLBT,
bool noCurrentContext )
@@ -924,9 +924,9 @@ static sal_Bool performTest(
return bRet;
}
-static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
+static bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
{
- sal_Bool bReturn = sal_True;
+ bool bReturn = true;
OUString sCompare = STRING_TEST_CONSTANT;
Reference<XInterface> const x(xLBT->getInterface());
try
@@ -949,7 +949,7 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
}
-static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
+static bool raiseException( const Reference< XBridgeTest > & xLBT )
{
sal_Int32 nCount = 0;
try
@@ -1027,7 +1027,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
}
return (nCount == 3);
}
- return sal_False;
+ return false;
}
/* Returns an acquired sequence
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 6c338035aacf..1bc595c96f47 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -68,7 +68,7 @@ private:
void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
throw (css::uno::Exception, std::exception)
{
- sal_Bool arg0 = sal_Bool();
+ bool arg0;
::sal_Int8 arg1 = sal_Int8();
::sal_Int16 arg2 = sal_Int16();
::sal_uInt16 arg3 = sal_uInt16();
@@ -80,7 +80,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
double arg9 = double();
OUString arg11;
css::uno::Type arg12;
- sal_Bool arg13 = sal_Bool();
+ bool arg13;
css::uno::Sequence< sal_Bool > arg14;
css::uno::Sequence< ::sal_Int8 > arg15;
css::uno::Sequence< ::sal_Int16 > arg16;
@@ -94,23 +94,23 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
css::uno::Sequence< OUString > arg25;
css::uno::Sequence< css::uno::Type > arg26;
css::uno::Sequence< css::uno::Any > arg27;
- sal_Bool arg27b = sal_Bool();
+ bool arg27b;
css::uno::Sequence< css::uno::Sequence< sal_Bool > > arg28;
css::uno::Sequence< css::uno::Sequence< css::uno::Any > > arg29;
- sal_Bool arg29b = sal_Bool();
+ bool arg29b;
css::uno::Sequence< ::test::testtools::bridgetest::TestEnum > arg30;
css::uno::Sequence< ::test::testtools::bridgetest::TestStruct > arg31;
css::uno::Sequence<
::test::testtools::bridgetest::TestPolyStruct< sal_Bool > > arg32;
css::uno::Sequence<
::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > > arg33;
- sal_Bool arg33b = sal_Bool();
+ bool arg33b;
css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > arg34;
::test::testtools::bridgetest::TestEnum arg35;
::test::testtools::bridgetest::TestStruct arg36;
::test::testtools::bridgetest::TestPolyStruct< sal_Bool > arg37;
::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > arg38;
- sal_Bool arg38b = sal_Bool();
+ bool arg38b;
css::uno::Reference< css::uno::XInterface > arg39;
if (!(arguments.getLength() == 40
&& (arguments[0] >>= arg0) && arg0
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index af14d325d9d4..d9e5ef77cf2f 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -70,7 +70,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
static void assign( TestElement & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,
@@ -97,7 +97,7 @@ static void assign( TestElement & rData,
}
static void assign( TestData & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,