diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:42:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:49:03 +0200 |
| commit | f9290d301144744df879cea907584656b7f74ad1 (patch) | |
| tree | 647eba944a40a0ad889d145c94578a6330940b26 | |
| parent | 1d3357ccf7a464003e9aa56cdc9dd86d2ffa17b6 (diff) | |
Clean up checks of sal_Bool values
Change-Id: Ia05565077823d6efaeaeb35d3d80b51dd9a10d4c
| -rw-r--r-- | extensions/source/update/check/updatecheckconfig.cxx | 4 | ||||
| -rw-r--r-- | test/source/sheet/xdatabaserange.cxx | 4 | ||||
| -rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index a1c5c97fd290..dfc62d81cc9b 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -106,7 +106,7 @@ NamedValueByNameAccess::getValue(const sal_Char * pName) bool UpdateCheckROModel::isAutoCheckEnabled() const { - return sal_True == m_aNameAccess.getValue(AUTOCHECK_ENABLED).get< sal_Bool >(); + return m_aNameAccess.getValue(AUTOCHECK_ENABLED).get<bool>(); } @@ -114,7 +114,7 @@ UpdateCheckROModel::isAutoCheckEnabled() const bool UpdateCheckROModel::isDownloadPaused() const { - return sal_True == m_aNameAccess.getValue(DOWNLOAD_PAUSED).get< sal_Bool >(); + return m_aNameAccess.getValue(DOWNLOAD_PAUSED).get<bool>(); } diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index 8c30ed8789d2..d1e5a5a72554 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -163,7 +163,7 @@ void XDatabaseRange::testRefresh() uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW); Any aAny = xPropRow->getPropertyValue( aHidden ); - CPPUNIT_ASSERT(aAny.get<sal_Bool>() == sal_True); + CPPUNIT_ASSERT(aAny.get<bool>()); } xDBRange->refresh(); @@ -177,7 +177,7 @@ void XDatabaseRange::testRefresh() uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW); Any aAny = xPropRow->getPropertyValue( aHidden ); - CPPUNIT_ASSERT(aAny.get<sal_Bool>() == sal_False); + CPPUNIT_ASSERT(!aAny.get<bool>()); } diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 855345746285..3eb4d9716012 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -293,7 +293,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) if (!(arguments.getLength() == 45 && (arguments[0] >>= arg0) && arg0.member == cppu::UnoType<sal_Int32>::get() && (arguments[1] >>= arg1) && arg1.member == arg1b - && (arguments[2] >>= arg2) && arg2.member == sal_True + && (arguments[2] >>= arg2) && arg2.member && (arguments[3] >>= arg3) && arg3.member == SAL_MIN_INT8 && (arguments[4] >>= arg4) && arg4.member == SAL_MIN_INT16 && (arguments[5] >>= arg5) && arg5.member == SAL_MIN_INT32 @@ -320,7 +320,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (arguments[19] >>= arg19) && arg19.member.getLength() == 1 && arg19.member[0] == arg1b && (arguments[20] >>= arg20) && arg20.member.getLength() == 1 - && arg20.member[0] == sal_True + && arg20.member[0] && (arguments[21] >>= arg21) && arg21.member.getLength() == 1 && arg21.member[0] == SAL_MIN_INT8 && (arguments[22] >>= arg22) && arg22.member.getLength() == 1 |