basic/qa/cppunit/basic_coverage.cxx | 6
basic/source/classes/sbunoobj.cxx | 16 -
basic/source/comp/exprnode.cxx | 20 -
basic/source/runtime/methods1.cxx | 6
basic/source/runtime/runtime.cxx | 6
binaryurp/source/bridge.cxx | 26 +-
binaryurp/source/proxy.cxx | 10
binaryurp/source/reader.cxx | 14 -
binaryurp/source/unmarshal.cxx | 6
binaryurp/source/writer.cxx | 10
bridges/test/java_uno/acquire/testacquire.cxx | 6
chart2/qa/extras/chart2export.cxx | 20 -
chart2/qa/extras/chart2import.cxx | 6
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 8
chart2/source/view/charttypes/VSeriesPlotter.cxx | 8
cli_ure/source/climaker/climaker_app.cxx | 16 -
codemaker/source/codemaker/exceptiontree.cxx | 6
codemaker/source/codemaker/global.cxx | 12 -
codemaker/source/cppumaker/cpputype.cxx | 72
+++---
codemaker/source/cppumaker/dumputils.cxx | 24 +-
codemaker/source/javamaker/javatype.cxx | 12 -
compilerplugins/clang/implicitboolconversion.cxx | 110
+++++-----
compilerplugins/clang/literaltoboolconversion.cxx | 8
compilerplugins/clang/plugin.cxx | 14 -
compilerplugins/clang/pluginhandler.cxx | 18 -
compilerplugins/clang/store/constantfunction.cxx | 6
compilerplugins/clang/stringconstant.cxx | 24 +-
compilerplugins/clang/vclwidgets.cxx | 24 +-
configmgr/source/childaccess.cxx | 8
configmgr/source/components.cxx | 6
configmgr/source/partial.cxx | 6
connectivity/source/commontools/dbmetadata.cxx | 14 -
connectivity/source/drivers/mork/MQueryHelper.cxx | 6
connectivity/source/drivers/mork/MorkParser.cxx | 6
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 3
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 10
connectivity/source/drivers/postgresql/pq_statement.cxx | 6
cppu/source/AffineBridge/AffineBridge.cxx | 6
cppuhelper/source/propertysetmixin.cxx | 12 -
dbaccess/source/core/api/KeySet.cxx | 12 -
desktop/source/deployment/misc/dp_update.cxx | 24 +-
editeng/source/misc/svxacorr.cxx | 26 +-
i18npool/source/breakiterator/breakiterator_unicode.cxx | 6
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 20 -
i18npool/source/nativenumber/nativenumbersupplier.cxx | 34
+--
45 files changed, 358 insertions(+), 361 deletions(-)
New commits:
commit be729e772196f33543e21cb9bac21add87726b20
Author: Benjamin Ni <benjaminn...@hotmail.com>
Date: Fri Sep 25 11:41:53 2015 +0100
tdf#94269: Replace "n" prefix for bool variables with "b"
Change-Id: I178545792c7354a362658ac7ef8b1d4cf0865797
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/basic/qa/cppunit/basic_coverage.cxx
b/basic/qa/cppunit/basic_coverage.cxx
index 1c4cb3a..8e321c7 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -73,7 +73,7 @@ void Coverage::test_success()
void Coverage::run_test(const OUString& sFileURL)
{
m_sCurrentTest = sFileURL;
- bool result = false;
+ bool bResult = false;
MacroSnippet testMacro;
testMacro.LoadSourceFromFile( sFileURL );
testMacro.Compile();
@@ -82,10 +82,10 @@ void Coverage::run_test(const OUString& sFileURL)
SbxVariableRef pResult = testMacro.Run();
if( pResult && pResult->GetInteger() == 1 )
{
- result = true;
+ bResult = true;
}
}
- if(result)
+ if(bResult)
{
test_success();
}
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index a522472..3f64566 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -119,15 +119,15 @@ static char const defaultNameSpace[] = "ooo.vba";
bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, OUString&
sDfltProp )
{
- bool result = false;
+ bool bResult = false;
Reference< XDefaultProperty> xDefaultProp( pUnoObj->maTmpUnoObj, UNO_QUERY
);
if ( xDefaultProp.is() )
{
sDfltProp = xDefaultProp->getDefaultPropertyName();
if ( !sDfltProp.isEmpty() )
- result = true;
+ bResult = true;
}
- return result;
+ return bResult;
}
SbxVariable* getDefaultProp( SbxVariable* pRef )
@@ -1674,7 +1674,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const
OUString& rClass)
{
return true;
}
- bool result = false;
+ bool bResult = false;
Reference< XTypeProvider > xTypeProvider( x, UNO_QUERY );
if( xTypeProvider.is() )
{
@@ -1730,11 +1730,11 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const
OUString& rClass)
if ( sTypeName.isEmpty() || sTypeName == "IDispatch" )
{
// can't check type, leave it pass
- result = true;
+ bResult = true;
}
else
{
- result = sTypeName.equals( rClass );
+ bResult = sTypeName.equals( rClass );
}
}
break; // finished checking automation object
@@ -1745,12 +1745,12 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const
OUString& rClass)
if ( (aClassName.getLength() <= aInterfaceName.getLength()) &&
aInterfaceName.endsWithIgnoreAsciiCase( aClassName ) )
{
- result = true;
+ bResult = true;
break;
}
}
}
- return result;
+ return bResult;
}
// Debugging help method to readout the imlemented interfaces of an object
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 2b65fd1..1fecc7f 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -304,15 +304,15 @@ void SbiExprNode::FoldConstants(SbiParser* pParser)
|| eTok == IDIV || eTok == MOD )
{
// Integer operations
- bool err = false;
- if( nl > SbxMAXLNG ) err = true, nl = SbxMAXLNG;
- else if( nl < SbxMINLNG ) err = true, nl = SbxMINLNG;
- if( nr > SbxMAXLNG ) err = true, nr = SbxMAXLNG;
- else if( nr < SbxMINLNG ) err = true, nr = SbxMINLNG;
+ bool bErr = false;
+ if( nl > SbxMAXLNG ) bErr = true, nl = SbxMAXLNG;
+ else if( nl < SbxMINLNG ) bErr = true, nl = SbxMINLNG;
+ if( nr > SbxMAXLNG ) bErr = true, nr = SbxMAXLNG;
+ else if( nr < SbxMINLNG ) bErr = true, nr = SbxMINLNG;
ll = static_cast<long>(nl); lr = static_cast<long>(nr);
llMod = static_cast<long>(nl);
lrMod = static_cast<long>(nr);
- if( err )
+ if( bErr )
{
pParser->Error( ERRCODE_BASIC_MATH_OVERFLOW );
bError = true;
@@ -419,10 +419,10 @@ void SbiExprNode::FoldConstants(SbiParser* pParser)
nVal = -nVal; break;
case NOT: {
// Integer operation!
- bool err = false;
- if( nVal > SbxMAXLNG ) err = true, nVal = SbxMAXLNG;
- else if( nVal < SbxMINLNG ) err = true, nVal = SbxMINLNG;
- if( err )
+ bool bErr = false;
+ if( nVal > SbxMAXLNG ) bErr = true, nVal = SbxMAXLNG;
+ else if( nVal < SbxMINLNG ) bErr = true, nVal = SbxMINLNG;
+ if( bErr )
{
pParser->Error( ERRCODE_BASIC_MATH_OVERFLOW );
bError = true;
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index c9367a9..8f5dedd 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -788,16 +788,16 @@ RTLFUNC(FreeLibrary)
}
bool IsBaseIndexOne()
{
- bool result = false;
+ bool bResult = false;
if ( GetSbData()->pInst && GetSbData()->pInst->pRun )
{
sal_uInt16 res = GetSbData()->pInst->pRun->GetBase();
if ( res )
{
- result = true;
+ bResult = true;
}
}
- return result;
+ return bResult;
}
RTLFUNC(Array)
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index b0aaa15..99031a1 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -84,11 +84,11 @@ static void lcl_eraseImpl( SbxVariableRef& refVar, bool
bVBAEnabled );
bool SbiRuntime::isVBAEnabled()
{
- bool result = false;
+ bool bResult = false;
SbiInstance* pInst = GetSbData()->pInst;
if ( pInst && GetSbData()->pInst->pRun )
- result = pInst->pRun->bVBAEnabled;
- return result;
+ bResult = pInst->pRun->bVBAEnabled;
+ return bResult;
}
void StarBASIC::SetVBAEnabled( bool bEnabled )
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 1534faf..6641143 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -697,13 +697,13 @@ void Bridge::handleRequestChangeReply(
void Bridge::handleCommitChangeReply(
bool exception, BinaryAny const & returnValue)
{
- bool ccMode = true;
+ bool bCcMode = true;
try {
throwException(exception, returnValue);
} catch (const css::bridge::InvalidProtocolChangeException &) {
- ccMode = false;
+ bCcMode = false;
}
- if (ccMode) {
+ if (bCcMode) {
setCurrentContextMode();
}
assert(mode_ == MODE_REQUESTED || mode_ == MODE_REPLY_1);
@@ -766,8 +766,8 @@ void Bridge::handleRequestChangeRequest(
void Bridge::handleCommitChangeRequest(
rtl::ByteSequence const & tid, std::vector< BinaryAny > const &
inArguments)
{
- bool ccMode = false;
- bool exc = false;
+ bool bCcMode = false;
+ bool bExc = false;
BinaryAny ret;
assert(inArguments.size() == 1);
css::uno::Sequence< css::bridge::ProtocolProperty > s;
@@ -776,10 +776,10 @@ void Bridge::handleCommitChangeRequest(
(void) ok; // avoid warnings
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
if (s[i].Name == "CurrentContext") {
- ccMode = true;
+ bCcMode = true;
} else {
- ccMode = false;
- exc = true;
+ bCcMode = false;
+ bExc = true;
ret = mapCppToBinaryAny(
css::uno::makeAny(
css::bridge::InvalidProtocolChangeException(
@@ -792,8 +792,8 @@ void Bridge::handleCommitChangeRequest(
switch (mode_) {
case MODE_WAIT:
getWriter()->sendDirectReply(
- tid, protPropCommit_, exc, ret, std::vector< BinaryAny >());
- if (ccMode) {
+ tid, protPropCommit_, bExc, ret, std::vector< BinaryAny >());
+ if (bCcMode) {
setCurrentContextMode();
mode_ = MODE_NORMAL;
getWriter()->unblock();
@@ -805,7 +805,7 @@ void Bridge::handleCommitChangeRequest(
case MODE_NORMAL_WAIT:
getWriter()->queueReply(
tid, protPropCommit_, false, false, ret, std::vector< BinaryAny
>(),
- ccMode);
+ bCcMode);
mode_ = MODE_NORMAL;
break;
default:
@@ -873,12 +873,12 @@ css::uno::Reference< css::uno::XInterface >
Bridge::getInstance(
&p));
BinaryAny ret;
std::vector< BinaryAny> outArgs;
- bool exc = makeCall(
+ bool bExc = makeCall(
sInstanceName,
css::uno::TypeDescription(
"com.sun.star.uno.XInterface::queryInterface"),
false, inArgs, &ret, &outArgs);
- throwException(exc, ret);
+ throwException(bExc, ret);
return css::uno::Reference< css::uno::XInterface >(
static_cast< css::uno::XInterface * >(
binaryToCppMapping_.mapInterface(
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 6ab9e8f..e3dc961 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -133,12 +133,12 @@ void Proxy::do_dispatch_throw(
{
//TODO: Optimize queryInterface:
assert(member != 0);
- bool setter = false;
+ bool bSetter = false;
std::vector< BinaryAny > inArgs;
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
- setter = returnValue == 0;
- if (setter) {
+ bSetter = returnValue == 0;
+ if (bSetter) {
inArgs.push_back(
BinaryAny(
css::uno::TypeDescription(
@@ -174,7 +174,7 @@ void Proxy::do_dispatch_throw(
oid_,
css::uno::TypeDescription(
const_cast< typelib_TypeDescription * >(member)),
- setter, inArgs, &ret, &outArgs))
+ bSetter, inArgs, &ret, &outArgs))
{
assert(ret.getType().get()->eTypeClass == typelib_TypeClass_EXCEPTION);
uno_any_construct(
@@ -182,7 +182,7 @@ void Proxy::do_dispatch_throw(
} else {
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
- if (!setter) {
+ if (!bSetter) {
css::uno::TypeDescription t(
reinterpret_cast<
typelib_InterfaceAttributeTypeDescription const * >(
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index d4b4074..eed96ae 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -231,14 +231,14 @@ void Reader::readMessage(Unmarshal & unmarshal) {
("superfluous MUSTREPLY/SYNCHRONOUS ignored in request message with"
" non-oneway function ID"));
bool synchronous = !oneWay || forceSynchronous;
- bool setter = false;
+ bool bSetter = false;
std::vector< BinaryAny > inArgs;
switch (memberTd.get()->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
- setter = itd->pMapMemberIndexToFunctionIndex[memberId] != functionId;
+ bSetter = itd->pMapMemberIndexToFunctionIndex[memberId] != functionId;
// pMapMemberIndexToFunctionIndex contains function index of
// attribute getter
- if (setter) {
+ if (bSetter) {
inArgs.push_back(
unmarshal.readValue(
css::uno::TypeDescription(
@@ -330,7 +330,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
std::unique_ptr< IncomingRequest > req(
new IncomingRequest(
bridge_, tid, oid, obj, type, functionId, synchronous,
memberTd,
- setter, inArgs, ccMode, cc));
+ bSetter, inArgs, ccMode, cc));
if (synchronous) {
bridge_->incrementActiveCalls();
}
@@ -386,18 +386,18 @@ void Reader::readReplyMessage(Unmarshal & unmarshal,
sal_uInt8 flags1) {
assert(false); // this cannot happen
break;
}
- bool ok = false;
+ bool bOk = false;
for (sal_Int32 i = 0; i != n; ++i) {
if (typelib_typedescriptionreference_isAssignableFrom(
p[i],
reinterpret_cast< typelib_TypeDescriptionReference * >(
ret.getType().get())))
{
- ok = true;
+ bOk = true;
break;
}
}
- if (!ok) {
+ if (!bOk) {
throw css::uno::RuntimeException(
"URP: reply message with bad exception type received");
}
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index eaeb54b..43ddfa8 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -321,14 +321,14 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription
const & type) {
type.makeComplete();
typelib_EnumTypeDescription * etd =
reinterpret_cast< typelib_EnumTypeDescription * >(type.get());
- bool found = false;
+ bool bFound = false;
for (sal_Int32 i = 0; i != etd->nEnumValues; ++i) {
if (etd->pEnumValues[i] == v) {
- found = true;
+ bFound = true;
break;
}
}
- if (!found) {
+ if (!bFound) {
throw css::io::IOException(
"binaryurp::Unmarshal: unknown enum value");
}
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 84edbd4..3813dbc 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -196,7 +196,7 @@ void Writer::sendRequest(
OSL_ASSERT(tid.getLength() != 0 && !oid.isEmpty() && member.is());
css::uno::TypeDescription t(type);
sal_Int32 functionId = 0;
- bool forceSynchronous = false;
+ bool bForceSynchronous = false;
member.makeComplete();
switch (member.get()->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -228,7 +228,7 @@ void Writer::sendRequest(
t.makeComplete();
functionId = mtd->pInterface->pMapMemberIndexToFunctionIndex[
mtd->aBase.nPosition];
- forceSynchronous = mtd->bOneWay &&
+ bForceSynchronous = mtd->bOneWay &&
functionId != SPECIAL_FUNCTION_ID_RELEASE;
break;
}
@@ -244,17 +244,17 @@ void Writer::sendRequest(
bool newType = !(lastType_.is() && t.equals(lastType_));
bool newOid = oid != lastOid_;
bool newTid = tid != lastTid_;
- if (newType || newOid || newTid || forceSynchronous || functionId > 0x3FFF)
+ if (newType || newOid || newTid || bForceSynchronous || functionId >
0x3FFF)
// > 14 bit function ID
{
Marshal::write8(
&buf,
(0xC0 | (newType ? 0x20 : 0) | (newOid ? 0x10 : 0) |
(newTid ? 0x08 : 0) | (functionId > 0xFF ? 0x04 : 0) |
- (forceSynchronous ? 0x01 : 0)));
+ (bForceSynchronous ? 0x01 : 0)));
// bit 7: LONGHEADER, bit 6: REQUEST, bit 5: NEWTYPE, bit 4:
NEWOID,
// bit 3: NEWTID, bit 2: FUNCTIONID16, bit 0: MOREFLAGS
- if (forceSynchronous) {
+ if (bForceSynchronous) {
Marshal::write8(&buf, 0xC0); // bit 7: MUSTREPLY, bit 6:
SYNCHRONOUS
}
if (functionId <= 0xFF) {
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx
b/bridges/test/java_uno/acquire/testacquire.cxx
index 942572b..6ae649b 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -521,16 +521,16 @@ bool writeInfo(void * registryKey, OUString const &
implementationName,
if (!key.is()) {
return false;
}
- bool success = true;
+ bool bSuccess = true;
for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {
try {
key->createKey(serviceNames[i]);
} catch (css::registry::InvalidRegistryException &) {
- success = false;
+ bSuccess = false;
break;
}
}
- return success;
+ return bSuccess;
}
}
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 1becdffc..819d255 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -285,11 +285,11 @@ void checkCommonTrendline(
CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>=
aExtrapolateBackward);
CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward);
- bool aForceIntercept = false;
- CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>=
aForceIntercept);
- CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, aForceIntercept);
+ bool bForceIntercept = false;
+ CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>=
bForceIntercept);
+ CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, bForceIntercept);
- if (aForceIntercept)
+ if (bForceIntercept)
{
double aInterceptValue = 0.0;
CPPUNIT_ASSERT(xProperties->getPropertyValue("InterceptValue") >>=
aInterceptValue);
@@ -299,13 +299,13 @@ void checkCommonTrendline(
Reference< XPropertySet > xEquationProperties(
xCurve->getEquationProperties() );
CPPUNIT_ASSERT(xEquationProperties.is());
- bool aShowEquation = false;
- CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>=
aShowEquation);
- CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, aShowEquation);
+ bool bShowEquation = false;
+ CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>=
bShowEquation);
+ CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, bShowEquation);
- bool aShowCorrelationCoefficient = false;
-
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient")
>>= aShowCorrelationCoefficient);
- CPPUNIT_ASSERT_EQUAL(aExpectedR2, aShowCorrelationCoefficient);
+ bool bShowCorrelationCoefficient = false;
+
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient")
>>= bShowCorrelationCoefficient);
+ CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient);
}
void checkNameAndType(Reference<XPropertySet> xProperties, const OUString&
aExpectedName, const OUString& aExpectedServiceName)
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 593f3c8..6847aeb 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -770,7 +770,7 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
load("/chart2/qa/extras/data/xlsx/", "chart-text-can-overlap.xlsx");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
- bool textCanOverlap = false;
+ bool bTextCanOverlap = false;
uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc.is());
mxDiagram.set(xChartDoc->getDiagram());
@@ -778,9 +778,9 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram,
uno::UNO_QUERY );
CPPUNIT_ASSERT(xAxisXSupp.is());
xAxisProp = xAxisXSupp->getXAxis();
- xAxisProp->getPropertyValue("TextCanOverlap") >>= textCanOverlap;
+ xAxisProp->getPropertyValue("TextCanOverlap") >>= bTextCanOverlap;
// Expected value of 'TextCanOverlap' is true
- CPPUNIT_ASSERT(textCanOverlap);
+ CPPUNIT_ASSERT(bTextCanOverlap);
}
*/
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index cab2df1..1f18f1f 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -564,18 +564,18 @@ OUString ObjectNameProvider::getHelpText( const OUString&
rObjectCID, const Refe
Reference< chart2::XRegressionCurveCalculator >
xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
sal_Int32 aDegree = 2;
sal_Int32 aPeriod = 2;
- bool aForceIntercept = false;
+ bool bForceIntercept = false;
double aInterceptValue = 0.0;
uno::Reference< beans::XPropertySet > xProperties(
xCurve, uno::UNO_QUERY );
if ( xProperties.is())
{
xProperties->getPropertyValue(
"PolynomialDegree") >>= aDegree;
xProperties->getPropertyValue(
"MovingAveragePeriod") >>= aPeriod;
- xProperties->getPropertyValue(
"ForceIntercept") >>= aForceIntercept;
- if (aForceIntercept)
+ xProperties->getPropertyValue(
"ForceIntercept") >>= bForceIntercept;
+ if (bForceIntercept)
xProperties->getPropertyValue(
"InterceptValue") >>= aInterceptValue;
}
- xCalculator->setRegressionProperties(aDegree,
aForceIntercept, aInterceptValue, 2);
+ xCalculator->setRegressionProperties(aDegree,
bForceIntercept, aInterceptValue, 2);
RegressionCurveHelper::initializeCurveCalculator(
xCalculator, xSeries, xChartModel );
// change text for Moving Average
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index f7fae64..6add0fa 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1090,7 +1090,7 @@ void VSeriesPlotter::createRegressionCurvesShapes(
VDataSeries& rVDataSeries,
sal_Int32 aPeriod = 2;
double aExtrapolateForward = 0.0;
double aExtrapolateBackward = 0.0;
- bool aForceIntercept = false;
+ bool bForceIntercept = false;
double aInterceptValue = 0.0;
if ( xProperties.is() && !bAverageLine )
@@ -1099,8 +1099,8 @@ void VSeriesPlotter::createRegressionCurvesShapes(
VDataSeries& rVDataSeries,
xProperties->getPropertyValue( "MovingAveragePeriod") >>= aPeriod;
xProperties->getPropertyValue( "ExtrapolateForward") >>=
aExtrapolateForward;
xProperties->getPropertyValue( "ExtrapolateBackward") >>=
aExtrapolateBackward;
- xProperties->getPropertyValue( "ForceIntercept") >>=
aForceIntercept;
- if (aForceIntercept)
+ xProperties->getPropertyValue( "ForceIntercept") >>=
bForceIntercept;
+ if (bForceIntercept)
xProperties->getPropertyValue( "InterceptValue") >>=
aInterceptValue;
}
@@ -1121,7 +1121,7 @@ void VSeriesPlotter::createRegressionCurvesShapes(
VDataSeries& rVDataSeries,
fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX);
}
- xCalculator->setRegressionProperties(aDegree, aForceIntercept,
aInterceptValue, aPeriod);
+ xCalculator->setRegressionProperties(aDegree, bForceIntercept,
aInterceptValue, aPeriod);
xCalculator->recalculateRegression( rVDataSeries.getAllX(),
rVDataSeries.getAllY() );
sal_Int32 nPointCount = 100 * fPointScale;
diff --git a/cli_ure/source/climaker/climaker_app.cxx
b/cli_ure/source/climaker/climaker_app.cxx
index 0cd67d9..46935de 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -90,7 +90,7 @@ struct OptionInfo
bool m_has_argument;
};
-bool g_verbose = false;
+bool g_bVerbose = false;
static const OptionInfo s_option_infos [] = {
@@ -333,7 +333,7 @@ SAL_IMPLEMENT_MAIN()
extra_assemblies.push_back(
path_make_absolute_file_url( cmd_arg ) );
}
- else if (!read_option( &g_verbose, info_verbose, &nPos ) &&
+ else if (!read_option( &g_bVerbose, info_verbose, &nPos ) &&
!read_argument( &output, info_out, &nPos ) &&
!read_argument( &version, info_version, &nPos ) &&
!read_argument( &description, info_description, &nPos ) &&
@@ -474,7 +474,7 @@ SAL_IMPLEMENT_MAIN()
}
else
{
- if (g_verbose)
+ if (g_bVerbose)
{
::System::Console::Write(
"> no key file specified. Cannot create strong name!\n");
@@ -597,17 +597,17 @@ SAL_IMPLEMENT_MAIN()
css::uno::Reference< reflection::XTypeDescription > td(
xTD_enum->nextTypeDescription());
OUString name(td->getName());
- bool emit = false;
+ bool bEmit = false;
for (std::vector< rtl::Reference< unoidl::Provider >
>::iterator
i(unoidlMandatoryProvs.begin());
i != unoidlMandatoryProvs.end(); ++i)
{
if ((*i)->findEntity(name).is()) {
- emit = true;
+ bEmit = true;
break;
}
}
- if (emit) {
+ if (bEmit) {
type_emitter->get_type(td);
}
}
@@ -624,7 +624,7 @@ SAL_IMPLEMENT_MAIN()
}
type_emitter->~TypeEmitter();
- if (g_verbose)
+ if (g_bVerbose)
{
::System::Console::Write(
"> saving assembly {0}{1}{2}...",
@@ -634,7 +634,7 @@ SAL_IMPLEMENT_MAIN()
output_file );
}
assembly_builder->Save( output_file );
- if (g_verbose)
+ if (g_bVerbose)
{
::System::Console::WriteLine( "ok." );
}
diff --git a/codemaker/source/codemaker/exceptiontree.cxx
b/codemaker/source/codemaker/exceptiontree.cxx
index 09c3b87..c3f555c 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -51,10 +51,10 @@ void ExceptionTree::add(
rtl::OString const & name, rtl::Reference< TypeManager > const & manager)
{
std::vector< rtl::OString > list;
- bool runtimeException = false;
+ bool bRuntimeException = false;
for (rtl::OString n(name); n != "com.sun.star.uno.Exception";) {
if (n == "com.sun.star.uno.RuntimeException") {
- runtimeException = true;
+ bRuntimeException = true;
break;
}
list.push_back(n);
@@ -67,7 +67,7 @@ void ExceptionTree::add(
getDirectBase());
assert(!n.isEmpty());
}
- if (!runtimeException) {
+ if (!bRuntimeException) {
ExceptionTreeNode * node = &m_root;
for (std::vector< rtl::OString >::reverse_iterator i(list.rbegin());
!node->present; ++i)
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index 7ac1e7c..810f91e 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -75,31 +75,31 @@ OString createFileNameFromType( const OString& destination,
sal_uInt32 length = destination.getLength();
- bool withPoint = false;
+ bool bWithPoint = false;
if (length == 0)
{
length++;
- withPoint = true;
+ bWithPoint = true;
}
length += prefix.getLength() + type.getLength() + postfix.getLength();
- bool withSeparator = false;
+ bool bWithSeparator = false;
if (!(destination.endsWith("\\") || destination.endsWith("/"))
&& !(type.startsWith("\\") || type.startsWith("/")))
{
length++;
- withSeparator = true;
+ bWithSeparator = true;
}
OStringBuffer fileNameBuf(length);
- if (withPoint)
+ if (bWithPoint)
fileNameBuf.append('.');
else
fileNameBuf.append(destination.getStr(), destination.getLength());
- if (withSeparator)
+ if (bWithSeparator)
fileNameBuf.append("/", 1);
OString tmpStr(type);
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 9feace2..58a67b2 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1563,20 +1563,20 @@ void InterfaceType::dumpExceptionSpecification(
out << " /*";
#endif
out << " throw (";
- bool first = true;
+ bool bFirst = true;
for (std::vector< OUString >::const_iterator i(exceptions.begin());
i != exceptions.end(); ++i)
{
if (*i != "com.sun.star.uno.RuntimeException") {
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
out << codemaker::cpp::scopedCppName(u2b(*i));
- first = false;
+ bFirst = false;
}
}
if (runtimeException) {
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
out << "::css::uno::RuntimeException, ::std::exception";
@@ -1822,17 +1822,17 @@ void PlainStructType::dumpDeclaration(FileStream & out)
{
out << indent() << "inline " << id_ << "();\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << "\n" << indent() << "inline " << id_ << "(";
- bool first = !dumpBaseMembers(out, base, true);
+ bool bFirst = !dumpBaseMembers(out, base, true);
for (std::vector< unoidl::PlainStructTypeEntity::Member >::
const_iterator i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
dumpType(out, i->type, true, true);
out << " " << i->name << "_";
- first = false;
+ bFirst = false;
}
out << ");\n";
}
@@ -1872,55 +1872,55 @@ void PlainStructType::dumpHxxFile(
out << "\ninline " << id_ << "::" << id_ << "()\n";
inc();
OUString base(entity_->getDirectBase());
- bool first = true;
+ bool bFirst = true;
if (!base.isEmpty()) {
out << indent() << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "()\n";
- first = false;
+ bFirst = false;
}
for (std::vector< unoidl::PlainStructTypeEntity::Member >::const_iterator
i(
entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- out << indent() << (first ? ":" : ",") << " " << i->name;
+ out << indent() << (bFirst ? ":" : ",") << " " << i->name;
dumpInitializer(out, false, i->type);
out << "\n";
- first = false;
+ bFirst = false;
}
dec();
out << "{\n}\n\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << "inline " << id_;
out << "::" << id_ << "(";
- first = !dumpBaseMembers(out, base, true);
+ bFirst = !dumpBaseMembers(out, base, true);
for (std::vector< unoidl::PlainStructTypeEntity::Member >::
const_iterator i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
dumpType(out, i->type, true, true);
out << " " << i->name << "_";
- first = false;
+ bFirst = false;
}
out << ")\n";
inc();
- first = true;
+ bFirst = true;
if (!base.isEmpty()) {
out << indent() << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "(";
dumpBaseMembers(out, base, false);
out << ")\n";
- first = false;
+ bFirst = false;
}
for (std::vector< unoidl::PlainStructTypeEntity::Member >::
const_iterator i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- out << indent() << (first ? ":" : ",") << " " << i->name << "("
+ out << indent() << (bFirst ? ":" : ",") << " " << i->name << "("
<< i->name << "_)\n";
- first = false;
+ bFirst = false;
}
dec();
out << "{\n}\n\n";
@@ -2710,21 +2710,21 @@ void ExceptionType::dumpHxxFile(
out << "\ninline " << id_ << "::" << id_ << "()\n";
inc();
OUString base(entity_->getDirectBase());
- bool first = true;
+ bool bFirst = true;
if (!base.isEmpty()) {
out << indent() << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "()\n";
- first = false;
+ bFirst = false;
}
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator i(
entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- out << indent() << (first ? ":" : ",") << " ";
+ out << indent() << (bFirst ? ":" : ",") << " ";
out << i->name;
dumpInitializer(out, false, i->type);
out << "\n";
- first = false;
+ bFirst = false;
}
dec();
out << "{";
@@ -2739,35 +2739,35 @@ void ExceptionType::dumpHxxFile(
out << "}\n\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << indent() << "inline " << id_ << "::" << id_ << "(";
- first = !dumpBaseMembers(out, base, true, false);
+ bFirst = !dumpBaseMembers(out, base, true, false);
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
dumpType(out, i->type, true, true);
out << " " << i->name << "_";
- first = false;
+ bFirst = false;
}
out << ")\n";
inc();
- first = true;
+ bFirst = true;
if (!base.isEmpty()) {
out << indent() << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "(";
dumpBaseMembers(out, base, false, false);
out << ")\n";
- first = false;
+ bFirst = false;
}
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- out << indent() << (first ? ":" : ",") << " " << i->name << "("
+ out << indent() << (bFirst ? ":" : ",") << " " << i->name << "("
<< i->name << "_)\n";
- first = false;
+ bFirst = false;
}
dec();
out << "{";
@@ -2783,19 +2783,19 @@ void ExceptionType::dumpHxxFile(
}
out << indent() << id_ << "::" << id_ << "(" << id_
<< " const & the_other)";
- first = true;
+ bFirst = true;
if (!base.isEmpty()) {
out << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "(the_other)";
- first = false;
+ bFirst = false;
}
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator i(
entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- out << (first ? ":" : ",") << " " << i->name << "(the_other." <<
i->name
+ out << (bFirst ? ":" : ",") << " " << i->name << "(the_other." <<
i->name
<< ")";
- first = false;
+ bFirst = false;
}
out << indent() << " {}\n\n" << indent() << id_ << "::~" << id_
<< "() {}\n\n" << indent() << id_ << " & " << id_ << "::operator =("
@@ -2994,17 +2994,17 @@ void ExceptionType::dumpDeclaration(FileStream & out) {
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << indent() << "inline CPPU_GCC_DLLPRIVATE " << id_ << "(";
bool eligibleForDefaults = entity_->getDirectMembers().empty();
- bool first = !dumpBaseMembers(out, base, true, eligibleForDefaults);
+ bool bFirst = !dumpBaseMembers(out, base, true, eligibleForDefaults);
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
{
- if (!first) {
+ if (!bFirst) {
out << ", ";
}
dumpType(out, i->type, true, true);
out << " " << i->name << "_";
- first = false;
+ bFirst = false;
}
out << ");\n\n";
}
diff --git a/codemaker/source/cppumaker/dumputils.cxx
b/codemaker/source/cppumaker/dumputils.cxx
index 8f720f6..90d12dc 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -31,42 +31,42 @@ namespace codemaker { namespace cppumaker {
bool dumpNamespaceOpen(
FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
{
- bool output = false;
- bool first = true;
+ bool bOutput = false;
+ bool bFirst = true;
for (sal_Int32 i = 0; i >= 0;) {
rtl::OUString id(entityName.getToken(0, '.', i));
if (fullModuleType || i >= 0) {
- if (!first) {
+ if (!bFirst) {
out << " ";
}
out << "namespace " << id << " {";
- first = false;
- output = true;
+ bFirst = false;
+ bOutput = true;
}
}
- return output;
+ return bOutput;
}
bool dumpNamespaceClose(
FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
{
- bool output = false;
- bool first = true;
+ bool bOutput = false;
+ bool bFirst = true;
for (sal_Int32 i = 0; i >= 0;) {
i = entityName.indexOf('.', i);
if (i >= 0) {
++i;
}
if (fullModuleType || i >= 0) {
- if (!first) {
+ if (!bFirst) {
out << " ";
}
out << "}";
- first = false;
- output = true;
+ bFirst = false;
+ bOutput = true;
}
}
- return output;
+ return bOutput;
}
void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName) {
diff --git a/codemaker/source/javamaker/javatype.cxx
b/codemaker/source/javamaker/javatype.cxx
index d9639c1..f31dfee 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -606,12 +606,12 @@ void writeClassFile(
path = options.getOption("-O");
}
OString filename(createFileNameFromType(path, type, ".class"));
- bool check = false;
+ bool bCheck = false;
if (fileExists(filename)) {
if (options.isValid("-G")) {
return;
}
- check = options.isValid("-Gc");
+ bCheck = options.isValid("-Gc");
}
FileStream tempfile;
tempfile.createTempFile(getTempDir(filename));
@@ -632,7 +632,7 @@ void writeClassFile(
throw;
}
tempfile.close();
- if (!makeValidTypeFile(filename, tempname, check)) {
+ if (!makeValidTypeFile(filename, tempname, bCheck)) {
throw CannotDumpException(
"Cannot create " + b2u(filename) + " from temporary file "
+ b2u(tempname));
@@ -1263,7 +1263,7 @@ sal_uInt16 addLoadLocal(
+ "\" in call to addLoadLocal");
}
} else {
- bool wrap = false;
+ bool bWrap = false;
if (any) {
switch (sort) {
case codemaker::UnoType::SORT_BOOLEAN:
@@ -1291,7 +1291,7 @@ sal_uInt16 addLoadLocal(
case codemaker::UnoType::
SORT_INSTANTIATED_POLYMORPHIC_STRUCT_TYPE:
case codemaker::UnoType::SORT_INTERFACE_TYPE:
- wrap = true;
+ bWrap = true;
break;
case codemaker::UnoType::SORT_SEQUENCE_TYPE:
case codemaker::UnoType::SORT_TYPEDEF:
@@ -1303,7 +1303,7 @@ sal_uInt16 addLoadLocal(
+ "\" in call to addLoadLocal");
}
}
- if (wrap) {
+ if (bWrap) {
code->instrNew("com/sun/star/uno/Any");
code->instrDup();
code->instrNew("com/sun/star/uno/Type");
diff --git a/compilerplugins/clang/implicitboolconversion.cxx
b/compilerplugins/clang/implicitboolconversion.cxx
index ef8bc8e..091c8f2 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -306,15 +306,15 @@ private:
std::stack<std::vector<ImplicitCastExpr const *>> nested;
std::stack<CallExpr const *> calls;
- bool externCIntFunctionDefinition = false;
+ bool bExternCIntFunctionDefinition = false;
};
bool ImplicitBoolConversion::TraverseCallExpr(CallExpr * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
calls.push(expr);
- bool ret = RecursiveASTVisitor::TraverseCallExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCallExpr(expr);
FunctionProtoType const * t;
- bool ext = isExternCFunctionCall(expr, &t);
+ bool bExt = isExternCFunctionCall(expr, &t);
assert(!nested.empty());
for (auto i: nested.top()) {
auto j = std::find_if(
@@ -332,7 +332,7 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr *
expr) {
{
assert(t->isVariadic());
// ignore bool to int promotions of variadic arguments
- } else if (ext) {
+ } else if (bExt) {
if (t != nullptr) {
assert(
static_cast<std::size_t>(n) <
compat::getNumParams(*t));
@@ -386,13 +386,13 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr *
expr) {
}
calls.pop();
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr *
expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCXXMemberCallExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCXXMemberCallExpr(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
auto j = std::find_if(
@@ -445,30 +445,30 @@ bool
ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr)
reportWarning(i);
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCXXConstructExpr(CXXConstructExpr * expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCXXConstructExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCXXConstructExpr(expr);
checkCXXConstructExpr(expr);
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCXXTemporaryObjectExpr(
CXXTemporaryObjectExpr * expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCXXTemporaryObjectExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCXXTemporaryObjectExpr(expr);
checkCXXConstructExpr(expr);
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCStyleCastExpr(CStyleCastExpr * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCStyleCastExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCStyleCastExpr(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getSubExpr()->IgnoreParens()) {
@@ -476,13 +476,13 @@ bool
ImplicitBoolConversion::TraverseCStyleCastExpr(CStyleCastExpr * expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCXXStaticCastExpr(CXXStaticCastExpr *
expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCXXStaticCastExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCXXStaticCastExpr(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getSubExpr()->IgnoreParens()) {
@@ -490,14 +490,14 @@ bool
ImplicitBoolConversion::TraverseCXXStaticCastExpr(CXXStaticCastExpr * expr)
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseCXXFunctionalCastExpr(
CXXFunctionalCastExpr * expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseCXXFunctionalCastExpr(expr);
+ bool bRet = RecursiveASTVisitor::TraverseCXXFunctionalCastExpr(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getSubExpr()->IgnoreParens()) {
@@ -505,14 +505,14 @@ bool
ImplicitBoolConversion::TraverseCXXFunctionalCastExpr(
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseConditionalOperator(
ConditionalOperator * expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseConditionalOperator(expr);
+ bool bRet = RecursiveASTVisitor::TraverseConditionalOperator(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getTrueExpr()->IgnoreParens()
@@ -529,12 +529,12 @@ bool ImplicitBoolConversion::TraverseConditionalOperator(
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinLT(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinLT(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinLT(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -549,12 +549,12 @@ bool ImplicitBoolConversion::TraverseBinLT(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinLE(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinLE(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinLE(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -569,12 +569,12 @@ bool ImplicitBoolConversion::TraverseBinLE(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinGT(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinGT(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinGT(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -589,12 +589,12 @@ bool ImplicitBoolConversion::TraverseBinGT(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinGE(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinGE(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinGE(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -609,12 +609,12 @@ bool ImplicitBoolConversion::TraverseBinGE(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinEQ(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinEQ(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinEQ(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -629,12 +629,12 @@ bool ImplicitBoolConversion::TraverseBinEQ(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinNE(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinNE(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinNE(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (!((i == expr->getLHS()->IgnoreParens()
@@ -649,17 +649,17 @@ bool ImplicitBoolConversion::TraverseBinNE(BinaryOperator
* expr) {
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinAssign(BinaryOperator * expr) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinAssign(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinAssign(expr);
// /usr/include/gtk-2.0/gtk/gtktogglebutton.h: struct _GtkToggleButton:
// guint GSEAL (active) : 1;
// even though <http://www.gtk.org/api/2.6/gtk/GtkToggleButton.html>:
// "active" gboolean : Read / Write
- bool ext = false;
+ bool bExt = false;
MemberExpr const * me = dyn_cast<MemberExpr>(expr->getLHS());
if (me != nullptr) {
FieldDecl const * fd = dyn_cast<FieldDecl>(me->getMemberDecl());
@@ -667,25 +667,25 @@ bool
ImplicitBoolConversion::TraverseBinAssign(BinaryOperator * expr) {
&& fd->getBitWidthValue(compiler.getASTContext()) == 1)
{
TypedefType const * t = fd->getType()->getAs<TypedefType>();
- ext = t != nullptr && t->getDecl()->getNameAsString() == "guint";
+ bExt = t != nullptr && t->getDecl()->getNameAsString() == "guint";
}
}
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getRHS()->IgnoreParens()
- || !(ext || isBoolExpr(expr->getLHS())))
+ || !(bExt || isBoolExpr(expr->getLHS())))
{
reportWarning(i);
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinAndAssign(CompoundAssignOperator *
expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinAndAssign(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinAndAssign(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getRHS()->IgnoreParens()
@@ -705,13 +705,13 @@ bool
ImplicitBoolConversion::TraverseBinAndAssign(CompoundAssignOperator * expr)
<< expr->getRHS()->IgnoreParenImpCasts()->getType()
<< expr->getSourceRange();
}
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinOrAssign(CompoundAssignOperator * expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinOrAssign(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinOrAssign(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getRHS()->IgnoreParens()
@@ -731,13 +731,13 @@ bool
ImplicitBoolConversion::TraverseBinOrAssign(CompoundAssignOperator * expr)
<< expr->getRHS()->IgnoreParenImpCasts()->getType()
<< expr->getSourceRange();
}
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseBinXorAssign(CompoundAssignOperator *
expr)
{
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseBinXorAssign(expr);
+ bool bRet = RecursiveASTVisitor::TraverseBinXorAssign(expr);
assert(!nested.empty());
for (auto i: nested.top()) {
if (i != expr->getRHS()->IgnoreParens()
@@ -757,12 +757,12 @@ bool
ImplicitBoolConversion::TraverseBinXorAssign(CompoundAssignOperator * expr)
<< expr->getRHS()->IgnoreParenImpCasts()->getType()
<< expr->getSourceRange();
}
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt * stmt) {
nested.push(std::vector<ImplicitCastExpr const *>());
- bool ret = RecursiveASTVisitor::TraverseReturnStmt(stmt);
+ bool bRet = RecursiveASTVisitor::TraverseReturnStmt(stmt);
Expr const * expr = stmt->getRetValue();
if (expr != nullptr) {
ExprWithCleanups const * ec = dyn_cast<ExprWithCleanups>(expr);
@@ -773,41 +773,41 @@ bool
ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt * stmt) {
}
assert(!nested.empty());
for (auto i: nested.top()) {
- if (i != expr || !externCIntFunctionDefinition) {
+ if (i != expr || !bExternCIntFunctionDefinition) {
reportWarning(i);
}
}
nested.pop();
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::TraverseFunctionDecl(FunctionDecl * decl) {
- bool ext = false;
+ bool bExt = false;
if (hasCLanguageLinkageType(decl) && decl->isThisDeclarationADefinition())
{
QualType t { compat::getReturnType(*decl) };
if (t->isSpecificBuiltinType(BuiltinType::Int)
|| t->isSpecificBuiltinType(BuiltinType::UInt))
{
- ext = true;
+ bExt = true;
} else {
TypedefType const * t2 = t->getAs<TypedefType>();
// cf. rtl_locale_equals (and sal_Int32 can be long):
if (t2 != nullptr
&& t2->getDecl()->getNameAsString() == "sal_Int32")
{
- ext = true;
+ bExt = true;
}
}
}
- if (ext) {
- assert(!externCIntFunctionDefinition);
- externCIntFunctionDefinition = true;
+ if (bExt) {
+ assert(!bExternCIntFunctionDefinition);
+ bExternCIntFunctionDefinition = true;
}
- bool ret = RecursiveASTVisitor::TraverseFunctionDecl(decl);
- if (ext) {
- externCIntFunctionDefinition = false;
+ bool bRet = RecursiveASTVisitor::TraverseFunctionDecl(decl);
+ if (bExt) {
+ bExternCIntFunctionDefinition = false;
}
- return ret;
+ return bRet;
}
bool ImplicitBoolConversion::VisitImplicitCastExpr(
diff --git a/compilerplugins/clang/literaltoboolconversion.cxx
b/compilerplugins/clang/literaltoboolconversion.cxx
index 588b75d..8e0c719 100644
--- a/compilerplugins/clang/literaltoboolconversion.cxx
+++ b/compilerplugins/clang/literaltoboolconversion.cxx
@@ -121,7 +121,7 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
|| isa<FloatingLiteral>(subExpr) || isa<ImaginaryLiteral>(subExpr)
|| isa<StringLiteral>(subExpr))
{
- bool rewritten = false;
+ bool bRewritten = false;
if (rewriter != nullptr) {
SourceLocation loc { compiler.getSourceManager().getExpansionLoc(
expr2->getLocStart()) };
@@ -135,19 +135,19 @@ void LiteralToBoolConversion::handleImplicitCastSubExpr(
compiler.getLangOpts());
std::string tok { s, n };
if (tok == "sal_False" || tok == "0") {
- rewritten = replaceText(
+ bRewritten = replaceText(
compiler.getSourceManager().getExpansionLoc(
expr2->getLocStart()),
n, "false");
} else if (tok == "sal_True" || tok == "1") {
- rewritten = replaceText(
+ bRewritten = replaceText(
compiler.getSourceManager().getExpansionLoc(
expr2->getLocStart()),
n, "true");
}
}
}
- if (!rewritten) {
+ if (!bRewritten) {
report(
DiagnosticsEngine::Warning,
"implicit conversion (%0) of literal of type %1 to %2",
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 1088109..2f45e4f 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -249,18 +249,18 @@ bool RewritePlugin::adjustRangeForOptions(
CharSourceRange* range, RewriteOption
SourceLocation fileStartLoc = SM.getLocForStartOfFile( SM.getFileID(
range->getBegin()));
if( fileStartLoc.isInvalid())
return false;
- bool invalid = false;
- const char* fileBuf = SM.getCharacterData( fileStartLoc, &invalid );
- if( invalid )
+ bool isInvalid = false;
+ const char* fileBuf = SM.getCharacterData( fileStartLoc, &isInvalid );
+ if( isInvalid )
return false;
- const char* startBuf = SM.getCharacterData( range->getBegin(), &invalid );
- if( invalid )
+ const char* startBuf = SM.getCharacterData( range->getBegin(), &isInvalid
);
+ if( isInvalid )
return false;
SourceLocation locationEnd = range->getEnd();
if( range->isTokenRange())
locationEnd = locationAfterToken( locationEnd );
- const char* endBuf = SM.getCharacterData( locationEnd, &invalid );
- if( invalid )
+ const char* endBuf = SM.getCharacterData( locationEnd, &isInvalid );
+ if( isInvalid )
return false;
const char* startPos = startBuf;
--startPos;
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 74260c5..54a181e 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -49,7 +49,7 @@ struct PluginData
const int MAX_PLUGINS = 100;
static PluginData plugins[ MAX_PLUGINS ];
static int pluginCount = 0;
-static bool pluginObjectsCreated = false;
+static bool bPluginObjectsCreated = false;
PluginHandler::PluginHandler( CompilerInstance& compiler, const vector< string
>& args )
: compiler( compiler )
@@ -67,7 +67,7 @@ PluginHandler::PluginHandler( CompilerInstance& compiler,
const vector< string >
rewriters.insert( *it );
}
createPlugins( rewriters );
- pluginObjectsCreated = true;
+ bPluginObjectsCreated = true;
}
PluginHandler::~PluginHandler()
@@ -122,7 +122,7 @@ void PluginHandler::createPlugins( set< string > rewriters )
void PluginHandler::registerPlugin( Plugin* (*create)( const
Plugin::InstantiationData& ), const char* optionName, bool isPPCallback, bool
byDefault )
{
- assert( !pluginObjectsCreated );
+ assert( !bPluginObjectsCreated );
assert( pluginCount < MAX_PLUGINS );
plugins[ pluginCount ].create = create;
plugins[ pluginCount ].object = NULL;
@@ -197,7 +197,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext&
context )
and BUILDDIR is sometimes in SRCDIR. */
string modifyFile;
const char* pathWarning = NULL;
- bool skip = false;
+ bool bSkip = false;
if( strncmp( e->getName(), WORKDIR "/", strlen( WORKDIR "/" )) == 0 )
pathWarning = "modified source in workdir/ : %0";
else if( strcmp( SRCDIR, BUILDDIR ) != 0 && strncmp( e->getName(),
BUILDDIR "/", strlen( BUILDDIR "/" )) == 0 )
@@ -207,7 +207,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext&
context )
else
{
pathWarning = "modified source in unknown location, not modifying
: %0";
- skip = true;
+ bSkip = true;
}
if( modifyFile.empty())
modifyFile = e->getName();
@@ -227,12 +227,12 @@ void PluginHandler::HandleTranslationUnit( ASTContext&
context )
// Warn only now, so that files not in scope do not cause warnings.
if( pathWarning != NULL )
report( DiagnosticsEngine::Warning, pathWarning ) << e->getName();
- if( skip )
+ if( bSkip )
continue;
char* filename = new char[ modifyFile.length() + 100 ];
sprintf( filename, "%s.new.%d", modifyFile.c_str(), getpid());
string error;
- bool ok = false;
+ bool bOk = false;
std::unique_ptr<raw_fd_ostream> ostream(
compat::create_raw_fd_ostream(filename, error) );
if( error.empty())
@@ -240,11 +240,11 @@ void PluginHandler::HandleTranslationUnit( ASTContext&
context )
it->second.write( *ostream );
ostream->close();
if( !ostream->has_error() && rename( filename, modifyFile.c_str())
== 0 )
- ok = true;
+ bOk = true;
}
ostream->clear_error();
unlink( filename );
- if( !ok )
+ if( !bOk )
report( DiagnosticsEngine::Error, "cannot write modified source to
%0 (%1)" ) << modifyFile << error;
delete[] filename;
}
diff --git a/compilerplugins/clang/store/constantfunction.cxx
b/compilerplugins/clang/store/constantfunction.cxx
index 5dcbcc2..d1d67f6 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -432,7 +432,7 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl
* pFunctionDecl) {
}
const CompoundStmt *pCompoundStmt =
dyn_cast<CompoundStmt>(pFunctionDecl->getBody());
- bool aEmptyBody = false;
+ bool bEmptyBody = false;
if (pCompoundStmt) {
if (pCompoundStmt->size() > 1) {
return true;
@@ -454,13 +454,13 @@ bool ConstantFunction::VisitFunctionDecl(const
FunctionDecl * pFunctionDecl) {
}
}
} else {
- aEmptyBody = true;
+ bEmptyBody = true;
}
}
std::string aMessage = "this ";
aMessage += pCXXMethodDecl ? "method" : "function";
- if (aEmptyBody) {
+ if (bEmptyBody) {
aMessage += " is empty and should be removed, " + aFunctionName;
} else {
aMessage += " returns a constant value and should be converted to a
constant "
diff --git a/compilerplugins/clang/stringconstant.cxx
b/compilerplugins/clang/stringconstant.cxx
index 2688542..f9b3f5a 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -123,15 +123,15 @@ bool StringConstant::TraverseCallExpr(CallExpr * expr) {
return false;
}
calls_.push(expr);
- bool res = true;
+ bool bRes = true;
for (auto * e: expr->children()) {
if (!TraverseStmt(e)) {
- res = false;
+ bRes = false;
break;
}
}
calls_.pop();
- return res;
+ return bRes;
}
bool StringConstant::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr) {
@@ -139,15 +139,15 @@ bool
StringConstant::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr) {
return false;
}
calls_.push(expr);
- bool res = true;
+ bool bRes = true;
for (auto * e: expr->children()) {
if (!TraverseStmt(e)) {
- res = false;
+ bRes = false;
break;
}
}
calls_.pop();
- return res;
+ return bRes;
}
bool StringConstant::TraverseCXXOperatorCallExpr(CXXOperatorCallExpr * expr)
@@ -156,15 +156,15 @@ bool
StringConstant::TraverseCXXOperatorCallExpr(CXXOperatorCallExpr * expr)
return false;
}
calls_.push(expr);
- bool res = true;
+ bool bRes = true;
for (auto * e: expr->children()) {
if (!TraverseStmt(e)) {
- res = false;
+ bRes = false;
break;
}
}
calls_.pop();
- return res;
+ return bRes;
}
bool StringConstant::TraverseCXXConstructExpr(CXXConstructExpr * expr) {
@@ -172,15 +172,15 @@ bool
StringConstant::TraverseCXXConstructExpr(CXXConstructExpr * expr) {
return false;
}
calls_.push(expr);
- bool res = true;
+ bool bRes = true;
for (auto * e: expr->children()) {
if (!TraverseStmt(e)) {
- res = false;
+ bRes = false;
break;
}
}
calls_.pop();
- return res;
+ return bRes;
}
bool StringConstant::VisitCallExpr(CallExpr const * expr) {
diff --git a/compilerplugins/clang/vclwidgets.cxx
b/compilerplugins/clang/vclwidgets.cxx
index 6873ae2..15833e0 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -159,7 +159,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const
CXXDestructorDecl* pCXXDestructorD
if (!isDerivedFromWindow(pRecordDecl)) {
return true;
}
- bool foundVclPtrField = false;
+ bool bFoundVclPtrField = false;
for(auto fieldDecl = pRecordDecl->field_begin();
fieldDecl != pRecordDecl->field_end(); ++fieldDecl)
{
@@ -167,26 +167,26 @@ bool VCLWidgets::VisitCXXDestructorDecl(const
CXXDestructorDecl* pCXXDestructorD
if (pFieldRecordType) {
const CXXRecordDecl *pFieldRecordTypeDecl =
dyn_cast<CXXRecordDecl>(pFieldRecordType->getDecl());
if (startsWith(pFieldRecordTypeDecl->getQualifiedNameAsString(),
"VclPtr")) {
- foundVclPtrField = true;
+ bFoundVclPtrField = true;
break;
}
}
}
- bool foundDispose = false;
+ bool bFoundDispose = false;
for(auto methodDecl = pRecordDecl->method_begin();
methodDecl != pRecordDecl->method_end(); ++methodDecl)
{
if (methodDecl->isInstance() && methodDecl->param_size()==0 &&
methodDecl->getNameAsString() == "dispose") {
- foundDispose = true;
+ bFoundDispose = true;
break;
}
}
const CompoundStmt *pCompoundStatement =
dyn_cast<CompoundStmt>(pCXXDestructorDecl->getBody());
// having an empty body and no dispose() method is fine
- if (!foundVclPtrField && !foundDispose && pCompoundStatement &&
pCompoundStatement->size() == 0) {
+ if (!bFoundVclPtrField && !bFoundDispose && pCompoundStatement &&
pCompoundStatement->size() == 0) {
return true;
}
- if (foundVclPtrField && pCompoundStatement && pCompoundStatement->size()
== 0) {
+ if (bFoundVclPtrField && pCompoundStatement && pCompoundStatement->size()
== 0) {
report(
DiagnosticsEngine::Warning,
"OutputDevice subclass with VclPtr field must call disposeOnce()
from its destructor.",
@@ -195,7 +195,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const
CXXDestructorDecl* pCXXDestructorD
return true;
}
// check that the destructor for a OutputDevice subclass does nothing
except call into the disposeOnce() method
- bool ok = false;
+ bool bOk = false;
if (pCompoundStatement) {
bool bFoundDisposeOnce = false;
int nNumExtraStatements = 0;
@@ -214,9 +214,9 @@ bool VCLWidgets::VisitCXXDestructorDecl(const
CXXDestructorDecl* pCXXDestructorD
if (!pCallExpr && !dyn_cast<ParenExpr>(x))
nNumExtraStatements++;
}
- ok = bFoundDisposeOnce && nNumExtraStatements == 0;
+ bOk = bFoundDisposeOnce && nNumExtraStatements == 0;
}
- if (!ok) {
+ if (!bOk) {
SourceLocation spellingLocation =
compiler.getSourceManager().getSpellingLoc(
pCXXDestructorDecl->getLocStart());
StringRef filename =
compiler.getSourceManager().getFilename(spellingLocation);
@@ -330,16 +330,16 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl *
fieldDecl) {
if (pParentRecordDecl && isDerivedFromWindow(pParentRecordDecl)
&& startsWith(recordDecl->getQualifiedNameAsString(), "VclPtr"))
{
- bool foundDispose = false;
+ bool bFoundDispose = false;
for(auto methodDecl = pParentRecordDecl->method_begin();
methodDecl != pParentRecordDecl->method_end(); ++methodDecl)
{
if (methodDecl->isInstance() && methodDecl->param_size()==0 &&
methodDecl->getNameAsString() == "dispose") {
- foundDispose = true;
+ bFoundDispose = true;
break;
}
}
- if (!foundDispose) {
+ if (!bFoundDispose) {
report(
DiagnosticsEngine::Warning,
"OutputDevice subclass with a VclPtr field MUST have a
dispose() method.",
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 7295f89..756bc21 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -212,13 +212,13 @@ void ChildAccess::setProperty(
{
assert(localModifications != 0);
Type type = TYPE_ERROR;
- bool nillable = false;
+ bool isNillable = false;
switch (node_->kind()) {
case Node::KIND_PROPERTY:
{
PropertyNode * prop = static_cast< PropertyNode * >(node_.get());
type = prop->getStaticType();
- nillable = prop->isNillable();
+ isNillable = prop->isNillable();
}
break;
case Node::KIND_LOCALIZED_PROPERTY:
@@ -241,13 +241,13 @@ void ChildAccess::setProperty(
LocalizedPropertyNode * locprop =
static_cast< LocalizedPropertyNode * >(getParentNode().get());
type = locprop->getStaticType();
- nillable = locprop->isNillable();
+ isNillable = locprop->isNillable();
}
break;
default:
break;
}
- checkValue(value, type, nillable);
+ checkValue(value, type, isNillable);
getParentAccess()->markChildAsModified(this);
changedValue_.reset(new css::uno::Any(value));
localModifications->add(getRelativePath());
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 40e1eb6..386b272 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -770,17 +770,17 @@ void Components::parseXcdFiles(int layer, OUString const
& url) {
}
}
while (!unres.empty()) {
- bool resolved = false;
+ bool isResolved = false;
for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) {
if (i->manager->parse(&existingDeps)) {
processedDeps.insert(i->name);
unres.erase(i++);
- resolved = true;
+ isResolved = true;
} else {
++i;
}
}
- if (!resolved) {
+ if (!isResolved) {
throw css::uno::RuntimeException(
"xcd: unresolved dependencies in " + url);
}
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 44537aa..14ba0d6 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -120,18 +120,18 @@ Partial::Containment Partial::contains(Path const & path)
const {
// ** If there is some startInclude along its trace: => CONTAINS_NODE
// ** If there is no startInclude along its trace: => CONTAINS_SUBNODES
Node const * p = &root_;
- bool includes = false;
+ bool bIncludes = false;
for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
Node::Children::const_iterator j(p->children.find(*i));
if (j == p->children.end()) {
return p->startInclude ? CONTAINS_NODE : CONTAINS_NOT;
}
p = &j->second;
- includes |= p->startInclude;
+ bIncludes |= p->startInclude;
}
return p->children.empty() && !p->startInclude
? CONTAINS_NOT
- : includes ? CONTAINS_NODE : CONTAINS_SUBNODES;
+ : bIncludes ? CONTAINS_NODE : CONTAINS_SUBNODES;
}
}
diff --git a/connectivity/source/commontools/dbmetadata.cxx
b/connectivity/source/commontools/dbmetadata.cxx
index f5a987b..48f1bcb 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -221,11 +221,11 @@ namespace dbtools
{
lcl_checkConnected( *m_pImpl );
- bool supportsSubQueries = false;
+ bool bSupportsSubQueries = false;
try
{
sal_Int32 maxTablesInselect =
m_pImpl->xConnectionMetaData->getMaxTablesInSelect();
- supportsSubQueries = ( maxTablesInselect > 1 ) || (
maxTablesInselect == 0 );
+ bSupportsSubQueries = ( maxTablesInselect > 1 ) || (
maxTablesInselect == 0 );
// TODO: is there a better way to determine this? The above is not
really true. More precise,
// it's a *very* generous heuristics ...
}
@@ -233,7 +233,7 @@ namespace dbtools
{
DBG_UNHANDLED_EXCEPTION();
}
- return supportsSubQueries;
+ return bSupportsSubQueries;
}
@@ -241,21 +241,21 @@ namespace dbtools
{
lcl_checkConnected( *m_pImpl );
- bool doesSupportPrimaryKeys = false;
+ bool bDoesSupportPrimaryKeys = false;
try
{
Any setting;
if ( !( lcl_getConnectionSetting( "PrimaryKeySupport",
*m_pImpl, setting ) )
- || !( setting >>= doesSupportPrimaryKeys )
+ || !( setting >>= bDoesSupportPrimaryKeys )
)
- doesSupportPrimaryKeys =
m_pImpl->xConnectionMetaData->supportsCoreSQLGrammar()
+ bDoesSupportPrimaryKeys =
m_pImpl->xConnectionMetaData->supportsCoreSQLGrammar()
||
m_pImpl->xConnectionMetaData->supportsANSI92EntryLevelSQL();
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
- return doesSupportPrimaryKeys;
+ return bDoesSupportPrimaryKeys;
}
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index b4394c7..94da5b8 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -286,13 +286,13 @@ sal_Int32 MQueryHelper::executeQuery(OConnection*
xConnection, MQueryExpression
// Set the 'name' property of the boolString.
OString attrName =
_aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias(
evStr->getName() );
SAL_INFO("connectivity.mork", "Name = " << attrName.getStr());
- bool requiresValue = true;
+ bool bRequiresValue = true;
OUString currentValue = entry->getValue(attrName);
if (evStr->getCond() == MQueryOp::Exists || evStr->getCond() ==
MQueryOp::DoesNotExist)
{
- requiresValue = false;
+ bRequiresValue = false;
}
- if (requiresValue)
+ if (bRequiresValue)
{
SAL_INFO("connectivity.mork", "Value = " << evStr->getValue()
);
OUString searchedValue = evStr->getValue();
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx
b/connectivity/source/drivers/mork/MorkParser.cxx
index bcdda99..d976a8d 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -670,11 +670,11 @@ void MorkParser::getRecordKeysForListTable(std::string&
listName, std::set<int>&
std::cout << "\t\t\t\t Cells:\r\n";
#endif
// Get cells
- bool listFound = false;
+ bool isListFound = false;
for ( MorkCells::iterator cellsIter = RowIter->second.begin();
cellsIter != RowIter->second.end(); ++cellsIter )
{
- if (listFound)
+ if (isListFound)
{
if (cellsIter->first >= 0xC7)
{
@@ -686,7 +686,7 @@ void MorkParser::getRecordKeysForListTable(std::string&
listName, std::set<int>&
else if ((cellsIter->first == 0xC1) &&
listName == getValue( cellsIter->second ))
{
- listFound = true;
+ isListFound = true;
}
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 8505d48..f5b3c18 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -60,9 +60,6 @@ MozillaBootstrap::~MozillaBootstrap()
void MozillaBootstrap::Init()
{
- bool aProfileExists=false;
-
- (void)aProfileExists; /* avoid warning about unused parameter */
m_ProfileAccess = new ProfileAccess();
bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString());
}
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 1935da6..7a0a3ed 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -59,7 +59,7 @@ namespace
// for now, never use wchar,
// but most of code is prepared to handle it
// in case we make this configurable
- const bool useWChar = false;
+ const bool bUseWChar = false;
}
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const
OUString& sql)
@@ -312,7 +312,7 @@ void OPreparedStatement::setParameter(const sal_Int32
parameterIndex, const sal_
sal_Int32 nCharLen;
sal_Int32 nByteLen;
void *pData;
- if (useWChar)
+ if (bUseWChar)
{
/*
* On Windows, wchar is 16 bits (UTF-16 encoding), the ODBC "W"
variants functions take UTF-16 encoded strings
@@ -384,7 +384,7 @@ void OPreparedStatement::setParameter(const sal_Int32
parameterIndex, const sal_
void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const
sal_Int32 _nType, const SQLULEN _nColumnSize, const sal_Int32 _nScale, const
void* const _pData, const SQLULEN _nDataLen, const SQLLEN _nDataAllocLen)
{
SQLSMALLINT fCType, fSqlType;
- OTools::getBindTypes(useWChar, m_pConnection->useOldDateFormat(),
OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType);
+ OTools::getBindTypes(bUseWChar, m_pConnection->useOldDateFormat(),
OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType);
SQLLEN& rDataLen = boundParams[parameterIndex-1].getBindLengthBuffer();
rDataLen = _nDataLen;
@@ -525,7 +525,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32
parameterIndex, const sal_I
SQLSMALLINT fCType;
SQLSMALLINT fSqlType;
- OTools::getBindTypes( useWChar,
+ OTools::getBindTypes( bUseWChar,
m_pConnection->useOldDateFormat(),
OTools::jdbcTypeToOdbc(_nType),
fCType,
@@ -853,7 +853,7 @@ void OPreparedStatement::setStream(
*lenBuf = SQL_LEN_DATA_AT_EXEC (length);
SQLSMALLINT fCType, fSqlType;
- OTools::getBindTypes(useWChar, m_pConnection->useOldDateFormat(),
OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType);
+ OTools::getBindTypes(bUseWChar, m_pConnection->useOldDateFormat(),
OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType);
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 03c1c31..1347e2a 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -757,7 +757,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
buf.append( "SELECT * FROM " );
bufferQuoteQualifiedIdentifier(buf, schemaName, tableName,
pConnectionSettings );
buf.append( " WHERE " );
- bool additionalCondition = false;
+ bool bAdditionalCondition = false;
String2StringMap autoValues;
for( int i = 0 ; i < keyColumnNames.getLength() ; i ++ )
{
@@ -813,12 +813,12 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
}
}
- if( additionalCondition )
+ if( bAdditionalCondition )
buf.append( " AND " );
bufferQuoteIdentifier( buf, keyColumnNames[i],
pConnectionSettings );
buf.append( " = " );
buf.append( value );
- additionalCondition = true;
+ bAdditionalCondition = true;
}
query = buf.makeStringAndClear();
}
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx
b/cppu/source/AffineBridge/AffineBridge.cxx
index 657a163..8546326 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -255,11 +255,11 @@ void AffineBridge::v_callInto_v(uno_EnvCallee * pCallee,
va_list * pParam)
m_pInnerThread->resume();
}
- bool resetId = false;
+ bool bResetId = false;
if (!m_outerThreadId)
{
m_outerThreadId = osl::Thread::getCurrentIdentifier();
- resetId = true;
+ bResetId = true;
}
m_message = CB_FPOINTER;
@@ -269,7 +269,7 @@ void AffineBridge::v_callInto_v(uno_EnvCallee * pCallee,
va_list * pParam)
outerDispatch(1);
- if (resetId)
+ if (bResetId)
m_outerThreadId = 0;
}
diff --git a/cppuhelper/source/propertysetmixin.cxx
b/cppuhelper/source/propertysetmixin.cxx
index c4de4fa..982994f 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -163,23 +163,23 @@ void Data::initProperties(
if (attr->isBound()) {
attrAttribs |= css::beans::PropertyAttribute::BOUND;
}
- bool setUnknown = false;
+ bool bSetUnknown = false;
if (attr->isReadOnly()) {
attrAttribs |= css::beans::PropertyAttribute::READONLY;
- setUnknown = true;
+ bSetUnknown = true;
}
css::uno::Sequence<
css::uno::Reference<
css::reflection::XCompoundTypeDescription > > excs(
attr->getGetExceptions());
- bool getUnknown = false;
+ bool bGetUnknown = false;
//XXX Special interpretation of getter/setter exceptions only
// works if the specified exceptions are of the exact type, not
// of a supertype:
for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
if ( excs[j]->getName() ==
"com.sun.star.beans.UnknownPropertyException" )
{
- getUnknown = true;
+ bGetUnknown = true;
break;
}
}
@@ -187,14 +187,14 @@ void Data::initProperties(
for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
if ( excs[j]->getName() ==
"com.sun.star.beans.UnknownPropertyException" )
{
- setUnknown = true;
+ bSetUnknown = true;
} else if ( excs[j]->getName() ==
"com.sun.star.beans.PropertyVetoException" )
{
attrAttribs
|= css::beans::PropertyAttribute::CONSTRAINED;
}
}
- if (getUnknown && setUnknown) {
+ if (bGetUnknown && bSetUnknown) {
attrAttribs |= css::beans::PropertyAttribute::OPTIONAL;
}
css::uno::Reference< css::reflection::XTypeDescription > t(
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 42b0c62..a01028f 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1088,11 +1088,11 @@ bool SAL_CALL OKeySet::last( ) throw(SQLException,
RuntimeException)
bool OKeySet::last_checked( bool /* i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
- bool fetchedRow = fillAllRows();
+ bool bFetchedRow = fillAllRows();
m_aKeyIter = m_aKeyMap.end();
--m_aKeyIter;
- if ( !fetchedRow )
+ if ( !bFetchedRow )
{
invalidateRow();
}
@@ -1116,11 +1116,11 @@ bool OKeySet::absolute_checked( sal_Int32 row, bool /*
i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
OSL_ENSURE(row,"absolute(0) isn't allowed!");
- bool fetchedRow = false;
+ bool bFetchedRow = false;
if(row < 0)
{
if(!m_bRowCountFinal)
- fetchedRow = fillAllRows();
+ bFetchedRow = fillAllRows();
for(;row < 0 && m_aKeyIter != m_aKeyMap.begin();++row)
--m_aKeyIter;
@@ -1140,7 +1140,7 @@ bool OKeySet::absolute_checked( sal_Int32 row, bool /*
i_bFetchRow */ )
// that is fetchRow called at least once.
if ( bNext )
{
- fetchedRow = true;
+ bFetchedRow = true;
}
else
{
@@ -1163,7 +1163,7 @@ bool OKeySet::absolute_checked( sal_Int32 row, bool /*
i_bFetchRow */ )
++m_aKeyIter;
}
}
- if ( !fetchedRow )
+ if ( !bFetchedRow )
{
invalidateRow();
}
diff --git a/desktop/source/deployment/misc/dp_update.cxx
b/desktop/source/deployment/misc/dp_update.cxx
index 35bdd17..fd183ac 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -85,7 +85,7 @@ void getOwnUpdateInfos(
UpdateInfoMap& inout_map,
std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors,
bool & out_allFound)
{
- bool allHaveOwnUpdateInformation = true;
+ bool bAllHaveOwnUpdateInformation = true;
for (UpdateInfoMap::iterator i = inout_map.begin(); i != inout_map.end();
++i)
{
OSL_ASSERT(i->second.extension.is());
@@ -122,10 +122,10 @@ void getOwnUpdateInfos(
}
else
{
- allHaveOwnUpdateInformation &= false;
+ bAllHaveOwnUpdateInformation &= false;
}
}
- out_allFound = allHaveOwnUpdateInformation;
+ out_allFound = bAllHaveOwnUpdateInformation;
}
void getDefaultUpdateInfos(
@@ -186,16 +186,16 @@ bool onlyBundledExtensions(
std::vector< Reference<deployment::XPackage > > const * extensionList)
{
OSL_ASSERT(xExtMgr.is());
- bool onlyBundled = true;
+ bool bOnlyBundled = true;
if (extensionList)
{
typedef std::vector<Reference<deployment::XPackage > >::const_iterator
CIT;
- for (CIT i(extensionList->begin()), aEnd(extensionList->end());
onlyBundled && i != aEnd; ++i)
+ for (CIT i(extensionList->begin()), aEnd(extensionList->end());
bOnlyBundled && i != aEnd; ++i)
{
Sequence<Reference<deployment::XPackage> > seqExt =
xExtMgr->getExtensionsWithSameIdentifier(
dp_misc::getIdentifier(*i), (*i)->getName(),
Reference<ucb::XCommandEnvironment>());
- onlyBundled = containsBundledOnly(seqExt);
+ bOnlyBundled = containsBundledOnly(seqExt);
}
}
else
@@ -203,12 +203,12 @@ bool onlyBundledExtensions(
const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > >
> seqAllExt =
xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(),
Reference<ucb::XCommandEnvironment>());
- for (int pos(0), nLen(seqAllExt.getLength()); onlyBundled && pos !=
nLen; ++pos)
+ for (int pos(0), nLen(seqAllExt.getLength()); bOnlyBundled && pos !=
nLen; ++pos)
{
- onlyBundled = containsBundledOnly(seqAllExt[pos]);
+ bOnlyBundled = containsBundledOnly(seqAllExt[pos]);
}
}
- return onlyBundled;
+ return bOnlyBundled;
}
} // anon namespace
@@ -381,10 +381,10 @@ UpdateInfoMap getOnlineUpdateInfos(
//Now find the update information for the extensions which provide their
own
//URLs to update information.
- bool allInfosObtained = false;
- getOwnUpdateInfos(xContext, updateInformation, infoMap, out_errors,
allInfosObtained);
+ bool bAllInfosObtained = false;
+ getOwnUpdateInfos(xContext, updateInformation, infoMap, out_errors,
bAllInfosObtained);
- if (!allInfosObtained)
+ if (!bAllInfosObtained)
getDefaultUpdateInfos(xContext, updateInformation, infoMap,
out_errors);
return infoMap;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 84a0df1..113d67e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -458,25 +458,25 @@ bool SvxAutoCorrect::FnChgOrdinalNumber(
// Get the last number in the string to check
sal_Int32 nNumEnd = nEndPos;
- bool foundEnd = false;
- bool validNumber = true;
+ bool bFoundEnd = false;
+ bool isValidNumber = true;
sal_Int32 i = nEndPos;
while (i > nSttPos)
{
i--;
bool isDigit = rCC.isDigit(rTxt, i);
- if (foundEnd)
- validNumber |= isDigit;
+ if (bFoundEnd)
+ isValidNumber |= isDigit;
- if (isDigit && !foundEnd)
+ if (isDigit && !bFoundEnd)
{
- foundEnd = true;
+ bFoundEnd = true;
nNumEnd = i;
}
}
- if (foundEnd && validNumber) {
+ if (bFoundEnd && isValidNumber) {
sal_Int32 nNum = rTxt.copy(nSttPos, nNumEnd - nSttPos +
1).toInt32();
// Check if the characters after that number correspond to the
ordinal suffix
@@ -2160,7 +2160,7 @@ SvStringsISortDtor*
SvxAutoCorrectLanguageLists::GetCplSttExceptList()
bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const OUString& rNew)
{
- bool aRet = false;
+ bool bRet = false;
if( !rNew.isEmpty() && GetCplSttExceptList()->insert( rNew ).second )
{
MakeUserStorage_Impl();
@@ -2173,14 +2173,14 @@ bool
SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const OUString& rNew)
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
&aModifiedDate, &aModifiedTime );
aLastCheckTime = tools::Time( tools::Time::SYSTEM );
- aRet = true;
+ bRet = true;
}
- return aRet;
+ return bRet;
}
bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const OUString& rNew)
{
- bool aRet = false;
+ bool bRet = false;
SvStringsISortDtor* pExceptList = LoadWrdSttExceptList();
if( !rNew.isEmpty() && pExceptList && pExceptList->insert( rNew ).second )
{
@@ -2194,9 +2194,9 @@ bool
SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const OUString& rNew)
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
&aModifiedDate, &aModifiedTime );
aLastCheckTime = tools::Time( tools::Time::SYSTEM );
- aRet = true;
+ bRet = true;
}
- return aRet;
+ return bRet;
}
SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 10a4452..64202b6 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -79,7 +79,7 @@ class OOoRuleBasedBreakIterator : public
RuleBasedBreakIterator
void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const
css::lang::Locale& rLocale,
sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const
OUString& rText) throw(uno::RuntimeException)
{
- bool newBreak = false;
+ bool bNewBreak = false;
UErrorCode status = U_ZERO_ERROR;
sal_Int16 breakType = 0;
switch (rBreakType) {
@@ -178,13 +178,13 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
}
if (icuBI->aBreakIterator) {
icuBI->maLocale=rLocale;
- newBreak=true;
+ bNewBreak=true;
} else {
throw uno::RuntimeException();
}
}
- if (newBreak || icuBI->aICUText.pData != rText.pData)
+ if (bNewBreak || icuBI->aICUText.pData != rText.pData)
{
// UChar != sal_Unicode in MinGW
const UChar *pText = reinterpret_cast<const UChar *>(rText.getStr());
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 78008ee..04975ff 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -566,7 +566,7 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence<beans::PropertyVal
sal_Int16 natNum = 0;
sal_Int16 tableSize = 0;
const sal_Unicode *table = NULL; // initialize to avoid compiler
warning
- bool recycleSymbol = false;
+ bool bRecycleSymbol = false;
Locale locale;
OUString prefix;
@@ -705,42 +705,42 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence<beans::PropertyVal
case AIU_FULLWIDTH_JA:
table = table_AIUFullWidth_ja_JP;
tableSize = SAL_N_ELEMENTS(table_AIUFullWidth_ja_JP);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case AIU_HALFWIDTH_JA:
table = table_AIUHalfWidth_ja_JP;
tableSize = SAL_N_ELEMENTS(table_AIUHalfWidth_ja_JP);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case IROHA_FULLWIDTH_JA:
table = table_IROHAFullWidth_ja_JP;
tableSize = SAL_N_ELEMENTS(table_IROHAFullWidth_ja_JP);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case IROHA_HALFWIDTH_JA:
table = table_IROHAHalfWidth_ja_JP;
tableSize = SAL_N_ELEMENTS(table_IROHAHalfWidth_ja_JP);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case HANGUL_JAMO_KO:
table = table_HangulJamo_ko;
tableSize = SAL_N_ELEMENTS(table_HangulJamo_ko);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case HANGUL_SYLLABLE_KO:
table = table_HangulSyllable_ko;
tableSize = SAL_N_ELEMENTS(table_HangulSyllable_ko);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case HANGUL_CIRCLED_JAMO_KO:
table = table_HangulCircledJamo_ko;
tableSize = SAL_N_ELEMENTS(table_HangulCircledJamo_ko);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case HANGUL_CIRCLED_SYLLABLE_KO:
table = table_HangulCircledSyllable_ko;
tableSize = SAL_N_ELEMENTS(table_HangulCircledSyllable_ko);
- recycleSymbol = true;
+ bRecycleSymbol = true;
break;
case CHARS_ARABIC:
lcl_formatChars(table_Alphabet_ar,
SAL_N_ELEMENTS(table_Alphabet_ar), number - 1, result);
@@ -861,7 +861,7 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence<beans::PropertyVal
uno::Reference<NativeNumberSupplierService> xNatNum(new
NativeNumberSupplierService);
result += xNatNum->getNativeNumberString(OUString::number( number
), locale, natNum);
} else if (tableSize) {
- if ( number > tableSize && !recycleSymbol)
+ if ( number > tableSize && !bRecycleSymbol)
result += OUString::number( number);
else
result += OUString(&table[--number % tableSize], 1);
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index b8e74a3..aadc58d 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -95,23 +95,23 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode
*str, sal_Int32 begin,
if ( len <= number->multiplierExponent[number->exponentCount-1] ) {
if (number->multiplierExponent[number->exponentCount-1] > 1) {
sal_Int16 i;
- bool notZero = false;
+ bool bNotZero = false;
for (i = 0; i < len; i++, begin++) {
- if (notZero || str[begin] != NUMBER_ZERO) {
+ if (bNotZero || str[begin] != NUMBER_ZERO) {
dst[count] = numberChar[str[begin] - NUMBER_ZERO];
if (useOffset)
offset[count] = begin + startPos;
count++;
- notZero = true;
+ bNotZero = true;
}
}
- if (notZero && multiChar > 0) {
+ if (bNotZero && multiChar > 0) {
dst[count] = multiChar;
if (useOffset)
offset[count] = begin + startPos;
count++;
}
- return notZero;
+ return bNotZero;
} else if (str[begin] != NUMBER_ZERO) {
if (!(number->numberFlag & (multiChar_index < 0 ? 0 :
NUMBER_OMIT_ONE_CHECK(multiChar_index))) || str[begin] != NUMBER_ONE) {
dst[count] = numberChar[str[begin] - NUMBER_ZERO];
@@ -133,18 +133,18 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode
*str, sal_Int32 begin,
}
return str[begin] != NUMBER_ZERO;
} else {
- bool printPower = false;
+ bool bPrintPower = false;
// sal_Int16 last = 0;
for (sal_Int16 i = 1; i <= number->exponentCount; i++) {
sal_Int32 tmp = len - (i == number->exponentCount ? 0 :
number->multiplierExponent[i]);
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
