[Libreoffice-commits] core.git: 10 commits - compilerplugins/clang connectivity/qa cppu/qa cui/source editeng/source filter/source include/com include/editeng include/sfx2 include/vcl sfx2/source sw/inc sw/source vcl/qa
Stephan Bergmann
sbergman at redhat.com
Wed Jan 22 02:39:51 PST 2014
compilerplugins/clang/implicitboolconversion.cxx | 29 ++--
connectivity/qa/connectivity/mork/DriverTest.cxx | 2
cppu/qa/cppumaker/test_cppumaker.cxx | 6
cui/source/tabpages/autocdlg.cxx | 14 +-
editeng/source/outliner/outlin2.cxx | 2
editeng/source/uno/unoforou.cxx | 4
filter/source/pdf/impdialog.cxx | 4
include/com/sun/star/uno/Any.h | 52 +++----
include/com/sun/star/uno/Any.hxx | 156 +++++++++++------------
include/com/sun/star/uno/Reference.h | 24 +--
include/com/sun/star/uno/Reference.hxx | 30 ++--
include/com/sun/star/uno/Sequence.h | 6
include/com/sun/star/uno/Sequence.hxx | 6
include/com/sun/star/uno/Type.h | 8 -
include/editeng/outliner.hxx | 2
include/editeng/swafopt.hxx | 62 ++++-----
include/sfx2/viewfrm.hxx | 2
include/vcl/cmdevt.hxx | 56 ++++----
sfx2/source/view/viewfrm.cxx | 4
sw/inc/authfld.hxx | 4
sw/inc/crsrsh.hxx | 4
sw/inc/htmltbl.hxx | 2
sw/inc/pvprtdat.hxx | 2
sw/inc/swmodule.hxx | 6
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/frame.hxx | 32 ++--
sw/source/core/layout/calcmove.cxx | 2
sw/source/core/layout/paintfrm.cxx | 4
sw/source/core/layout/ssfrm.cxx | 6
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 4
sw/source/core/text/pormulti.hxx | 2
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/fntcap.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 9 -
sw/source/core/undo/unins.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 38 ++---
sw/source/ui/app/swmodul1.cxx | 6
sw/source/ui/config/optcomp.cxx | 22 +--
sw/source/ui/dbui/mmconfigitem.cxx | 2
sw/source/ui/inc/mmconfigitem.hxx | 2
sw/source/ui/inc/wrtsh.hxx | 2
sw/source/ui/misc/num.cxx | 2
sw/source/ui/table/chartins.cxx | 2
sw/source/ui/vba/vbacolumns.cxx | 2
sw/source/ui/vba/vbalistgalleries.cxx | 2
sw/source/ui/vba/vbalistlevels.cxx | 2
sw/source/ui/vba/vbalisttemplates.cxx | 2
sw/source/ui/vba/vbarows.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 2
53 files changed, 326 insertions(+), 324 deletions(-)
New commits:
commit cb710f3a1e5b5da0f24e0e775e722502281120ce
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:36:17 2014 +0100
implicitboolconversion: also warn about mixing bool/sal_Bool in == etc.
...as MSVC would warn about those anyway (at least about cases that do not
compare against literal sal_True/sal_False, but warning even about those helped
clean up lots of redundant
if (foo == true)
instead of just
if (foo)
etc. across the code base).
Change-Id: Iad4b335c35c5411070f04f87f974db7942c288d4
diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx
index bb50626..0c45bf0 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -27,11 +27,14 @@ template<> struct std::iterator_traits<ExprIterator> {
namespace {
-bool isBool(Expr const * expr) {
+bool isBool(Expr const * expr, bool allowTypedefs = true) {
QualType t1 { expr->getType() };
if (t1->isBooleanType()) {
return true;
}
+ if (!allowTypedefs) {
+ return false;
+ }
// css::uno::Sequence<sal_Bool> s(1);s[0]=false /*unotools/source/config/configitem.cxx*/:
if(t1->isSpecificBuiltinType(BuiltinType::UChar))return true;
TypedefType const * t2 = t1->getAs<TypedefType>();
@@ -265,9 +268,9 @@ bool ImplicitBoolConversion::TraverseBinLT(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
@@ -282,9 +285,9 @@ bool ImplicitBoolConversion::TraverseBinLE(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
@@ -299,9 +302,9 @@ bool ImplicitBoolConversion::TraverseBinGT(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
@@ -316,9 +319,9 @@ bool ImplicitBoolConversion::TraverseBinGE(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
@@ -333,9 +336,9 @@ bool ImplicitBoolConversion::TraverseBinEQ(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
@@ -350,9 +353,9 @@ bool ImplicitBoolConversion::TraverseBinNE(BinaryOperator * expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts()))
+ && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts()))))
+ && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
{
reportWarning(i);
}
commit 83d51e244d450df0f896758966f633c90cc4c483
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:34:29 2014 +0100
Let C++ inline functions return bool instead of sal_Bool
...to improve diagnosing misuses of boolean expressions in client code (cf.
compilerplugins/clang/implicitboolconversion.cxx). This change should be
transparent to client code.
Change-Id: Ife614637082036dd17412f247be79233326c4f0b
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 8dfe84a..f6bff00 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -443,13 +443,13 @@ void Test::testBigStruct() {
CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
+guard.p->m13.getTypeClass(), +com::sun::star::uno::TypeClass_VOID);
- CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), sal_False);
+ CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
+guard.p->m16, +test::codemaker::cppumaker::HelperEnum_ZERO);
CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False);
- CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), sal_False);
- CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), sal_False);
+ CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), false);
+ CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0));
CPPUNIT_ASSERT_EQUAL(
+guard.p->m20, +test::codemaker::cppumaker::HelperEnum_ZERO);
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index b7574bb..d9afd93 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -147,7 +147,7 @@ public:
@return true if any has a value, false otherwise
*/
- inline sal_Bool SAL_CALL hasValue() const SAL_THROW(())
+ inline bool SAL_CALL hasValue() const SAL_THROW(())
{ return (typelib_TypeClass_VOID != pType->eTypeClass); }
/** Gets a pointer to the set value.
@@ -205,7 +205,7 @@ public:
@param rType destination type
@return true if this any is extractable to value of given type (e.g. using >>= operator)
*/
- inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW(());
+ inline bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW(());
/** Tests whether this any can provide a value of specified type.
Widening conversion without data loss is taken into account.
@@ -222,14 +222,14 @@ public:
@param rAny another any (right side)
@return true if both any contains equal values
*/
- inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW(());
/** Unequality operator: compares two anys.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
@param rAny another any (right side)
@return true if both any contains unequal values
*/
- inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW(());
private:
/// @cond INTERNAL
@@ -283,7 +283,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
@return true if assignment was possible without data loss
*/
template< class C >
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(());
/** Template equality operator: compares set value of left side any to right side value.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
@@ -296,7 +296,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(
@return true if values are equal, false otherwise
*/
template< class C >
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(());
/** Template unequality operator: compares set value of left side any to right side value.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
This operator can be implemented as template member function, if all supported compilers
@@ -308,43 +308,43 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T
@return true if values are unequal, false otherwise
*/
template< class C >
-inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(());
+inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(());
// additional specialized >>= and == operators
// bool
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(());
template<>
-inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
+inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
SAL_THROW(());
template<>
-inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value )
+inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
SAL_THROW(());
// byte
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(());
// short
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(());
// long
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(());
// hyper
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(());
// float
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(());
// double
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(());
// string
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(());
// type
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(());
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(());
// any
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(());
// interface
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(());
}
}
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 1c02e5d..d04527a 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -140,7 +140,7 @@ inline void Any::clear() SAL_THROW(())
this, (uno_ReleaseFunc)cpp_release );
}
//__________________________________________________________________________________________________
-inline sal_Bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(())
+inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(())
{
return ::uno_type_isAssignableFromData(
rType.getTypeLibType(), pData, pType,
@@ -163,14 +163,14 @@ template <>
bool Any::has<sal_uInt16>() const;
//__________________________________________________________________________________________________
-inline sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW(())
+inline bool Any::operator == ( const Any & rAny ) const SAL_THROW(())
{
return ::uno_type_equalData(
pData, pType, rAny.pData, rAny.pType,
(uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release );
}
//__________________________________________________________________________________________________
-inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW(())
+inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(())
{
return (! ::uno_type_equalData(
pData, pType, rAny.pData, rAny.pType,
@@ -238,7 +238,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C
#endif
//__________________________________________________________________________________________________
template< class C >
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(())
{
const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
return ::uno_type_assignData(
@@ -250,17 +250,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(
// bool
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(())
{
if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass)
{
value = (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False);
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(())
{
return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass &&
(value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False));
@@ -268,7 +268,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value
//______________________________________________________________________________
template<>
-inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
+inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
SAL_THROW(())
{
if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN)
@@ -282,7 +282,7 @@ inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
//______________________________________________________________________________
template<>
-inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value )
+inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
SAL_THROW(())
{
return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN &&
@@ -293,240 +293,240 @@ inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value )
// byte
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(())
{
if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass)
{
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// short
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = (sal_uInt16)( * reinterpret_cast< const sal_Int8 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
// long
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = (sal_uInt32)( * reinterpret_cast< const sal_Int8 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = (sal_uInt32)( * reinterpret_cast< const sal_Int16 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
// hyper
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_LONG:
value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
value = * reinterpret_cast< const sal_Int64 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = (sal_uInt64)( * reinterpret_cast< const sal_Int8 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = (sal_uInt64)( * reinterpret_cast< const sal_Int16 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_LONG:
value = (sal_uInt64)( * reinterpret_cast< const sal_Int32 * >( rAny.pData ) );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
value = * reinterpret_cast< const sal_uInt64 * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
// float
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_FLOAT:
value = * reinterpret_cast< const float * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
// double
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(())
{
switch (rAny.pType->eTypeClass)
{
case typelib_TypeClass_BYTE:
value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_SHORT:
value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_SHORT:
value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_LONG:
value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_UNSIGNED_LONG:
value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_FLOAT:
value = * reinterpret_cast< const float * >( rAny.pData );
- return sal_True;
+ return true;
case typelib_TypeClass_DOUBLE:
value = * reinterpret_cast< const double * >( rAny.pData );
- return sal_True;
+ return true;
default:
- return sal_False;
+ return false;
}
}
// string
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(())
{
if (typelib_TypeClass_STRING == rAny.pType->eTypeClass)
{
value = * reinterpret_cast< const ::rtl::OUString * >( rAny.pData );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(())
{
return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) ));
}
// type
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(())
{
if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass)
{
value = * reinterpret_cast< const Type * >( rAny.pData );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(())
{
return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass &&
value.equals( * reinterpret_cast< const Type * >( rAny.pData ) ));
}
// any
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(())
{
if (&rAny != &value)
{
@@ -534,23 +534,23 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THRO
&value, rAny.pData, rAny.pType,
(uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release );
}
- return sal_True;
+ return true;
}
// interface
//__________________________________________________________________________________________________
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(())
{
if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass)
{
return reinterpret_cast< const BaseReference * >( rAny.pData )->operator == ( value );
}
- return sal_False;
+ return false;
}
// operator to compare to an any.
//__________________________________________________________________________________________________
template< class C >
-inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(())
{
const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
return ::uno_type_equalData(
@@ -561,7 +561,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T
// operator to compare to an any. may use specialized operators ==.
//__________________________________________________________________________________________________
template< class C >
-inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(())
+inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(())
{
return (! operator == ( rAny, value ));
}
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index 55b263f..b1299fd 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -88,7 +88,7 @@ public:
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline sal_Bool SAL_CALL is() const SAL_THROW(())
+ inline bool SAL_CALL is() const SAL_THROW(())
{ return (0 != _pInterface); }
/** Equality operator: compares two interfaces
@@ -97,14 +97,14 @@ public:
@param pInterface another interface
@return true if both references are null or refer to the same object, false otherwise
*/
- inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW(());
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@param pInterface another interface
@return false if both references are null or refer to the same object, true otherwise
*/
- inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW(());
/** Equality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@@ -112,21 +112,21 @@ public:
@param rRef another reference
@return true if both references are null or refer to the same object, false otherwise
*/
- inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW(());
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@param rRef another reference
@return false if both references are null or refer to the same object, true otherwise
*/
- inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW(());
/** Needed by some STL containers.
@param rRef another reference
@return true, if this reference is less than rRef
*/
- inline sal_Bool SAL_CALL operator < ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator < ( const BaseReference & rRef ) const SAL_THROW(());
};
/** Enum defining UNO_QUERY for implicit interface query.
@@ -420,13 +420,13 @@ public:
@param rRef another reference
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW(());
+ inline bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW(());
/** Sets the given interface. An interface already set will be released.
@param pInterface another interface
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface ) SAL_THROW(());
/** Sets interface pointer without acquiring it. An interface already set will be released.
@@ -434,7 +434,7 @@ public:
@param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(());
/** Sets interface pointer without acquiring it. An interface already set will be released.
Deprecated, please use SAL_NO_ACQUIRE version.
@@ -443,7 +443,7 @@ public:
@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy) SAL_THROW(());
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
@@ -452,7 +452,7 @@ public:
@param dummy UNO_QUERY to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( XInterface * pInterface, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) );
+ inline bool SAL_CALL set( XInterface * pInterface, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) );
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
@@ -460,7 +460,7 @@ public:
@param dummy UNO_QUERY to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline sal_Bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query dummy) SAL_THROW( (RuntimeException) );
+ inline bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query dummy) SAL_THROW( (RuntimeException) );
/** Queries given any for reference interface type (interface_type)
and sets it. An interface already set will be released.
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx
index 9726860..1e6a13b 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -215,7 +215,7 @@ inline void Reference< interface_type >::clear() SAL_THROW(())
}
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
interface_type * pInterface ) SAL_THROW(())
{
if (pInterface)
@@ -228,7 +228,7 @@ inline sal_Bool Reference< interface_type >::set(
}
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(())
{
XInterface * const pOld = _pInterface;
@@ -239,7 +239,7 @@ inline sal_Bool Reference< interface_type >::set(
}
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(())
{
return set( pInterface, SAL_NO_ACQUIRE );
@@ -247,21 +247,21 @@ inline sal_Bool Reference< interface_type >::set(
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
const Reference< interface_type > & rRef ) SAL_THROW(())
{
return set( castFromXInterface( rRef._pInterface ) );
}
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) )
{
return set( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE );
}
//__________________________________________________________________________________________________
template< class interface_type >
-inline sal_Bool Reference< interface_type >::set(
+inline bool Reference< interface_type >::set(
const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) )
{
return set( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE );
@@ -358,10 +358,10 @@ inline Reference< interface_type > Reference< interface_type >::query(
//##################################################################################################
//__________________________________________________________________________________________________
-inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(())
+inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(())
{
if (_pInterface == pInterface)
- return sal_True;
+ return true;
try
{
// only the query to XInterface must return the same pointer if they belong to same objects
@@ -371,16 +371,16 @@ inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL
}
catch (RuntimeException &)
{
- return sal_False;
+ return false;
}
}
//______________________________________________________________________________
-inline sal_Bool BaseReference::operator < (
+inline bool BaseReference::operator < (
const BaseReference & rRef ) const SAL_THROW(())
{
if (_pInterface == rRef._pInterface)
- return sal_False;
+ return false;
try
{
// only the query to XInterface must return the same pointer:
@@ -390,22 +390,22 @@ inline sal_Bool BaseReference::operator < (
}
catch (RuntimeException &)
{
- return sal_False;
+ return false;
}
}
//__________________________________________________________________________________________________
-inline sal_Bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(())
+inline bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(())
{
return (! operator == ( pInterface ));
}
//__________________________________________________________________________________________________
-inline sal_Bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(())
+inline bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(())
{
return operator == ( rRef._pInterface );
}
//__________________________________________________________________________________________________
-inline sal_Bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(())
+inline bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(())
{
return (! operator == ( rRef._pInterface ));
}
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index fe5c16c..ff52ee3 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -140,7 +140,7 @@ public:
@return true, if elements count is greater than zero
*/
- inline sal_Bool SAL_CALL hasElements() const SAL_THROW(())
+ inline bool SAL_CALL hasElements() const SAL_THROW(())
{ return (_pSequence->nElements > 0); }
/** Gets a pointer to elements array for reading.
@@ -217,7 +217,7 @@ public:
@param rSeq another sequence of same type (right side)
@return true if both sequences are equal, false otherwise
*/
- inline sal_Bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const
+ inline bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const
SAL_THROW(());
/** Unequality operator: Compares two sequences.
@@ -225,7 +225,7 @@ public:
@param rSeq another sequence of same type (right side)
@return false if both sequences are equal, true otherwise
*/
- inline sal_Bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const
+ inline bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const
SAL_THROW(());
/** Reallocates sequence to new length.
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index 00e66fc..0e5adda 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -110,11 +110,11 @@ inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq )
}
template< class E >
-inline sal_Bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const
+inline bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const
SAL_THROW(())
{
if (_pSequence == rSeq._pSequence)
- return sal_True;
+ return true;
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
return ::uno_type_equalData(
const_cast< Sequence< E > * >( this ), rType.getTypeLibType(),
@@ -124,7 +124,7 @@ inline sal_Bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const
}
template< class E >
-inline sal_Bool Sequence< E >::operator != ( const Sequence< E > & rSeq ) const
+inline bool Sequence< E >::operator != ( const Sequence< E > & rSeq ) const
SAL_THROW(())
{
return (! operator == ( rSeq ));
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index c1e4303..0a6a21b 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -163,7 +163,7 @@ public:
@return true if values of this type can be assigned from values of given type,
false otherwise
*/
- inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW(())
+ inline bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW(())
{ return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); }
/** Compares two types.
@@ -171,21 +171,21 @@ public:
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW(())
+ inline bool SAL_CALL equals( const Type & rType ) const SAL_THROW(())
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Equality operator: Compares two types.
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW(())
+ inline bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW(())
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Unequality operator: Compares two types.
@param rType another type
@return false if both types refer the same type, true otherwise
*/
- inline sal_Bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW(())
+ inline bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW(())
{ return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); }
};
commit 7cb3e55bf03c49608e2b54b5d90eddd423a0f891
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:31:07 2014 +0100
bool improvements
Change-Id: Ib65a1e987ad6511e90fd66a36c0105593a1df27c
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 202a853..55ed5b7 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -46,10 +46,10 @@ public:
struct SwTOXSortKey
{
ToxAuthorityField eField;
- sal_Bool bSortAscending;
+ bool bSortAscending;
SwTOXSortKey() :
eField(AUTH_FIELD_END),
- bSortAscending(sal_True){}
+ bSortAscending(true){}
};
class SwAuthorityField;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 4bcbf35..978d6b6 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -587,7 +587,7 @@ public:
inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const;
inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const;
- inline sal_Bool IsCrsrPtAtEnd() const;
+ inline bool IsCrsrPtAtEnd() const;
inline const SwPaM* GetTblCrs() const;
inline SwPaM* GetTblCrs();
@@ -897,7 +897,7 @@ inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const
return m_pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
}
-inline sal_Bool SwCrsrShell::IsCrsrPtAtEnd() const
+inline bool SwCrsrShell::IsCrsrPtAtEnd() const
{
return m_pCurCrsr->End() == m_pCurCrsr->GetPoint();
}
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index ce63e6b..b7bb4fb 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -303,7 +303,7 @@ public:
bool HasColsOption() const { return bColsOption; }
bool HasColTags() const { return bColTags; }
- sal_Bool IsTopTable() const { return pSwTable != 0; }
+ bool IsTopTable() const { return pSwTable != 0; }
void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; }
void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; }
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index 96ee15e..8e4bd15 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -60,7 +60,7 @@ public:
sal_uInt8 GetCol() const { return nCol; }
void SetCol( sal_uInt8 n ) { nCol = n; }
- sal_Bool GetLandscape() const { return bLandscape; }
+ bool GetLandscape() const { return bLandscape; }
void SetLandscape( sal_Bool b ) { bLandscape = b; }
};
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 62e8ed6..1e34fb9 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -145,15 +145,15 @@ public:
const SwViewOption* GetViewOption(sal_Bool bWeb);
void ApplyUsrPref(const SwViewOption &, SwView*,
sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
- void ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb );
- void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb );
+ void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
+ void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb );
void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
void ApplyLinkMode(sal_Int32 nNewLinkMode);
// Default page mode for text grid.
void ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode);
- void ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); // apply_char_unit
+ void ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb); // apply_char_unit
// Create ConfigItems.
SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 997b589..b9a3b99 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -39,7 +39,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
SwRedlineData* pRedlData;
sal_uLong nNode;
sal_Int32 nCntnt, nLen;
- sal_Bool bIsWordDelim : 1;
+ bool bIsWordDelim : 1;
sal_Bool bIsAppend : 1;
sal_Bool m_bWithRsid : 1;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 721deee..77fe0cf 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -182,15 +182,15 @@ typedef SwRectFnCollection* SwRectFn;
// Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
-#define SWRECTFN( pFrm ) sal_Bool bVert = pFrm->IsVertical(); \
- sal_Bool bRev = pFrm->IsReverse(); \
- sal_Bool bVertL2R = pFrm->IsVertLR(); \
+#define SWRECTFN( pFrm ) bool bVert = pFrm->IsVertical(); \
+ bool bRev = pFrm->IsReverse(); \
+ bool bVertL2R = pFrm->IsVertLR(); \
SwRectFn fnRect = bVert ? \
( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \
( bRev ? fnRectB2T : fnRectHori );
-#define SWRECTFNX( pFrm ) sal_Bool bVertX = pFrm->IsVertical(); \
- sal_Bool bRevX = pFrm->IsReverse(); \
- sal_Bool bVertL2RX = pFrm->IsVertLR(); \
+#define SWRECTFNX( pFrm ) bool bVertX = pFrm->IsVertical(); \
+ bool bRevX = pFrm->IsReverse(); \
+ bool bVertL2RX = pFrm->IsVertLR(); \
SwRectFn fnRectX = bVertX ? \
( bRevX ? fnRectVL2R : ( bVertL2RX ? fnRectVertL2R : fnRectVert ) ): \
( bRevX ? fnRectB2T : fnRectHori );
@@ -202,9 +202,9 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
fnRect = bVert ? \
( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \
( bRev ? fnRectB2T : fnRectHori ); }
-#define SWRECTFN2( pFrm ) sal_Bool bVert = pFrm->IsVertical(); \
- sal_Bool bVertL2R = pFrm->IsVertLR(); \
- sal_Bool bNeighb = pFrm->IsNeighbourFrm(); \
+#define SWRECTFN2( pFrm ) bool bVert = pFrm->IsVertical(); \
+ bool bVertL2R = pFrm->IsVertLR(); \
+ bool bNeighb = pFrm->IsNeighbourFrm(); \
SwRectFn fnRect = bVert == bNeighb ? \
fnRectHori : ( bVertL2R ? fnRectVertL2R : fnRectVert );
//End of SCMS
@@ -545,9 +545,9 @@ public:
bool IsInBalancedSection() const;
- inline sal_Bool IsReverse() const { return mbReverse; }
+ inline bool IsReverse() const { return mbReverse; }
inline void SetReverse( sal_Bool bNew ){ mbReverse = bNew ? 1 : 0; }
- inline sal_Bool IsVertical() const;
+ inline bool IsVertical() const;
//Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
inline sal_Bool IsVertLR() const;
inline sal_Bool GetVerticalFlag() const;
@@ -556,7 +556,7 @@ public:
inline void SetbVertLR( sal_Bool bNew ) { mbVertLR = bNew ? 1 : 0; }
inline void SetDerivedVert( sal_Bool bNew ){ mbDerivedVert = bNew ? 1 : 0; }
inline void SetInvalidVert( sal_Bool bNew) { mbInvalidVert = bNew ? 1 : 0; }
- inline sal_Bool IsRightToLeft() const;
+ inline bool IsRightToLeft() const;
inline sal_Bool GetRightToLeftFlag() const;
inline void SetRightToLeft( sal_Bool bNew ){ mbRightToLeft = bNew ? 1 : 0; }
inline void SetDerivedR2L( sal_Bool bNew ) { mbDerivedR2L = bNew ? 1 : 0; }
@@ -868,8 +868,8 @@ public:
void MakeUpperPos( const SwFrm*, const SwFrm*, sal_Bool );
void MakeLeftPos( const SwFrm*, const SwFrm*, sal_Bool );
void MakeRightPos( const SwFrm*, const SwFrm*, sal_Bool );
- inline sal_Bool IsNeighbourFrm() const
- { return GetType() & FRM_NEIGHBOUR ? sal_True : sal_False; }
+ inline bool IsNeighbourFrm() const
+ { return (GetType() & FRM_NEIGHBOUR) != 0; }
// #i65250#
inline sal_uInt32 GetFrmId() const { return mnFrmId; }
@@ -926,7 +926,7 @@ inline sal_Bool SwFrm::IsInSct() const
((SwFrm*)this)->SetInfFlags();
return mbInfSct;
}
-sal_Bool SwFrm::IsVertical() const
+bool SwFrm::IsVertical() const
{
if( mbInvalidVert )
((SwFrm*)this)->SetDirFlags( sal_True );
@@ -942,7 +942,7 @@ sal_Bool SwFrm::GetVerticalFlag() const
{
return mbVertical != 0;
}
-inline sal_Bool SwFrm::IsRightToLeft() const
+inline bool SwFrm::IsRightToLeft() const
{
if( mbInvalidR2L )
((SwFrm*)this)->SetDirFlags( sal_False );
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index fce2a3b..fed1316 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -823,7 +823,7 @@ void SwLayoutFrm::MakeAll()
// takes care of the notification in the dtor
const SwLayNotify aNotify( this );
- sal_Bool bVert = IsVertical();
+ bool bVert = IsVertical();
//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = ( IsNeighbourFrm() == bVert )? fnRectHori : ( IsVertLR() ? fnRectVertL2R : fnRectVert );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d8e0de4..4bb672a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3349,8 +3349,8 @@ public:
SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect )
{
- sal_Bool bVert = rFrm.IsVertical();
- sal_Bool bR2L = rFrm.IsRightToLeft();
+ bool bVert = rFrm.IsVertical();
+ bool bR2L = rFrm.IsRightToLeft();
if( rFrm.IsNeighbourFrm() && bVert == bR2L )
{
if( bVert )
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index e44893b..1169bd3 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -213,9 +213,9 @@ const sal_uInt16 nMinVertCellHeight = 1135;
void SwFrm::CheckDirChange()
{
- sal_Bool bOldVert = GetVerticalFlag();
- sal_Bool bOldRev = IsReverse();
- sal_Bool bOldR2L = GetRightToLeftFlag();
+ bool bOldVert = GetVerticalFlag();
+ bool bOldRev = IsReverse();
+ bool bOldR2L = GetRightToLeftFlag();
SetInvalidVert( sal_True );
SetInvalidR2L( sal_True );
bool bChg = bOldR2L != IsRightToLeft();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 9d3275e..500765d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4029,7 +4029,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
// <-- NEW TABLES
// Do not consider rotated cells:
- if ( ( 0 != pLow->IsVertical() ) == ( 0 != bVert ) && nTmp > nHeight )
+ if ( pLow->IsVertical() == bVert && nTmp > nHeight )
nHeight = nTmp;
pLow = static_cast<const SwCellFrm*>(pLow->GetNext());
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index af99041..afcbe73 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -789,7 +789,7 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
// (is this really necessary?)
if ( !pTable->GetUpper()->IsInTab() )
{
- const sal_Bool bRTL = pTable->IsRightToLeft();
+ const bool bRTL = pTable->IsRightToLeft();
const long nPrtLeft = bRTL ?
(pTable->*fnRect->fnGetPrtRight)() :
(pTable->*fnRect->fnGetPrtLeft)();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 3f7cff0..d7f6895 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1238,7 +1238,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
const SwTabFrm* pTab = FindTabFrm();
// NEW TABLES
- if ( ( 0 != pTab->IsVertical() ) != ( 0 != IsVertical() ) ||
+ if ( pTab->IsVertical() != IsVertical() ||
pThisCell->GetLayoutRowSpan() < 1 )
return 0;
}
@@ -1281,7 +1281,7 @@ SwTwips SwFrm::Shrink( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
const SwTabFrm* pTab = FindTabFrm();
// NEW TABLES
- if ( ( 0 != pTab->IsVertical() ) != ( 0 != IsVertical() ) ||
+ if ( pTab->IsVertical() != IsVertical() ||
pThisCell->GetLayoutRowSpan() < 1 )
return 0;
}
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 86c64e5..fda3fbb 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -125,7 +125,7 @@ public:
inline sal_Bool IsDouble() const { return bDouble; }
inline bool IsRuby() const { return bRuby; }
inline sal_Bool IsBidi() const { return bBidi; }
- inline sal_Bool OnTop() const { return bTop; }
+ inline bool OnTop() const { return bTop; }
void ActualizeTabulator();
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1e3dea6..3e18b95 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1591,7 +1591,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
// Test
{
SetInvalidVert( sal_False );
- sal_Bool bOld = IsVertical();
+ bool bOld = IsVertical();
SetInvalidVert( sal_True );
if( bOld != IsVertical() )
InvalidateRange( SwCharRange( GetOfst(), COMPLETE_STRING ) );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 28391ba..92cce0a 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -936,7 +936,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
// line of the ExtendedAttributeSets will appear in the font color first
const sal_Bool bSwitchH2V = rInf.GetFrm() && rInf.GetFrm()->IsVertical();
- const sal_Bool bSwitchL2R = rInf.GetFrm() && rInf.GetFrm()->IsRightToLeft() &&
+ const bool bSwitchL2R = rInf.GetFrm() && rInf.GetFrm()->IsRightToLeft() &&
! rInf.IsIgnoreFrmRTL();
const sal_uLong nMode = rInf.GetOut().GetLayoutMode();
const sal_Bool bBidiPor = ( bSwitchL2R !=
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index b92c482..f9d9689 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -313,7 +313,7 @@ void SwDoDrawCapital::DrawSpace( Point &rPos )
long nDiff = rInf.GetPos().X() - rPos.X();
Point aPos( rPos );
- const sal_Bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
+ const bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
! rInf.IsIgnoreFrmRTL();
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index afe6dc3..18d5dff 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4382,7 +4382,7 @@ namespace {
const SfxBoolItem& aListIsRestartItem =
dynamic_cast<const SfxBoolItem&>(pItem);
if ( aListIsRestartItem.GetValue() !=
- (mrTxtNode.IsListRestart() ? sal_True : sal_False) )
+ mrTxtNode.IsListRestart() )
{
mbUpdateListRestart = true;
}
@@ -4408,7 +4408,7 @@ namespace {
const SfxBoolItem& aIsCountedInListItem =
dynamic_cast<const SfxBoolItem&>(pItem);
if ( aIsCountedInListItem.GetValue() !=
- (mrTxtNode.IsCountedInList() ? sal_True : sal_False) )
+ mrTxtNode.IsCountedInList() )
{
mbUpdateListCount = true;
}
@@ -4490,8 +4490,7 @@ namespace {
{
const SfxBoolItem* pListIsRestartItem =
dynamic_cast<const SfxBoolItem*>(pItem);
- if ( pListIsRestartItem->GetValue() !=
- (mrTxtNode.IsListRestart() ? sal_True : sal_False) )
+ if ( pListIsRestartItem->GetValue() != mrTxtNode.IsListRestart() )
{
mbUpdateListRestart = true;
}
@@ -4515,7 +4514,7 @@ namespace {
const SfxBoolItem* pIsCountedInListItem =
dynamic_cast<const SfxBoolItem*>(pItem);
if ( pIsCountedInListItem->GetValue() !=
- (mrTxtNode.IsCountedInList() ? sal_True : sal_False) )
+ mrTxtNode.IsCountedInList() )
{
mbUpdateListCount = true;
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 5979af1..33438af 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -124,7 +124,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
: SwUndo(UNDO_SPLITNODE), pTxt( 0 ),
pRedlData( 0 ), nNode( rNd.GetIndex() ), nCntnt(0), nLen(1),
- bIsWordDelim( sal_False ), bIsAppend( sal_True )
+ bIsWordDelim( false ), bIsAppend( sal_True )
, m_bWithRsid(false)
, m_nInsertFlags(IDocumentContentOperations::INS_EMPTYEXPAND)
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 06bff4b..786d296 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -519,26 +519,26 @@ public:
sal_uInt8 nTxtTyp;
- sal_uInt8 bStyDef : 1; // should Style be written?
- sal_uInt8 bBreakBefore : 1; // Breaks are being written 2 times
- sal_uInt8 bOutKF : 1; // Header/Footer texts are being written
- sal_uInt8 bOutFlyFrmAttrs : 1; // Frame-attr of Flys are being written
- sal_uInt8 bOutPageDescs : 1; ///< PageDescs (section properties) are being written
- sal_uInt8 bOutFirstPage : 1; // write Attrset of FirstPageDesc
- sal_uInt8 bOutTable : 1; // table is being written
+ bool bStyDef : 1; // should Style be written?
+ bool bBreakBefore : 1; // Breaks are being written 2 times
+ bool bOutKF : 1; // Header/Footer texts are being written
+ bool bOutFlyFrmAttrs : 1; // Frame-attr of Flys are being written
+ bool bOutPageDescs : 1; ///< PageDescs (section properties) are being written
+ bool bOutFirstPage : 1; // write Attrset of FirstPageDesc
+ bool bOutTable : 1; // table is being written
// ( wird zB bei Flys in Tabelle zurueckgesetzt )
- sal_uInt8 bOutGrf : 1; // graphics are being written
- sal_uInt8 bInWriteEscher : 1; // in write textboxes
- sal_uInt8 bStartTOX : 1; // true: a TOX is startet
- sal_uInt8 bInWriteTOX : 1; // true: all content are in a TOX
- sal_uInt8 bFtnAtTxtEnd : 1; // true: all FTN at Textend
- sal_uInt8 bEndAtTxtEnd : 1; // true: all END at Textend
- sal_uInt8 bHasHdr : 1;
- sal_uInt8 bHasFtr : 1;
- sal_uInt8 bSubstituteBullets : 1; // true: SubstituteBullet() gets called
- sal_uInt8 bTabInTOC : 1; //true for TOC field flag 'w'
-
- sal_uInt8 bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
+ bool bOutGrf : 1; // graphics are being written
+ bool bInWriteEscher : 1; // in write textboxes
+ bool bStartTOX : 1; // true: a TOX is startet
+ bool bInWriteTOX : 1; // true: all content are in a TOX
+ bool bFtnAtTxtEnd : 1; // true: all FTN at Textend
+ bool bEndAtTxtEnd : 1; // true: all END at Textend
+ bool bHasHdr : 1;
+ bool bHasFtr : 1;
+ bool bSubstituteBullets : 1; // true: SubstituteBullet() gets called
+ bool bTabInTOC : 1; //true for TOC field flag 'w'
+
+ bool bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
bool mbExportModeRTF;
bool mbOutOutlineOnly; // export outline nodes, only (send outline to clipboard/presentation)
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index dfaf289..73fe0a1 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -207,7 +207,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
pPref->SetIdle(sal_True);
}
-void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb )
+void SwModule::ApplyUserMetric( FieldUnit eMetric, bool bWeb )
{
SwMasterUsrPref* pPref;
if(bWeb)
@@ -243,7 +243,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb )
}
}
-void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb )
+void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb )
{
SwMasterUsrPref* pPref;
if(bWeb)
@@ -279,7 +279,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bo
}
//set the usrpref 's char unit attribute and set rulers unit as char if the "apply char unit" is checked
-void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
+void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb)
{
SwMasterUsrPref* pPref;
if(bWeb)
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index f793df0..7adb09e 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -375,17 +375,17 @@ sal_uLong SwCompatibilityOptPage::GetDocumentOptions() const
{
const IDocumentSettingAccess& rIDocumentSettingAccess = *m_pWrtShell->getIDocumentSettingAccess();
nRet = convertBools2Ulong_Impl(
- rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) == sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::TAB_COMPAT) == sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_EXT_LEADING) == sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::OLD_LINE_SPACING) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) != sal_False,
- rIDocumentSettingAccess.get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) != sal_True );
+ !rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES),
+ !rIDocumentSettingAccess.get(IDocumentSettingAccess::TAB_COMPAT),
+ !rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_EXT_LEADING),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::OLD_LINE_SPACING),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING),
+ rIDocumentSettingAccess.get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION),
+ !rIDocumentSettingAccess.get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) );
}
return nRet;
}
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 89b15ee..05fa515 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -778,7 +778,7 @@ const Sequence< OUString> SwMailMergeConfigItem::GetAddressBlocks() const
return m_pImpl->GetAddressBlocks();
}
-sal_Bool SwMailMergeConfigItem::IsAddressBlock()const
+bool SwMailMergeConfigItem::IsAddressBlock()const
{
return m_pImpl->bIsAddressBlock && IsOutputToLetter();
}
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx
index c07612d..b5c751d 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/ui/inc/mmconfigitem.hxx
@@ -124,7 +124,7 @@ public:
sal_Bool IsOutputToLetter()const;
void SetOutputToLetter(sal_Bool bSet);
- sal_Bool IsAddressBlock()const;
+ bool IsAddressBlock()const;
void SetAddressBlock(sal_Bool bSet);
sal_Bool IsHideEmptyParagraphs() const;
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 894e9f5..2b6dfd7 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -141,7 +141,7 @@ public:
void EnterBlockMode();
void LeaveBlockMode();
bool ToggleBlockMode();
- sal_Bool IsBlockMode() const { return bBlockMode; }
+ bool IsBlockMode() const { return bBlockMode; }
void SetInsMode( sal_Bool bOn = sal_True );
void ToggleInsMode() { SetInsMode( !bIns ); }
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 50e958a..3744ef4 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -355,7 +355,7 @@ void SwNumPositionTabPage::InitControls()
m_pIndentAtMF->SetText(aEmptyOUStr);
}
- if(sal_True == bSetDistEmpty)
+ if(bSetDistEmpty)
m_pDistBorderMF->SetText(aEmptyOUStr);
bInInintControl = sal_False;
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index a2654e2..eb9cb6c 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -165,7 +165,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
}
SwFlyFrmFmt *pFlyFrmFmt = 0;
- xChartModel.set( SwTableFUNC( &rWrtShell, sal_False ).InsertChart( xDataProvider, (sal_True == xDataProvider.is()), aRangeString, &pFlyFrmFmt ));
+ xChartModel.set( SwTableFUNC( &rWrtShell, sal_False ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
//open wizard
//@todo get context from writer if that has one
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 5bcf49b..3344c88 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -100,7 +100,7 @@ void SAL_CALL SwVbaColumns::Select( ) throw (uno::RuntimeException)
uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
{
sal_Int32 nIndex = 0;
- if( ( Index1 >>= nIndex ) == sal_True )
+ if( ( Index1 >>= nIndex ) )
{
if( nIndex <= 0 || nIndex > getCount() )
{
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx
index ecb8852..87ea07c 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -55,7 +55,7 @@ SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >
uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
{
sal_Int32 nIndex = 0;
- if( ( Index1 >>= nIndex ) == sal_True )
+ if( ( Index1 >>= nIndex ) )
{
if( nIndex == word::WdListGalleryType::wdBulletGallery
|| nIndex == word::WdListGalleryType::wdNumberGallery
diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx
index 9c2822f..016d561 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -60,7 +60,7 @@ SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xPar
uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
{
sal_Int32 nIndex = 0;
- if( ( Index1 >>= nIndex ) == sal_False )
+ if( !( Index1 >>= nIndex ) )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
throw uno::RuntimeException("Index out of bounds", uno::Reference< uno::XInterface >() );
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx
index 00f3ee2..d3ec908 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -54,7 +54,7 @@ SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >
uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
{
sal_Int32 nIndex = 0;
- if( ( Index1 >>= nIndex ) == sal_False )
+ if( !( Index1 >>= nIndex ) )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
throw uno::RuntimeException("Index out of bounds", uno::Reference< uno::XInterface >() );
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 9f728d6..b87d19e 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -319,7 +319,7 @@ void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException)
uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
{
sal_Int32 nIndex = 0;
- if( ( Index1 >>= nIndex ) == sal_True )
+ if( ( Index1 >>= nIndex ) )
{
if( nIndex <= 0 || nIndex > getCount() )
{
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 676baf7..3a10c07 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -555,7 +555,7 @@ SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException )
uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name ) throw (uno::RuntimeException)
{
sal_Int32 nWhat = 0;
- if( ( _what >>= nWhat ) != sal_True )
+ if( !( _what >>= nWhat ) )
DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
switch( nWhat )
{
commit 747ba6295d22c2e65be984cd750f240dc106482b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:29:27 2014 +0100
bool improvements
Change-Id: I2a0980a603822ffdf74a38ba0b41ba27a6830861
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index ea53121..ea46248 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -527,7 +527,7 @@ void Outliner::SetVertical( sal_Bool b )
pEditEngine->SetVertical( b );
}
-sal_Bool Outliner::IsVertical() const
+bool Outliner::IsVertical() const
{
return pEditEngine->IsVertical();
}
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 3300688..d671d9e 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -298,7 +298,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_uInt16 nInde
// don't rotate for vertical text.
Size aSize( rOutliner.CalcTextSize() );
::std::swap( aSize.Width(), aSize.Height() );
- bool bIsVertical( rOutliner.IsVertical() == sal_True );
+ bool bIsVertical( rOutliner.IsVertical() );
// #108900# Handle virtual position one-past-the end of the string
if( nIndex >= GetTextLen(nPara) )
@@ -377,7 +377,7 @@ sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nP
::std::swap( aSize.Width(), aSize.Height() );
Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
aSize,
- rOutliner.IsVertical() == sal_True ));
+ rOutliner.IsVertical() ));
EPosition aDocPos = rOutliner.GetEditEngine().FindDocPosition( aEEPos );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 1e34d82..609c960 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -668,7 +668,7 @@ public:
sal_uInt16 GetMode() const { return nOutlinerMode; }
void SetVertical( sal_Bool bVertical );
- sal_Bool IsVertical() const;
+ bool IsVertical() const;
void SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 39b1dab..25e1017 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -75,49 +75,49 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
sal_uInt8 nRightMargin;
- sal_Bool bAutoCorrect : 1;
- sal_Bool bCptlSttSntnc : 1;
- sal_Bool bCptlSttWrd : 1;
- sal_Bool bChkFontAttr : 1;
+ bool bAutoCorrect : 1;
+ bool bCptlSttSntnc : 1;
+ bool bCptlSttWrd : 1;
+ bool bChkFontAttr : 1;
- sal_Bool bChgUserColl : 1;
- sal_Bool bChgEnumNum : 1;
+ bool bChgUserColl : 1;
+ bool bChgEnumNum : 1;
- sal_Bool bAFmtByInput : 1;
- sal_Bool bDelEmptyNode : 1;
- sal_Bool bSetNumRule : 1;
+ bool bAFmtByInput : 1;
+ bool bDelEmptyNode : 1;
+ bool bSetNumRule : 1;
- sal_Bool bChgOrdinalNumber : 1;
- sal_Bool bChgToEnEmDash : 1;
- sal_Bool bAddNonBrkSpace : 1;
- sal_Bool bChgWeightUnderl : 1;
- sal_Bool bSetINetAttr : 1;
+ bool bChgOrdinalNumber : 1;
+ bool bChgToEnEmDash : 1;
+ bool bAddNonBrkSpace : 1;
+ bool bChgWeightUnderl : 1;
+ bool bSetINetAttr : 1;
- sal_Bool bSetBorder : 1;
- sal_Bool bCreateTable : 1;
- sal_Bool bReplaceStyles : 1;
- sal_Bool bDummy : 1;
+ bool bSetBorder : 1;
+ bool bCreateTable : 1;
+ bool bReplaceStyles : 1;
+ bool bDummy : 1;
- sal_Bool bWithRedlining : 1;
+ bool bWithRedlining : 1;
- sal_Bool bRightMargin : 1;
+ bool bRightMargin : 1;
- sal_Bool bAutoCompleteWords : 1;
- sal_Bool bAutoCmpltCollectWords : 1;
- sal_Bool bAutoCmpltEndless : 1;
+ bool bAutoCompleteWords : 1;
+ bool bAutoCmpltCollectWords : 1;
+ bool bAutoCmpltEndless : 1;
// -- under NT here starts a new long
- sal_Bool bAutoCmpltAppendBlanc : 1;
- sal_Bool bAutoCmpltShowAsTip : 1;
+ bool bAutoCmpltAppendBlanc : 1;
+ bool bAutoCmpltShowAsTip : 1;
- sal_Bool bAFmtDelSpacesAtSttEnd : 1;
- sal_Bool bAFmtDelSpacesBetweenLines : 1;
- sal_Bool bAFmtByInpDelSpacesAtSttEnd : 1;
- sal_Bool bAFmtByInpDelSpacesBetweenLines : 1;
+ bool bAFmtDelSpacesAtSttEnd : 1;
+ bool bAFmtDelSpacesBetweenLines : 1;
+ bool bAFmtByInpDelSpacesAtSttEnd : 1;
+ bool bAFmtByInpDelSpacesBetweenLines : 1;
- sal_Bool bAutoCmpltKeepList : 1;
+ bool bAutoCmpltKeepList : 1;
// some dummies for any new options
- sal_Bool bDummy6 : 1,
+ bool bDummy6 : 1,
bDummy7 : 1,
bDummy8 : 1
;
commit 5e3a11df3ecc5399279fa78338ddc7bd31eaec36
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:28:57 2014 +0100
bool improvements
Change-Id: Ic5d82c2361a79a19f6675db30ea06dde91123ac1
diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx
index 8f68020..d62caa0 100644
--- a/include/vcl/cmdevt.hxx
+++ b/include/vcl/cmdevt.hxx
@@ -123,21 +123,21 @@ private:
sal_uLong mnLines;
sal_uInt16 mnMode;
sal_uInt16 mnCode;
- sal_Bool mbHorz;
- sal_Bool mbDeltaIsPixel;
+ bool mbHorz;
+ bool mbDeltaIsPixel;
public:
CommandWheelData();
CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
sal_uLong nScrollLines,
sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier,
- sal_Bool bHorz = sal_False, sal_Bool bDeltaIsPixel = sal_False );
+ bool bHorz = false, bool bDeltaIsPixel = false );
long GetDelta() const { return mnDelta; }
long GetNotchDelta() const { return mnNotchDelta; }
sal_uLong GetScrollLines() const { return mnLines; }
- sal_Bool IsHorz() const { return mbHorz; }
- sal_Bool IsDeltaPixel() const { return mbDeltaIsPixel; }
+ bool IsHorz() const { return mbHorz; }
+ bool IsDeltaPixel() const { return mbDeltaIsPixel; }
sal_uInt16 GetMode() const { return mnMode; }
@@ -145,11 +145,11 @@ public:
{ return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); }
bool IsShift() const
{ return ((mnCode & KEY_SHIFT) != 0); }
- sal_Bool IsMod1() const
+ bool IsMod1() const
{ return ((mnCode & KEY_MOD1) != 0); }
- sal_Bool IsMod2() const
+ bool IsMod2() const
{ return ((mnCode & KEY_MOD2) != 0); }
- sal_Bool IsMod3() const
+ bool IsMod3() const
{ return ((mnCode & KEY_MOD3) != 0); }
};
@@ -160,14 +160,14 @@ inline CommandWheelData::CommandWheelData()
mnLines = 0;
mnMode = 0;
mnCode = 0;
- mbHorz = sal_False;
- mbDeltaIsPixel = sal_False;
+ mbHorz = false;
+ mbDeltaIsPixel = false;
}
inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
sal_uLong nScrollLines,
sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier,
- sal_Bool bHorz, sal_Bool bDeltaIsPixel )
+ bool bHorz, bool bDeltaIsPixel )
{
mnDelta = nWheelDelta;
mnNotchDelta = nWheelNotchDelta;
@@ -221,20 +221,20 @@ public:
CommandModKeyData();
CommandModKeyData( sal_uInt16 nCode );
- bool IsShift() const { return (mnCode & MODKEY_SHIFT) ? true : false; }
- sal_Bool IsMod1() const { return (mnCode & MODKEY_MOD1) ? sal_True : sal_False; }
- sal_Bool IsMod2() const { return (mnCode & MODKEY_MOD2) ? sal_True : sal_False; }
- sal_Bool IsMod3() const { return (mnCode & MODKEY_MOD3) ? sal_True : sal_False; }
+ bool IsShift() const { return (mnCode & MODKEY_SHIFT) != 0; }
+ bool IsMod1() const { return (mnCode & MODKEY_MOD1) != 0; }
+ bool IsMod2() const { return (mnCode & MODKEY_MOD2) != 0; }
+ bool IsMod3() const { return (mnCode & MODKEY_MOD3) != 0; }
- sal_Bool IsLeftShift() const { return (mnCode & MODKEY_LSHIFT) ? sal_True : sal_False; }
- sal_Bool IsLeftMod1() const { return (mnCode & MODKEY_LMOD1) ? sal_True : sal_False; }
- sal_Bool IsLeftMod2() const { return (mnCode & MODKEY_LMOD2) ? sal_True : sal_False; }
- sal_Bool IsLeftMod3() const { return (mnCode & MODKEY_LMOD3) ? sal_True : sal_False; }
+ bool IsLeftShift() const { return (mnCode & MODKEY_LSHIFT) != 0; }
+ bool IsLeftMod1() const { return (mnCode & MODKEY_LMOD1) != 0; }
+ bool IsLeftMod2() const { return (mnCode & MODKEY_LMOD2) != 0; }
+ bool IsLeftMod3() const { return (mnCode & MODKEY_LMOD3) != 0; }
- sal_Bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) ? sal_True : sal_False; }
- sal_Bool IsRightMod1() const { return (mnCode & MODKEY_RMOD1) ? sal_True : sal_False; }
- sal_Bool IsRightMod2() const { return (mnCode & MODKEY_RMOD2) ? sal_True : sal_False; }
- sal_Bool IsRightMod3() const { return (mnCode & MODKEY_RMOD3) ? sal_True : sal_False; }
+ bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) != 0; }
+ bool IsRightMod1() const { return (mnCode & MODKEY_RMOD1) != 0; }
+ bool IsRightMod2() const { return (mnCode & MODKEY_RMOD2) != 0; }
+ bool IsRightMod3() const { return (mnCode & MODKEY_RMOD3) != 0; }
};
inline CommandModKeyData::CommandModKeyData()
@@ -354,16 +354,16 @@ private:
Point maPos;
void* mpData;
sal_uInt16 mnCommand;
- sal_Bool mbMouseEvent;
+ bool mbMouseEvent;
public:
CommandEvent();
CommandEvent( const Point& rMousePos, sal_uInt16 nCmd,
- sal_Bool bMEvt = sal_False, const void* pCmdData = NULL );
+ bool bMEvt = false, const void* pCmdData = NULL );
sal_uInt16 GetCommand() const { return mnCommand; }
const Point& GetMousePosPixel() const { return maPos; }
- sal_Bool IsMouseEvent() const { return mbMouseEvent; }
+ bool IsMouseEvent() const { return mbMouseEvent; }
void* GetData() const { return mpData; }
const CommandExtTextInputData* GetExtTextInputData() const;
@@ -380,11 +380,11 @@ inline CommandEvent::CommandEvent()
{
mpData = NULL;
mnCommand = 0;
- mbMouseEvent = sal_False;
+ mbMouseEvent = false;
}
inline CommandEvent::CommandEvent( const Point& rMousePos,
- sal_uInt16 nCmd, sal_Bool bMEvt, const void* pCmdData ) :
+ sal_uInt16 nCmd, bool bMEvt, const void* pCmdData ) :
maPos( rMousePos )
{
mpData = (void*)pCmdData;
commit 768c74383cbd9f3a423a4ac0e0fb8565f4a5868c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:28:39 2014 +0100
bool improvements
Change-Id: Iab6343064ad002bd11660aeb8c88c54562109cbc
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index b771574..b7fb827 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -178,7 +178,7 @@ public:
void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
void ToggleChildWindow(sal_uInt16);
- sal_Bool HasChildWindow(sal_uInt16);
+ bool HasChildWindow(sal_uInt16);
sal_Bool KnowsChildWindow(sal_uInt16);
void ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True);
SfxChildWindow* GetChildWindow(sal_uInt16);
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9ed3d77..f084f8f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3262,10 +3262,10 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
//--------------------------------------------------------------------
-sal_Bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
+bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
- return pWork ? pWork->HasChildWindow_Impl(nId) : sal_False;
+ return pWork && pWork->HasChildWindow_Impl(nId);
}
//--------------------------------------------------------------------
commit 11bdc1bd913bd3a631ba10a97ba7890917eda898
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:28:14 2014 +0100
bool improvements
Change-Id: Id242594559883654aa8cb78fc15b81f78ed803ee
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index c3e8cac..0ab344d 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -732,7 +732,7 @@ void CanvasBitmapTest::runTest()
BitmapEx aBmp = vcl::unotools::bitmapExFromXBitmap(xTestBmp);
CPPUNIT_ASSERT_MESSAGE( "Palette bitmap is transparent",
- aBmp.IsTransparent() == false);
+ !aBmp.IsTransparent());
CPPUNIT_ASSERT_MESSAGE( "Bitmap does not have size (10,10)",
aBmp.GetSizePixel() == Size(10,10));
CPPUNIT_ASSERT_MESSAGE( "Bitmap does not have bitcount of 8",
commit 89cd19fdcb5b49c0853c32cd47950c11c0714d20
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:28:00 2014 +0100
bool improvements
Change-Id: I65ad52e4dee12a94d48ff0f5858e29df7f8d9721
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 54e40ab..8de8e6b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -146,7 +146,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi
if ( mbSelectionPresent )
{
Reference< drawing::XShapes > xShapes;
- if ( ( maSelection >>= xShapes ) == sal_False ) // XShapes is always a selection
+ if ( !( maSelection >>= xShapes ) ) // XShapes is always a selection
{
// even if nothing is selected in writer the selection is not empty
Reference< container::XIndexAccess > xIndexAccess;
@@ -582,7 +582,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
mpRbJPEGCompression->Check();
mpNfQuality->SetValue( paParent->mnQuality, FUNIT_PERCENT );
- mpQualityFrame->Enable(bUseLosslessCompression == false);
+ mpQualityFrame->Enable(!bUseLosslessCompression);
mpCbReduceImageResolution->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl ) );
const sal_Bool bReduceImageResolution = paParent->mbReduceImageResolution;
commit 1f933ca18cffd03937c6e2172acfde2b5f27264d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:27:39 2014 +0100
bool improvements
Change-Id: If7deafb3b2977b2efad53d6d87d2afa524475d4b
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 67a2181..392ff4b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -487,7 +487,7 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags();
- sal_Bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
+ bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
bModified |= pOpt->bAutoCorrect != bCheck;
pOpt->bAutoCorrect = bCheck;
pAutoCorrect->SetAutoCorrFlag(Autocorrect,
@@ -1826,7 +1826,7 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& )
{
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
- sal_Bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
+ bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
bModified |= pOpt->bAddNonBrkSpace != bCheck;
pOpt->bAddNonBrkSpace = bCheck;
pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,
@@ -2124,7 +2124,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent,
sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
{
- sal_Bool bModified = sal_False, bCheck;
+ bool bModified = false, bCheck;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
sal_uInt16 nVal;
@@ -2180,11 +2180,11 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet& )
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
- aCBActiv.Check( 0 != pOpt->bAutoCompleteWords );
- aCBCollect.Check( 0 != pOpt->bAutoCmpltCollectWords );
+ aCBActiv.Check( pOpt->bAutoCompleteWords );
+ aCBCollect.Check( pOpt->bAutoCmpltCollectWords );
aCBRemoveList.Check( !pOpt->bAutoCmpltKeepList ); //inverted value!
- aCBAppendSpace.Check( 0 != pOpt->bAutoCmpltAppendBlanc );
- aCBAsTip.Check( 0 != pOpt->bAutoCmpltShowAsTip );
+ aCBAppendSpace.Check( pOpt->bAutoCmpltAppendBlanc );
+ aCBAsTip.Check( pOpt->bAutoCmpltShowAsTip );
aNFMinWordlen.SetValue( pOpt->nAutoCmpltWordLen );
aNFMaxEntries.SetValue( pOpt->nAutoCmpltListLen );
commit 5cb459c207191d3bcefecf15a03abe37c49a29ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 11:27:05 2014 +0100
bool improvements
Change-Id: I989302c6774c4dd01dff3f682bd4b681fc9141df
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx
index 95962fd..32a9d92 100644
--- a/connectivity/qa/connectivity/mork/DriverTest.cxx
+++ b/connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -49,7 +49,7 @@ private:
void MorkDriverTest::checkAcceptsURL(Reference< XDriver> xDriver, const char* url, bool expected)
{
- sal_Bool res = xDriver->acceptsURL(OUString::createFromAscii(url));
+ bool res = xDriver->acceptsURL(OUString::createFromAscii(url));
if (res != expected)
{
CPPUNIT_ASSERT_MESSAGE("wrong URL outcome!", true);
More information about the Libreoffice-commits
mailing list