animations/source/animcore/animcore.cxx | 8
avmedia/source/gstreamer/gstplayer.cxx | 2
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 2
bridges/source/jni_uno/jni_base.h | 4
bridges/source/jni_uno/jni_bridge.cxx | 8
bridges/source/jni_uno/jni_data.cxx | 3
chart2/source/view/main/GL3DRenderer.cxx | 2
compilerplugins/clang/implicitboolconversion.cxx | 131
++++++----
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 2
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 6
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 4
connectivity/source/drivers/jdbc/Reader.cxx | 6
cui/source/customize/eventdlg.cxx | 2
desktop/unx/source/start.c | 2
extensions/source/update/check/updatecheckconfig.cxx | 4
io/source/acceptor/acc_socket.cxx | 2
io/source/connector/connector.cxx | 2
javaunohelper/source/bootstrap.cxx | 6
mysqlc/source/mysqlc_resultsetmetadata.cxx | 4
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 2
package/source/xstor/xstorage.cxx | 2
sal/textenc/tcvtutf7.cxx | 76
++---
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 6
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 4
sd/source/ui/view/ViewShellManager.cxx | 2
sfx2/source/dialog/templdlg.cxx | 6
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/menu/mnumgr.cxx | 6
sfx2/source/menu/virtmenu.cxx | 6
sfx2/source/sidebar/AsynchronousCall.cxx | 2
sfx2/source/sidebar/Deck.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 4
stoc/source/javavm/javavm.cxx | 8
svtools/source/svrtf/rtfkeywd.cxx | 4
svx/source/form/formfeaturedispatcher.cxx | 2
sw/source/ui/table/tautofmt.cxx | 2
sw/source/uibase/docvw/SidebarWin.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
test/source/sheet/xdatabaserange.cxx | 4
testtools/source/bridgetest/constructors.cxx | 4
writerfilter/source/dmapper/PropertyMapHelper.cxx | 2
xmloff/source/forms/elementexport.cxx | 2
xmloff/source/transform/OOo2Oasis.cxx | 16 -
46 files changed, 206 insertions(+), 168 deletions(-)
New commits:
commit 9be45dd750ede909ba3a181662c1bfa18e662a75
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:48:38 2015 +0200
lopluign:implicitboolconversion: warn about conversion from sal_Bool etc.,
too
Change-Id: I5bc23a2b599742c579ad82c1b1f68df130ac426b
diff --git a/compilerplugins/clang/implicitboolconversion.cxx
b/compilerplugins/clang/implicitboolconversion.cxx
index dec8e23..0d933bf 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -71,6 +71,14 @@ SubstTemplateTypeParmType const *
getAsSubstTemplateTypeParmType(QualType type)
}
}
+bool areSameTypedef(QualType type1, QualType type2) {
+ // type1.getTypePtr() == typ2.getTypePtr() fails for e.g. ::sal_Bool vs.
+ // sal_Bool:
+ auto t1 = type1->getAs<TypedefType>();
+ auto t2 = type2->getAs<TypedefType>();
+ return t1 != nullptr && t2 != nullptr && t1->getDecl() == t2->getDecl();
+}
+
bool isBool(QualType type, bool allowTypedefs = true) {
if (type->isBooleanType()) {
return true;
@@ -93,6 +101,11 @@ bool isBool(Expr const * expr, bool allowTypedefs = true) {
return isBool(expr->getType(), allowTypedefs);
}
+bool isMatchingBool(Expr const * expr, Expr const * comparisonExpr) {
+ return isBool(expr, false)
+ || areSameTypedef(expr->getType(), comparisonExpr->getType());
+}
+
bool isBoolExpr(Expr const * expr) {
if (isBool(expr)) {
return true;
@@ -310,18 +323,21 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr *
expr) {
} else {
std::ptrdiff_t n = j - expr->arg_begin();
assert(n >= 0);
- if (ext) {
+ if (t != nullptr
+ && static_cast<std::size_t>(n) >= compat::getNumParams(*t))
+ {
+ assert(t->isVariadic());
+ // ignore bool to int promotions of variadic arguments
+ } else if (ext) {
if (t != nullptr) {
assert(
- static_cast<std::size_t>(n) < compat::getNumParams(*t)
- || t->isVariadic());
- if (static_cast<std::size_t>(n) < compat::getNumParams(*t)
- && !(compat::getParamType(*t,
n)->isSpecificBuiltinType(
- BuiltinType::Int)
- || (compat::getParamType(*t, n)
- ->isSpecificBuiltinType(BuiltinType::UInt))
- || (compat::getParamType(*t, n)
- ->isSpecificBuiltinType(BuiltinType::Long))))
+ static_cast<std::size_t>(n) <
compat::getNumParams(*t));
+ if (!(compat::getParamType(*t, n)->isSpecificBuiltinType(
+ BuiltinType::Int)
+ || compat::getParamType(*t,
n)->isSpecificBuiltinType(
+ BuiltinType::UInt)
+ || compat::getParamType(*t,
n)->isSpecificBuiltinType(
+ BuiltinType::Long)))
{
reportWarning(i);
}
@@ -389,6 +405,12 @@ bool
ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr)
//
std::ptrdiff_t n = j - expr->arg_begin();
assert(n >= 0);
+ CXXMethodDecl const * d = expr->getMethodDecl();
+ if (static_cast<std::size_t>(n) >= d->getNumParams()) {
+ // Ignore bool to int promotions of variadic arguments:
+ assert(d->isVariadic());
+ continue;
+ }
QualType ty
= ignoreParenImpCastAndComma(expr->getImplicitObjectArgument())
->getType();
@@ -397,10 +419,7 @@ bool
ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr)
}
TemplateSpecializationType const * ct
= ty->getAs<TemplateSpecializationType>();
- CXXMethodDecl const * d = expr->getMethodDecl();
- if (ct != nullptr
- && static_cast<std::size_t>(n) < d->getNumParams())
- {
+ if (ct != nullptr) {
SubstTemplateTypeParmType const * pt
= getAsSubstTemplateTypeParmType(
d->getParamDecl(n)->getType().getNonReferenceType());
@@ -498,7 +517,9 @@ bool ImplicitBoolConversion::TraverseConditionalOperator(
|| (i == expr->getFalseExpr()->IgnoreParens()
&& (isBoolExpr(expr->getTrueExpr()->IgnoreParenImpCasts())
|| isExternCFunctionCallReturningInt(
- expr->getTrueExpr())))))
+ expr->getTrueExpr())))
+ || (!compiler.getLangOpts().CPlusPlus
+ && i == expr->getCond()->IgnoreParens())))
{
reportWarning(i);
}
@@ -513,9 +534,12 @@ bool ImplicitBoolConversion::TraverseBinLT(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -530,9 +554,12 @@ bool ImplicitBoolConversion::TraverseBinLE(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -547,9 +574,12 @@ bool ImplicitBoolConversion::TraverseBinGT(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -564,9 +594,12 @@ bool ImplicitBoolConversion::TraverseBinGE(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -581,9 +614,12 @@ bool ImplicitBoolConversion::TraverseBinEQ(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -598,9 +634,12 @@ bool ImplicitBoolConversion::TraverseBinNE(BinaryOperator
* expr) {
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
- && isBool(expr->getRHS()->IgnoreParenImpCasts(), false))
+ && isMatchingBool(
+ expr->getRHS()->IgnoreImpCasts(), i->getSubExprAsWritten()))
|| (i == expr->getRHS()->IgnoreParens()
- && isBool(expr->getLHS()->IgnoreParenImpCasts(), false))))
+ && isMatchingBool(
+ expr->getLHS()->IgnoreImpCasts(),
+ i->getSubExprAsWritten()))))
{
reportWarning(i);
}
@@ -773,13 +812,15 @@ bool ImplicitBoolConversion::VisitImplicitCastExpr(
if (ignoreLocation(expr)) {
return true;
}
- if (expr->getSubExprAsWritten()->getType()->isBooleanType()
- && !isBool(expr))
- {
- if (nested.empty()) {
- reportWarning(expr);
- } else {
- nested.top().push_back(expr);
+ if (isBool(expr->getSubExprAsWritten()) && !isBool(expr)) {
+ // Ignore NoOp from 'sal_Bool' (aka 'unsigned char') to 'const unsigned
+ // char' in makeAny(b) with b of type sal_Bool:
+ if (expr->getCastKind() != CK_NoOp) {
+ if (nested.empty()) {
+ reportWarning(expr);
+ } else {
+ nested.top().push_back(expr);
+ }
}
return true;
}
@@ -828,11 +869,7 @@ bool ImplicitBoolConversion::isExternCFunctionCall(
Decl const * d = expr->getCalleeDecl();
if (d != nullptr) {
FunctionDecl const * fd = dyn_cast<FunctionDecl>(d);
- if (fd != nullptr
- && (fd->isExternC()
- || compiler.getSourceManager().isInExternCSystemHeader(
- fd->getLocation())))
- {
+ if (fd != nullptr) {
PointerType const * pt = fd->getType()->getAs<PointerType>();
QualType t2(pt == nullptr ? fd->getType() : pt->getPointeeType());
*functionType = t2->getAs<FunctionProtoType>();
@@ -841,16 +878,17 @@ bool ImplicitBoolConversion::isExternCFunctionCall(
|| (fd->getBuiltinID() != Builtin::NotBuiltin
&& isa<FunctionNoProtoType>(t2)));
// __builtin_*s have no proto type?
- return true;
+ return fd->isExternC()
+ || compiler.getSourceManager().isInExternCSystemHeader(
+ fd->getLocation());
}
VarDecl const * vd = dyn_cast<VarDecl>(d);
- if (vd != nullptr && vd->isExternC())
- {
+ if (vd != nullptr) {
PointerType const * pt = vd->getType()->getAs<PointerType>();
*functionType
= ((pt == nullptr ? vd->getType() : pt->getPointeeType())
- ->castAs<FunctionProtoType>());
- return true;
+ ->getAs<FunctionProtoType>());
+ return vd->isExternC();
}
}
return false;
@@ -915,8 +953,9 @@ void ImplicitBoolConversion::checkCXXConstructExpr(
void ImplicitBoolConversion::reportWarning(ImplicitCastExpr const * expr) {
report(
DiagnosticsEngine::Warning,
- "implicit conversion (%0) from bool to %1", expr->getLocStart())
- << expr->getCastKindName() << expr->getType() <<
expr->getSourceRange();
+ "implicit conversion (%0) from %1 to %2", expr->getLocStart())
+ << expr->getCastKindName() << expr->getSubExprAsWritten()->getType()
+ << expr->getType() << expr->getSourceRange();
}
loplugin::Plugin::Registration<ImplicitBoolConversion> X(
commit 338358b0ca75b4965c7b3e70afd9c88cd9c9d222
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:47:44 2015 +0200
XMLTransformerActionInit parameters are generically of type sal_uInt32
Change-Id: Ic36339fbb78a6ac3233f3d75a1309cf1b0642fe0
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index 954a0db..bce1ef7 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -580,7 +580,7 @@ namespace xmloff
PROPERTY_READONLY, PROPERTY_DEFAULT_STATE,
PROPERTY_TABSTOP, PROPERTY_ENABLEVISIBLE
};
- static const sal_Bool nBooleanPropertyAttrFlags[] =
+ static const sal_Int8 nBooleanPropertyAttrFlags[] =
{ // attribute defaults
BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE |
BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE,
BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID,
BOOLATTR_DEFAULT_FALSE
};
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index 79fb4fe..07382bc 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -585,7 +585,7 @@ static XMLTransformerActionInit aStyleActionTable[] =
ENTRY0( SVG, HEIGHT, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
ENTRY0( DRAW, START, XML_ATACTION_NEG_PERCENT ),
ENTRY0( DRAW, END, XML_ATACTION_NEG_PERCENT ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
@@ -695,7 +695,7 @@ static XMLTransformerActionInit aStyleRefActionTable[] =
ENTRY0( DRAW, MASTER_PAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
ENTRY0( PRESENTATION, PRESENTATION_PAGE_LAYOUT_NAME,
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX,
XML_NAMESPACE_OOOW ),
ENTRY1( TEXT, FORMULA, XML_ATACTION_ADD_NAMESPACE_PREFIX,
@@ -738,7 +738,7 @@ static XMLTransformerActionInit aShapeActionTable[] =
ENTRY0( DR3D, FOCAL_LENGTH, XML_ATACTION_INCH2IN ),
ENTRY1Q( FORM, ID, XML_ATACTION_RENAME,
XML_NAMESPACE_DRAW, XML_CONTROL ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
// BM: needed by chart:legend. The legend needs also the draw actions. As
// there is no merge mechanism, all actions have to be in the same table
@@ -770,7 +770,7 @@ static XMLTransformerActionInit aConnectorActionTable[] =
ENTRY0( PRESENTATION, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
ENTRY1Q( FORM, ID, XML_ATACTION_RENAME,
XML_NAMESPACE_DRAW, XML_CONTROL ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
@@ -906,7 +906,7 @@ static XMLTransformerActionInit
aBackgroundImageActionTable[] =
{
ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT,
XML_NAMESPACE_DRAW, XML_OPACITY ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
@@ -917,7 +917,7 @@ static XMLTransformerActionInit
aBackgroundImageActionTable[] =
static XMLTransformerActionInit aWriterBackgroundImageActionTable[] =
{
ENTRY1Q( DRAW, TRANSPARENCY,
XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY
),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
@@ -936,7 +936,7 @@ static XMLTransformerActionInit aFormControlActionTable[] =
XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX,
XML_NAMESPACE_FORM, XML_CONTROL_IMPLEMENTATION,
XML_NAMESPACE_OOO ),
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
@@ -964,7 +964,7 @@ static XMLTransformerActionInit aFormPropActionTable[] =
// OOO_XLINK_ACTIONS
static XMLTransformerActionInit aXLinkActionTable[] =
{
- ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ),
+ ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
commit 97c77805d2becdc79c3cd0d62c9d023c2cf36d60
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:47:08 2015 +0200
Booleans are logged via sal_uInt32 here
Change-Id: I4c684903952fbfdaad52cabc135625a89b55c75a
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx
b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index a735a1d..2bc504e 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -44,7 +44,7 @@ void lcl_DumpTableColumnSeparators(const
TagLogger::Pointer_t& pLogger, const un
pLogger->startElement("separator");
pLogger->attribute("position", aSeq[n].Position);
- pLogger->attribute("visible", aSeq[n].IsVisible);
+ pLogger->attribute("visible", sal_uInt32(aSeq[n].IsVisible));
pLogger->endElement();
}
commit aeaa099b67f52085310e7e88aa8741473352bbbe
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:46:34 2015 +0200
Use bool instead of int
Change-Id: I1a2d59b9a93223ad884f7a495281ec33163528ca
diff --git a/svtools/source/svrtf/rtfkeywd.cxx
b/svtools/source/svrtf/rtfkeywd.cxx
index 71af7e8..b64a25f 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -36,7 +36,7 @@ struct RTF_TokenEntry
};
// Flag: RTF-token table has been sorted
-static int bSortKeyWords = sal_False;
+static bool bSortKeyWords = false;
static RTF_TokenEntry aRTFTokenTab[] = {
{{OOO_STRING_SVTOOLS_RTF_IGNORE}, RTF_IGNOREFLAG},
@@ -1213,7 +1213,7 @@ int GetRTFToken( const OUString& rSearch )
sizeof( aRTFTokenTab ) / sizeof( RTF_TokenEntry ),
sizeof( RTF_TokenEntry ),
RTFKeyCompare );
- bSortKeyWords = sal_True;
+ bSortKeyWords = true;
}
int nRet = 0;
commit 3aaadf95f70891845df3172a041b4c55196f083a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:46:20 2015 +0200
Use bool instead of int
Change-Id: Ib5920745f9f464493b7b134f871e090726d17d0c
diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx
index 2a4f995..8d4ae60 100644
--- a/sal/textenc/tcvtutf7.cxx
+++ b/sal/textenc/tcvtutf7.cxx
@@ -93,9 +93,9 @@ static unsigned char const aImplMustShiftTab[128] =
struct ImplUTF7ToUCContextData
{
- int mbShifted;
- int mbFirst;
- int mbWroteOne;
+ bool mbShifted;
+ bool mbFirst;
+ bool mbWroteOne;
sal_uInt32 mnBitBuffer;
sal_uInt32 mnBufferBits;
};
@@ -105,9 +105,9 @@ struct ImplUTF7ToUCContextData
void* ImplUTF7CreateUTF7TextToUnicodeContext()
{
ImplUTF7ToUCContextData* pContextData = new ImplUTF7ToUCContextData;
- pContextData->mbShifted = sal_False;
- pContextData->mbFirst = sal_False;
- pContextData->mbWroteOne = sal_False;
+ pContextData->mbShifted = false;
+ pContextData->mbFirst = false;
+ pContextData->mbWroteOne = false;
pContextData->mnBitBuffer = 0;
pContextData->mnBufferBits = 0;
return pContextData;
@@ -125,9 +125,9 @@ void ImplUTF7DestroyTextToUnicodeContext( void* pContext )
void ImplUTF7ResetTextToUnicodeContext( void* pContext )
{
ImplUTF7ToUCContextData* pContextData =
static_cast<ImplUTF7ToUCContextData*>(pContext);
- pContextData->mbShifted = sal_False;
- pContextData->mbFirst = sal_False;
- pContextData->mbWroteOne = sal_False;
+ pContextData->mbShifted = false;
+ pContextData->mbFirst = false;
+ pContextData->mbWroteOne = false;
pContextData->mnBitBuffer = 0;
pContextData->mnBufferBits = 0;
}
@@ -143,11 +143,11 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
ImplUTF7ToUCContextData* pContextData =
static_cast<ImplUTF7ToUCContextData*>(pContext);
unsigned char c ='\0';
unsigned char nBase64Value = 0;
- int bEnd = sal_False;
- int bShifted;
- int bFirst;
- int bWroteOne;
- int bBase64End;
+ bool bEnd = false;
+ bool bShifted;
+ bool bFirst;
+ bool bWroteOne;
+ bool bBase64End;
sal_uInt32 nBitBuffer;
sal_uInt32 nBitBufferTemp;
sal_uInt32 nBufferBits;
@@ -166,9 +166,9 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
else
*/
{
- bShifted = sal_False;
- bFirst = sal_False;
- bWroteOne = sal_False;
+ bShifted = false;
+ bFirst = false;
+ bWroteOne = false;
nBitBuffer = 0;
nBufferBits = 0;
}
@@ -183,25 +183,25 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
c = (unsigned char)*pSrcBuf;
/* End, when not a base64 character */
- bBase64End = sal_False;
+ bBase64End = false;
if ( c <= 0x7F )
{
nBase64Value = aImplBase64IndexTab[c];
if ( nBase64Value == 0xFF )
- bBase64End = sal_True;
+ bBase64End = true;
}
}
else
{
- bEnd = sal_True;
- bBase64End = sal_True;
+ bEnd = true;
+ bBase64End = true;
}
if ( bShifted )
{
if ( bBase64End )
{
- bShifted = sal_False;
+ bShifted = false;
/* If the character causing us to drop out was SHIFT_IN */
/* or SHIFT_OUT, it may be a special escape for SHIFT_IN. */
@@ -229,7 +229,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
}
*pDestBuf = IMPL_SHIFT_IN_CHAR;
pDestBuf++;
- bWroteOne = sal_True;
+ bWroteOne = true;
}
/* Skip character */
@@ -237,7 +237,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
if ( pSrcBuf < pEndSrcBuf )
c = (unsigned char)*pSrcBuf;
else
- bEnd = sal_True;
+ bEnd = true;
}
}
@@ -267,7 +267,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
/* Add 6 Bits from character to the bit buffer */
nBufferBits += 6;
nBitBuffer |= ((sal_uInt32)(nBase64Value & 0x3F)) <<
(32-nBufferBits);
- bFirst = sal_False;
+ bFirst = false;
}
/* Extract as many full 16 bit characters as possible from the */
@@ -279,7 +279,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
pDestBuf++;
nBitBuffer <<= 16;
nBufferBits -= 16;
- bWroteOne = sal_True;
+ bWroteOne = true;
}
if ( nBufferBits >= 16 )
@@ -331,9 +331,9 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
{
if ( c == IMPL_SHIFT_IN_CHAR )
{
- bShifted = sal_True;
- bFirst = sal_True;
- bWroteOne = sal_False;
+ bShifted = true;
+ bFirst = true;
+ bWroteOne = false;
}
else
{
@@ -392,7 +392,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const
void*, void* pContext,
struct ImplUTF7FromUCContextData
{
- int mbShifted;
+ bool mbShifted;
sal_uInt32 mnBitBuffer;
sal_uInt32 mnBufferBits;
};
@@ -402,7 +402,7 @@ struct ImplUTF7FromUCContextData
void* ImplUTF7CreateUnicodeToTextContext()
{
ImplUTF7FromUCContextData* pContextData = new ImplUTF7FromUCContextData;
- pContextData->mbShifted = sal_False;
+ pContextData->mbShifted = false;
pContextData->mnBitBuffer = 0;
pContextData->mnBufferBits = 0;
return pContextData;
@@ -420,7 +420,7 @@ void ImplUTF7DestroyUnicodeToTextContext( void* pContext )
void ImplUTF7ResetUnicodeToTextContext( void* pContext )
{
ImplUTF7FromUCContextData* pContextData =
static_cast<ImplUTF7FromUCContextData*>(pContext);
- pContextData->mbShifted = sal_False;
+ pContextData->mbShifted = false;
pContextData->mnBitBuffer = 0;
pContextData->mnBufferBits = 0;
}
@@ -435,8 +435,8 @@ sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const
void*, void* pContext,
{
ImplUTF7FromUCContextData* pContextData =
static_cast<ImplUTF7FromUCContextData*>(pContext);
sal_Unicode c = '\0';
- int bEnd = sal_False;
- int bShifted;
+ bool bEnd = false;
+ bool bShifted;
bool bNeedShift;
sal_uInt32 nBitBuffer;
sal_uInt32 nBitBufferTemp;
@@ -454,7 +454,7 @@ sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const
void*, void* pContext,
else
*/
{
- bShifted = sal_False;
+ bShifted = false;
nBitBuffer = 0;
nBufferBits = 0;
}
@@ -490,12 +490,12 @@ sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const
void*, void* pContext,
pDestBuf++;
}
else
- bShifted = sal_True;
+ bShifted = true;
}
}
else
{
- bEnd = sal_True;
+ bEnd = true;
bNeedShift = false;
}
@@ -537,7 +537,7 @@ sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const
void*, void* pContext,
}
*pDestBuf = IMPL_SHIFT_OUT_CHAR;
pDestBuf++;
- bShifted = sal_False;
+ bShifted = false;
}
}
commit c215ca9197364df1211c72ff310d6332ff5833d3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:45:56 2015 +0200
css.sdbc.XResultSetMetaData.isNullable return type is long (oddly enough)
Change-Id: I6ca98540a623f921f8d05e71dc67b64948467f52
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx
b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 26f76af..2f6b83f 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -291,13 +291,13 @@ sal_Int32 SAL_CALL
OResultSetMetaData::isNullable(sal_Int32 column)
checkColumnIndex(column);
try {
- return meta->isNullable(column)? sal_True:sal_False;
+ return sal_Int32(bool(meta->isNullable(column)));
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData",
*this);
} catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
}
- return sal_False; // fool compiler
+ return sal_Int32(false); // fool compiler
}
sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
commit 2302e27d80d8900d23452ae50a41276f43dfbc6c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:43:23 2015 +0200
Clean up passing Boolean value to osl::Socket::setOption
Change-Id: I6757f2bc7e8b4ff9d7b3ebda88da35a5d7b93655
diff --git a/io/source/acceptor/acc_socket.cxx
b/io/source/acceptor/acc_socket.cxx
index bf65691..a7eaceb 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -386,7 +386,7 @@ namespace io_acceptor {
if( m_bTcpNoDelay || remoteHostname == "localhost" ||
remoteHostname.startsWith("127.0.0.") )
{
- sal_Int32 nTcpNoDelay = sal_True;
+ sal_Int32 nTcpNoDelay = sal_Int32(true);
pConn->m_socket.setOption( osl_Socket_OptionTcpNoDelay ,
&nTcpNoDelay,
sizeof( nTcpNoDelay ) ,
osl_Socket_LevelTcp );
}
diff --git a/io/source/connector/connector.cxx
b/io/source/connector/connector.cxx
index 9b9477f..7d5d3c3 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -136,7 +136,7 @@ namespace stoc_connector
// it can make a significant speed difference on linux boxes.
if( bTcpNoDelay || aHost == "localhost" ||
aHost.startsWith("127.0.0.") )
{
- sal_Int32 nTcpNoDelay = sal_True;
+ sal_Int32 nTcpNoDelay = sal_Int32(true);
pConn->m_socket.setOption( osl_Socket_OptionTcpNoDelay ,
&nTcpNoDelay,
sizeof( nTcpNoDelay ) ,
osl_Socket_LevelTcp );
}
commit f9290d301144744df879cea907584656b7f74ad1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:42:13 2015 +0200
Clean up checks of sal_Bool values
Change-Id: Ia05565077823d6efaeaeb35d3d80b51dd9a10d4c
diff --git a/extensions/source/update/check/updatecheckconfig.cxx
b/extensions/source/update/check/updatecheckconfig.cxx
index a1c5c97..dfc62d8 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 8c30ed8..d1e5a5a 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 8553457..3eb4d97 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
commit 1d3357ccf7a464003e9aa56cdc9dd86d2ffa17b6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:39:35 2015 +0200
read_percent returns ProgressStatus, not sal_Bool
Change-Id: I6e1c1f88b28db2728b2f29ea47c3e86ef8983697
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 3732737..ce856ec 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -541,7 +541,7 @@ read_percent( ChildInfo *info, int *pPercent )
/* from the last call */
int nNotProcessed = nRead - ( pNext - pBuffer );
if ( nNotProcessed >= BUFFER_LEN )
- return sal_False;
+ return ProgressContinue;
memmove( pBuffer, pNext, nNotProcessed );
commit c24212ec89a45c531e7f1ae6d45ccc34d26b8e98
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:36:09 2015 +0200
Silence sal_Bool -> sal_IntPtr Link return value mismatches for now
Some uses of untyped Link<> (returning sal_IntPtr) are hard to update to
typed
versions, but upcoming changes to loplugin:implicitboolconversion would flag
these uses of sal_False/True, so just explicitly cast them to sal_IntPtr for
now.
Change-Id: I654e555e85faba0b30178c978e7d50fc7240b004
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index 20e00de..970bd05 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -210,7 +210,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *,
pBox )
}
mpImpl->pEventLB->SetUpdateMode( true );
- return sal_True;
+ return sal_IntPtr(true);
}
bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sd/source/ui/annotations/annotationtag.cxx
b/sd/source/ui/annotations/annotationtag.cxx
index 8b9fef4..440c7bf 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -665,7 +665,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler,
VclWindowEvent*, pEvent)
}
}
}
- return sal_True;
+ return sal_IntPtr(true);
}
IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 3acd0bf..31abab12 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -749,14 +749,14 @@ IMPL_LINK(LayoutMenu, WindowEventHandler,
VclWindowEvent*, pEvent)
case VCLEVENT_WINDOW_SHOW:
case VCLEVENT_WINDOW_RESIZE:
SetSizePixel(GetParent()->GetSizePixel());
- return sal_True;
+ return sal_IntPtr(true);
default:
- return sal_False;
+ return sal_IntPtr(false);
}
}
- return sal_False;
+ return sal_IntPtr(false);
}
void LayoutMenu::DataChanged (const DataChangedEvent& rEvent)
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index d17c08a..81fe35a 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -604,7 +604,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler,
VclWindowEvent*, pEvent)
}
}
- return sal_True;
+ return sal_IntPtr(true);
}
void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 8c85255..6f2ac79 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -265,7 +265,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler,
ScrollBar*, pScrollBar)
mrSlideSorter.GetContentWindow()->SetVisibleXY(-1, nRelativePosition);
mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking();
}
- return sal_True;
+ return sal_IntPtr(true);
}
IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar)
@@ -281,7 +281,7 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler,
ScrollBar*, pScrollBar)
mrSlideSorter.GetContentWindow()->SetVisibleXY(nRelativePosition, -1);
mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking();
}
- return sal_True;
+ return sal_IntPtr(true);
}
void ScrollBarManager::SetWindowOrigin (
diff --git a/sd/source/ui/view/ViewShellManager.cxx
b/sd/source/ui/view/ViewShellManager.cxx
index d5ebaf6c..ff3596f 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1029,7 +1029,7 @@ IMPL_LINK(ViewShellManager::Implementation,
WindowEventHandler, VclWindowEvent*,
break;
}
}
- return sal_True;
+ return sal_IntPtr(true);
}
ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9c82774..c75b6fa 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2136,7 +2136,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl,
Menu *, pMenu )
nLastItemId = pMenu->GetCurItemId();
Application::PostUserEvent(
LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 );
- return sal_True;
+ return sal_IntPtr(true);
}
switch(nLastItemId) {
@@ -2145,9 +2145,9 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl,
Menu *, pMenu )
case ID_DELETE: DeleteHdl(0); break;
case ID_HIDE: HideHdl(0); break;
case ID_SHOW: ShowHdl(0); break;
- default: return sal_False;
+ default: return sal_IntPtr(false);
}
- return sal_True;
+ return sal_IntPtr(true);
}
SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 0866ef8..7c56da1 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -454,7 +454,7 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid )
Application::PostUserEvent( LINK( 0, SfxAppMenuControl_Impl,
ExecuteHdl_Impl), pExecuteInfo );
}
- return sal_True;
+ return sal_IntPtr(true);
}
IMPL_STATIC_LINK_NOINSTANCE( SfxAppMenuControl_Impl, ExecuteHdl_Impl,
ExecuteInfo*, pExecuteInfo )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index cbe6f09..3cf67fe 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -222,11 +222,11 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
if (!aCommand.isEmpty() && pBindings)
{
pBindings->ExecuteCommand_Impl( aCommand );
- return sal_True;
+ return sal_IntPtr(true);
}
if (!pBindings)
- return sal_True;
+ return sal_IntPtr(true);
if ( pBindings->IsBound(nId) )
// normal function
@@ -235,7 +235,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
// special menu function
pBindings->GetDispatcher_Impl()->Execute( nId );
- return sal_True;
+ return sal_IntPtr(true);
}
SfxPopupMenuManager::~SfxPopupMenuManager()
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 36ff55a..93e729e 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -961,12 +961,12 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
nTaskId++;
}
- return sal_True;
+ return sal_IntPtr(true);
}
else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <=
END_ITEMID_PICKLIST )
{
SfxPickList::ExecuteMenuEntry( nSlotId );
- return sal_True;
+ return sal_IntPtr(true);
}
OUString sCommand = pMenu->GetItemCommand(nSlotId);
@@ -975,7 +975,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
else
pBindings->Execute(nSlotId);
- return sal_True;
+ return sal_IntPtr(true);
}
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx
b/sfx2/source/sidebar/AsynchronousCall.cxx
index b95dc24..2806804 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -62,7 +62,7 @@ IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG )
if (maAction)
maAction();
- return sal_True;
+ return sal_IntPtr(true);
}
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0753cde..633def0 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -314,7 +314,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*,
EMPTYARG)
Point(
mpScrollContainer->GetPosPixel().X(),
nYOffset));
- return sal_True;
+ return sal_IntPtr(true);
}
//----- Deck::ScrollContainerWindow -------------------------------------------
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index e34f44c..690d6f9 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -749,7 +749,7 @@ Reference<ui::XUIElement>
SidebarController::CreateUIElement (
IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent)
{
if (pEvent==NULL)
- return sal_False;
+ return sal_IntPtr(false);
if (pEvent->GetWindow() == mpParentWindow)
{
@@ -804,7 +804,7 @@ IMPL_LINK(SidebarController, WindowEventHandler,
VclWindowEvent*, pEvent)
}
}
- return sal_True;
+ return sal_IntPtr(true);
}
void SidebarController::ShowPopupMenu (
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 9e1500a..c1e10cf 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
if( bSetAutoFmt )
pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] );
EndDialog( RET_OK );
- return sal_True;
+ return sal_IntPtr(true);
}
AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx
b/sw/source/uibase/docvw/SidebarWin.cxx
index db20ee7..27a5229 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -1162,7 +1162,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener,
VclSimpleEvent*, pEvent )
mrMgr.MakeVisible( this );
}
}
- return sal_True;
+ return sal_IntPtr(true);
}
void SwSidebarWin::Delete()
diff --git a/sw/source/uibase/utlui/glbltree.cxx
b/sw/source/uibase/utlui/glbltree.cxx
index 012a6fd..03d9f16 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -774,7 +774,7 @@ void SwGlobalTree::EditContent(const SwGlblDocContent*
pCont )
IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
{
ExcecuteContextMenuAction( pMenu->GetCurItemId());
- return sal_True;
+ return sal_IntPtr(true);
}
void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16
nSelectedPopupEntry )
commit c5e08b42ace5f4481c3db87b4fb6ae2dbf9d9a51
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:26:35 2015 +0200
I very much assume this wants to call java.io.Reader.ready
...seeing that there is no java.io.Reader.available. (And then, there's no
good
way to map from java.io.Reader.ready's boolean value to
css.io.XInputStream.available's long value, so conservatively map true to
1.)
But I have no idea how to trigger this code.
Change-Id: I18d12e0d968141410a1b56e700ed544edceda97c
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx
b/connectivity/source/drivers/jdbc/Reader.cxx
index a7cd369..20db510 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -57,19 +57,19 @@ void SAL_CALL java_io_Reader::skipBytes( sal_Int32
nBytesToSkip ) throw(::com::s
sal_Int32 SAL_CALL java_io_Reader::available( )
throw(::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception)
{
- jboolean out(sal_False);
+ jboolean out;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
static const char * cSignature = "()Z";
- static const char * cMethodName = "available";
+ static const char * cMethodName = "ready";
// Java-Call
static jmethodID mID(NULL);
obtainMethodId_throwRuntime(t.pEnv, cMethodName,cSignature, mID);
out = t.pEnv->CallBooleanMethod( object, mID);
ThrowRuntimeException(t.pEnv,*this);
} //t.pEnv
- return out;
+ return out ? 1 : 0; // no way to tell *how much* is ready
}
void SAL_CALL java_io_Reader::closeInput( )
throw(::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception)
commit fa54d73a59a87902a0054d12fa684197b1939b19
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:24:31 2015 +0200
Fix Boolean value operations
(css.sdbc.ColumnValue.NULLABLE happens to be 1, so the odd comparison is
harmless and redundant.)
Change-Id: I6b64cc083e72198c71e4e38ec4347f79af924621
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 1c8a26a..11042c6 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -729,7 +729,7 @@ void Connection::buildTypeInfo() throw( SQLException)
aInfo.aLiteralPrefix = xRow->getString (4);
aInfo.aLiteralSuffix = xRow->getString (5);
aInfo.aCreateParams = xRow->getString (6);
- aInfo.bNullable = xRow->getBoolean (7) ==
ColumnValue::NULLABLE;
+ aInfo.bNullable = xRow->getBoolean (7);
aInfo.bCaseSensitive = xRow->getBoolean (8);
aInfo.nSearchType = xRow->getShort (9);
aInfo.bUnsigned = xRow->getBoolean (10);
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 0530fed..aa6c94e 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -352,7 +352,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
aInfo.aLiteralPrefix = xRow->getString (4);
aInfo.aLiteralSuffix = xRow->getString (5);
aInfo.aCreateParams = xRow->getString (6);
- aInfo.bNullable = xRow->getBoolean (7) ==
ColumnValue::NULLABLE;
+ aInfo.bNullable = xRow->getBoolean (7);
aInfo.bCaseSensitive = xRow->getBoolean (8);
aInfo.nSearchType = xRow->getShort (9);
aInfo.bUnsigned = xRow->getBoolean (10);
commit bdf75a9f6b429914ebfa3942051db61504a3b30c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:22:49 2015 +0200
GLEW_EXT_texture_array is of type GLboolean already
Change-Id: I8348a5e5c13a6628ad543652e50bac0432b2b7be
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 044e4df..1b7f67a 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -250,7 +250,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, "barColor");
#if !defined MACOSX
//check whether the texture array is support
- mbTexBatchSupport = GLEW_EXT_texture_array == 1;
+ mbTexBatchSupport = GLEW_EXT_texture_array;
#endif
CHECK_GL_ERROR();
if (mbTexBatchSupport)
commit 79a359fea1885151a77f83e05eee8d2aa97895ab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:22:10 2015 +0200
jboolean-related clean-up
Change-Id: Iecd03d0343b9b7c3a8b23b5a1e9654148b94d44c
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index 275e648..771839f 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -87,7 +87,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindo
/* Get the AWT */
awt.version = JAWT_VERSION_1_3;
result = JAWT_GetAWT(env, &awt);
- if (result == JNI_FALSE)
+ if (!result)
ThrowException(env, "java/lang/RuntimeException", "JAWT_GetAWT
failed");
/* Get the drawing surface */
diff --git a/bridges/source/jni_uno/jni_base.h
b/bridges/source/jni_uno/jni_base.h
index 2b856aa..af93d6a 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -96,7 +96,7 @@ public:
inline void JNI_context::ensure_no_exception() const
{
- if (JNI_FALSE != m_env->ExceptionCheck())
+ if (m_env->ExceptionCheck())
{
java_exc_occurred();
}
@@ -104,7 +104,7 @@ inline void JNI_context::ensure_no_exception() const
inline bool JNI_context::assert_no_exception() const
{
- if (JNI_FALSE != m_env->ExceptionCheck())
+ if (m_env->ExceptionCheck())
{
SAL_WARN("bridges", "unexpected java exception occurred");
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/jni_uno/jni_bridge.cxx
b/bridges/source/jni_uno/jni_bridge.cxx
index 982f417..7eb2dc0 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -288,7 +288,7 @@ void JNI_context::java_exc_occurred() const
// call toString(); don't rely on m_jni_info
jclass jo_class = m_env->FindClass( "java/lang/Object" );
- if (JNI_FALSE != m_env->ExceptionCheck())
+ if (m_env->ExceptionCheck())
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
@@ -298,7 +298,7 @@ void JNI_context::java_exc_occurred() const
// method Object.toString()
jmethodID method_Object_toString = m_env->GetMethodID(
static_cast<jclass>(jo_Object.get()), "toString",
"()Ljava/lang/String;" );
- if (JNI_FALSE != m_env->ExceptionCheck())
+ if (m_env->ExceptionCheck())
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
@@ -523,8 +523,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
*ppMapping = 0;
}
- static_assert(JNI_FALSE == sal_False, "must be equal");
- static_assert(JNI_TRUE == sal_True, "must be equal");
+ static_assert(int(JNI_FALSE) == int(sal_False), "must be equal");
+ static_assert(int(JNI_TRUE) == int(sal_True), "must be equal");
static_assert(sizeof (jboolean) == sizeof (sal_Bool), "must be the same
size");
static_assert(sizeof (jchar) == sizeof (sal_Unicode), "must be the same
size");
static_assert(sizeof (jdouble) == sizeof (double), "must be the same
size");
diff --git a/bridges/source/jni_uno/jni_data.cxx
b/bridges/source/jni_uno/jni_data.cxx
index 829c730..d1f36ed 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -461,8 +461,7 @@ void Bridge::map_to_uno(
JLocalAutoRef jo_type( jni );
JLocalAutoRef jo_wrapped_holder( jni );
- if (JNI_FALSE != jni->IsInstanceOf(
- java_data.l, getJniInfo()->m_class_Any ))
+ if (jni->IsInstanceOf( java_data.l, getJniInfo()->m_class_Any ))
{
// boxed any
jo_type.reset( jni->GetObjectField(
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index e87e68d..628aa30 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -428,7 +428,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env,
jobject /*obj_this*/, jst
if ( xOut.is() )
{
jbyte *buf = env->GetByteArrayElements(buffer,NULL);
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
{
env->ExceptionClear();
OSL_FAIL("ExceptionClear");
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 8e30cfe..64566b1 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -139,7 +139,7 @@ namespace connectivity
OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr)
{
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
{
env->ExceptionClear();
OSL_FAIL("ExceptionClear");
@@ -156,7 +156,7 @@ namespace connectivity
env->ReleaseStringChars(jstr,pChar);
}
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
{
env->ExceptionClear();
OSL_FAIL("ExceptionClear");
@@ -334,7 +334,7 @@ namespace connectivity
void StorageContainer::throwJavaException(const Exception&
_aException,JNIEnv * env)
{
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
env->ExceptionClear();
OString cstr( OUStringToOString(_aException.Message,
RTL_TEXTENCODING_JAVA_UTF8 ) );
OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 740fe73..498b399 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -76,7 +76,7 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_S
catch(const Exception& e)
{
OSL_FAIL("Exception caught! :
Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement");
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
env->ExceptionClear();
OString cstr( OUStringToOString(e.Message,
RTL_TEXTENCODING_JAVA_UTF8 ) );
OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
@@ -109,7 +109,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL
Java_com_sun_star_sdbcx_comp_hsqldb_Stora
}
catch(const NoSuchElementException&)
{
- if (JNI_FALSE != env->ExceptionCheck())
+ if (env->ExceptionCheck())
env->ExceptionClear();
}
catch(const Exception& e)
diff --git a/javaunohelper/source/bootstrap.cxx
b/javaunohelper/source/bootstrap.cxx
index 7a4e283..81d6a35 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -54,7 +54,7 @@ inline OUString jstring_to_oustring( jstring jstr, JNIEnv *
jni_env )
rtl_uString * ustr =
static_cast<rtl_uString *>(rtl_allocateMemory( sizeof (rtl_uString) +
(len * sizeof (sal_Unicode)) ));
jni_env->GetStringRegion( jstr, 0, len, ustr->buffer );
- OSL_ASSERT( JNI_FALSE == jni_env->ExceptionCheck() );
+ OSL_ASSERT( !jni_env->ExceptionCheck() );
ustr->refCount = 1;
ustr->length = len;
ustr->buffer[ len ] = '\0';
@@ -77,7 +77,7 @@ jobject
Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
{
// name
jstring jstr =
static_cast<jstring>(jni_env->GetObjectArrayElement( jpairs, nPos ));
- if (JNI_FALSE != jni_env->ExceptionCheck())
+ if (jni_env->ExceptionCheck())
{
jni_env->ExceptionClear();
throw RuntimeException( "index out of bounds?!" );
@@ -87,7 +87,7 @@ jobject
Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
OUString name( ::javaunohelper::jstring_to_oustring( jstr,
jni_env ) );
// value
jstr =
static_cast<jstring>(jni_env->GetObjectArrayElement( jpairs, nPos +1 ));
- if (JNI_FALSE != jni_env->ExceptionCheck())
+ if (jni_env->ExceptionCheck())
{
jni_env->ExceptionClear();
throw RuntimeException( "index out of bounds?!" );
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index be3e41f..8ccd0c1 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -1248,14 +1248,14 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
jstring jsClass=
static_cast<jstring>(pJNIEnv->CallObjectMethod( jcSec, jmName));
const jchar* jcharName= pJNIEnv->GetStringChars( jsClass,
NULL);
OUString sName( jcharName);
- jboolean bIsSandbox;
+ bool bIsSandbox;
if ( sName == "com.sun.star.lib.sandbox.SandboxSecurity" )
- bIsSandbox= JNI_TRUE;
+ bIsSandbox= true;
else
- bIsSandbox= JNI_FALSE;
+ bIsSandbox= false;
pJNIEnv->ReleaseStringChars( jsClass, jcharName);
- if (bIsSandbox == JNI_TRUE)
+ if (bIsSandbox)
{
// call SandboxSecurity.reset
jmethodID jmReset= pJNIEnv->GetMethodID(
jcSec,"reset","()V");
commit 1cb0b37ad09400138d7c4a5874c02f921e742d37
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 09:19:03 2015 +0200
Rephrase comparisons between bool and sal_Bool
...to cater for forthcoming loplugin:implicitboolconversion improvements
Change-Id: I88c0c4681137022005c3a4c418e91cb17bc17148
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 429c866..cd67ed0 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1199,7 +1199,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw
(RuntimeException, std::
void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw
(RuntimeException, std::exception)
{
Guard< Mutex > aGuard( maMutex );
- if( _autoreverse != (mbAutoReverse ? 1 : 0) )
+ if( bool(_autoreverse) != mbAutoReverse )
{
mbAutoReverse = _autoreverse;
fireChangeListener();
@@ -1466,7 +1466,7 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool
_accumulate )
throw (RuntimeException, std::exception)
{
Guard< Mutex > aGuard( maMutex );
- if( _accumulate != (mbAccumulate ? 1 : 0) )
+ if( bool(_accumulate) != mbAccumulate )
{
mbAccumulate = _accumulate;
fireChangeListener();
@@ -1647,7 +1647,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw
(RuntimeException, std::ex
void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw
(RuntimeException, std::exception)
{
Guard< Mutex > aGuard( maMutex );
- if( _direction != (mbDirection ? 1 : 0) )
+ if( bool(_direction) != mbDirection )
{
mbDirection = _direction;
fireChangeListener();
@@ -1773,7 +1773,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw
(RuntimeException, std::excepti
void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw
(RuntimeException, std::exception)
{
Guard< Mutex > aGuard( maMutex );
- if( _mode != (mbMode ? 1 : 0) )
+ if( bool(_mode) != mbMode )
{
mbMode = _mode;
fireChangeListener();
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 111e7ae..1b06c17 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -541,7 +541,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted,
mnUnmutedVolume );
// change the volume to 0 or the unmuted volume
- if( mpPlaybin && (mbMuted ? 1 : 0) != bSet )
+ if( mpPlaybin && mbMuted != bool(bSet) )
{
double nVolume = mnUnmutedVolume;
if( bSet )
diff --git a/package/source/xstor/xstorage.cxx
b/package/source/xstor/xstorage.cxx
index c499e01..63158f6 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4124,7 +4124,7 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified )
if ( m_pData->m_bReadOnlyWrap )
throw beans::PropertyVetoException( THROW_WHERE ); // TODO: access
denied
- if ( (m_pImpl->m_bIsModified ? 1 : 0) != bModified )
+ if ( m_pImpl->m_bIsModified != bool(bModified) )
m_pImpl->m_bIsModified = bModified;
aGuard.clear();
diff --git a/svx/source/form/formfeaturedispatcher.cxx
b/svx/source/form/formfeaturedispatcher.cxx
index 2c18dbd..7915436 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -68,7 +68,7 @@ namespace svx
FeatureStateEvent aUnoState;
getUnoState( aUnoState );
- if ( ( m_aLastKnownState == aUnoState.State ) && (
(m_bLastKnownEnabled ? 1 : 0) == aUnoState.IsEnabled ) )
+ if ( ( m_aLastKnownState == aUnoState.State ) && ( m_bLastKnownEnabled
== bool(aUnoState.IsEnabled) ) )
return;
m_aLastKnownState = aUnoState.State;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
