summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-22 20:27:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-23 11:55:27 +0100
commit25a6599a885facfbcb084042f4ac2a9b46794aca (patch)
tree65e4bc02fe731cd495a1c5794403ceb47a8de27f
parent3010e0a6b7f4f41f8bda43d0e9931ef731090f48 (diff)
loplugin:unusedfields in desktop
Change-Id: I72df89e96ea31c684a5255e19796191481bc8be5 Reviewed-on: https://gerrit.libreoffice.org/68231 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
-rw-r--r--desktop/source/migration/migration.cxx1
-rw-r--r--desktop/source/migration/migration_impl.hxx1
-rw-r--r--desktop/source/offacc/acceptor.cxx6
-rw-r--r--desktop/source/offacc/acceptor.hxx4
5 files changed, 3 insertions, 11 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 5c0b38da671e..5e66b5be8ca8 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -116,7 +116,6 @@ class ProgressCmdEnv
{
uno::Reference< task::XInteractionHandler2> m_xHandler;
uno::Reference< uno::XComponentContext > m_xContext;
- uno::Reference< task::XAbortChannel> m_xAbortChannel;
DialogHelper* m_pDialogHelper;
OUString m_sTitle;
@@ -282,7 +281,6 @@ void ProgressCmdEnv::stopProgress()
void ProgressCmdEnv::progressSection( const OUString &rText,
const uno::Reference< task::XAbortChannel > &xAbortChannel )
{
- m_xAbortChannel = xAbortChannel;
m_nCurrentProgress = 0;
if ( m_pDialogHelper )
{
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 7a4476f69319..4bccdfa46d3f 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -387,7 +387,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
// get current migration step
theNameAccess->getByName(rMigrationStep) >>= tmpAccess;
migration_step tmpStep;
- tmpStep.name = rMigrationStep;
// read included files from current step description
if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq) {
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index ba9a4b198de1..f065ab1b5f39 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -55,7 +55,6 @@ typedef std::unique_ptr< strings_v > strings_vr;
struct migration_step
{
- OUString name;
strings_v includeFiles;
strings_v excludeFiles;
strings_v includeConfig;
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 13d92c6bd216..d806ea7471e6 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -113,8 +113,7 @@ void Acceptor::run()
SAL_INFO( "desktop.offacc", "Acceptor::run connection " << aDescription );
// create instanceprovider for this connection
- Reference< XInstanceProvider > rInstanceProvider(
- new AccInstanceProvider(m_rContext, rConnection));
+ Reference< XInstanceProvider > rInstanceProvider(new AccInstanceProvider(m_rContext));
// create the bridge. The remote end will have a reference to this bridge
// thus preventing the bridge from being disposed. When the remote end releases
// the bridge, it will be destructed.
@@ -217,10 +216,9 @@ Reference< XInterface > Acceptor::impl_getInstance( const Reference< XMultiServi
}
// InstanceProvider
-AccInstanceProvider::AccInstanceProvider(const Reference<XComponentContext>& rxContext, const Reference<XConnection>& rConnection)
+AccInstanceProvider::AccInstanceProvider(const Reference<XComponentContext>& rxContext)
{
m_rContext = rxContext;
- m_rConnection = rConnection;
}
AccInstanceProvider::~AccInstanceProvider()
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index bbafc03030f1..67dd66928669 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -92,11 +92,9 @@ class AccInstanceProvider : public ::cppu::WeakImplHelper<css::bridge::XInstance
{
private:
css::uno::Reference<css::uno::XComponentContext> m_rContext;
- css::uno::Reference<css::connection::XConnection> m_rConnection;
public:
- AccInstanceProvider(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const css::uno::Reference< css::connection::XConnection >& rConnection);
+ AccInstanceProvider(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
virtual ~AccInstanceProvider() override;
// XInstanceProvider