Kaydet (Commit) 25a6599a authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in desktop

Change-Id: I72df89e96ea31c684a5255e19796191481bc8be5
Reviewed-on: https://gerrit.libreoffice.org/68231
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3010e0a6
...@@ -116,7 +116,6 @@ class ProgressCmdEnv ...@@ -116,7 +116,6 @@ class ProgressCmdEnv
{ {
uno::Reference< task::XInteractionHandler2> m_xHandler; uno::Reference< task::XInteractionHandler2> m_xHandler;
uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< task::XAbortChannel> m_xAbortChannel;
DialogHelper* m_pDialogHelper; DialogHelper* m_pDialogHelper;
OUString m_sTitle; OUString m_sTitle;
...@@ -282,7 +281,6 @@ void ProgressCmdEnv::stopProgress() ...@@ -282,7 +281,6 @@ void ProgressCmdEnv::stopProgress()
void ProgressCmdEnv::progressSection( const OUString &rText, void ProgressCmdEnv::progressSection( const OUString &rText,
const uno::Reference< task::XAbortChannel > &xAbortChannel ) const uno::Reference< task::XAbortChannel > &xAbortChannel )
{ {
m_xAbortChannel = xAbortChannel;
m_nCurrentProgress = 0; m_nCurrentProgress = 0;
if ( m_pDialogHelper ) if ( m_pDialogHelper )
{ {
......
...@@ -387,7 +387,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName) ...@@ -387,7 +387,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
// get current migration step // get current migration step
theNameAccess->getByName(rMigrationStep) >>= tmpAccess; theNameAccess->getByName(rMigrationStep) >>= tmpAccess;
migration_step tmpStep; migration_step tmpStep;
tmpStep.name = rMigrationStep;
// read included files from current step description // read included files from current step description
if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq) { if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq) {
......
...@@ -55,7 +55,6 @@ typedef std::unique_ptr< strings_v > strings_vr; ...@@ -55,7 +55,6 @@ typedef std::unique_ptr< strings_v > strings_vr;
struct migration_step struct migration_step
{ {
OUString name;
strings_v includeFiles; strings_v includeFiles;
strings_v excludeFiles; strings_v excludeFiles;
strings_v includeConfig; strings_v includeConfig;
......
...@@ -113,8 +113,7 @@ void Acceptor::run() ...@@ -113,8 +113,7 @@ void Acceptor::run()
SAL_INFO( "desktop.offacc", "Acceptor::run connection " << aDescription ); SAL_INFO( "desktop.offacc", "Acceptor::run connection " << aDescription );
// create instanceprovider for this connection // create instanceprovider for this connection
Reference< XInstanceProvider > rInstanceProvider( Reference< XInstanceProvider > rInstanceProvider(new AccInstanceProvider(m_rContext));
new AccInstanceProvider(m_rContext, rConnection));
// create the bridge. The remote end will have a reference to this bridge // 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 // thus preventing the bridge from being disposed. When the remote end releases
// the bridge, it will be destructed. // the bridge, it will be destructed.
...@@ -217,10 +216,9 @@ Reference< XInterface > Acceptor::impl_getInstance( const Reference< XMultiServi ...@@ -217,10 +216,9 @@ Reference< XInterface > Acceptor::impl_getInstance( const Reference< XMultiServi
} }
// InstanceProvider // InstanceProvider
AccInstanceProvider::AccInstanceProvider(const Reference<XComponentContext>& rxContext, const Reference<XConnection>& rConnection) AccInstanceProvider::AccInstanceProvider(const Reference<XComponentContext>& rxContext)
{ {
m_rContext = rxContext; m_rContext = rxContext;
m_rConnection = rConnection;
} }
AccInstanceProvider::~AccInstanceProvider() AccInstanceProvider::~AccInstanceProvider()
......
...@@ -92,11 +92,9 @@ class AccInstanceProvider : public ::cppu::WeakImplHelper<css::bridge::XInstance ...@@ -92,11 +92,9 @@ class AccInstanceProvider : public ::cppu::WeakImplHelper<css::bridge::XInstance
{ {
private: private:
css::uno::Reference<css::uno::XComponentContext> m_rContext; css::uno::Reference<css::uno::XComponentContext> m_rContext;
css::uno::Reference<css::connection::XConnection> m_rConnection;
public: public:
AccInstanceProvider(const css::uno::Reference< css::uno::XComponentContext >& rxContext, AccInstanceProvider(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
const css::uno::Reference< css::connection::XConnection >& rConnection);
virtual ~AccInstanceProvider() override; virtual ~AccInstanceProvider() override;
// XInstanceProvider // XInstanceProvider
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment