summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-07 17:16:26 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-08 08:08:35 +0200
commita209172669e7a2de6065486e385e4e3007b74bd2 (patch)
tree4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /desktop
parent2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff)
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e Reviewed-on: https://gerrit.libreoffice.org/40843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx21
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx2
2 files changed, 7 insertions, 16 deletions
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 732c479d9036..1ac6ae7ecb92 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -71,10 +71,10 @@ void BaseCommandEnv::handle(
{
}
-void BaseCommandEnv::handle_(bool approve, bool abort,
+void BaseCommandEnv::handle_(bool approve,
Reference< task::XInteractionRequest> const & xRequest )
{
- if (!approve && !abort)
+ if (!approve)
{
//not handled so far -> forwarding
if (m_forwardHandler.is())
@@ -101,15 +101,6 @@ void BaseCommandEnv::handle_(bool approve, bool abort,
approve = false;
}
}
- else if (abort) {
- Reference< task::XInteractionAbort > xInteractionAbort(
- pConts[ pos ], uno::UNO_QUERY );
- if (xInteractionAbort.is()) {
- xInteractionAbort->select();
- // don't query again for ongoing continuations:
- abort = false;
- }
- }
}
}
@@ -158,7 +149,7 @@ void TmpRepositoryCommandEnv::handle(
approve = true;
}
- handle_(approve, false/*abort*/, xRequest);
+ handle_(approve, xRequest);
}
@@ -195,7 +186,7 @@ void LicenseCommandEnv::handle(
}
}
- handle_(approve, false/*abort*/, xRequest);
+ handle_(approve, xRequest);
}
@@ -219,7 +210,7 @@ void NoLicenseCommandEnv::handle(
{
approve = true;
}
- handle_(approve, false/*abort*/, xRequest);
+ handle_(approve, xRequest);
}
SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv()
@@ -238,7 +229,7 @@ void SilentCheckPrerequisitesCommandEnv::handle(
if (request >>= licExc)
{
- handle_(true, false, xRequest); // approve = true, abort = false
+ handle_(true, xRequest); // approve = true
}
else if ((request >>= platformExc)
|| (request >>= depExc))
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index a9f810b3c728..3f7798bc1fe7 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -37,7 +37,7 @@ class BaseCommandEnv
protected:
css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
- void handle_(bool approve, bool abort,
+ void handle_(bool approve,
css::uno::Reference< css::task::XInteractionRequest> const & xRequest );
public:
virtual ~BaseCommandEnv() override;