summaryrefslogtreecommitdiff
path: root/binaryurp/source/bridge.cxx
diff options
context:
space:
mode:
authorBenjamin Ni <benjaminniri@hotmail.com>2015-09-25 11:41:53 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-02 23:40:57 +0100
commitbe729e772196f33543e21cb9bac21add87726b20 (patch)
treef2150f458e2b07f8924b4702d37c09c8dd52215a /binaryurp/source/bridge.cxx
parent6ccf68622e51c1b727dd042c1c1a71b5d1fd6a12 (diff)
tdf#94269: Replace "n" prefix for bool variables with "b"
Change-Id: I178545792c7354a362658ac7ef8b1d4cf0865797 Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'binaryurp/source/bridge.cxx')
-rw-r--r--binaryurp/source/bridge.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 1534faf186e1..6641143b8f80 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(