diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-27 10:22:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-28 10:00:01 +0100 |
commit | ae25d5d3a333f58723eb9449cd3694cc0b80b3a6 (patch) | |
tree | ea2e7aa8375bb5142c7a67bbf4def4cc06269037 /ucb/source/ucp/file | |
parent | 6db4b97ee12805ce993bd7663a0613b4b4f25587 (diff) |
loplugin:unusedfields
Change-Id: Iffbb4e7107a0b1ae35c879c193a9ec209addf453
Reviewed-on: https://gerrit.libreoffice.org/64144
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinsreq.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinsreq.hxx | 1 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 15 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 11 |
5 files changed, 7 insertions, 32 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 952badaab9da..eb2d7d9b8489 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -264,9 +264,8 @@ BaseContent::createCommandIdentifier() void SAL_CALL -BaseContent::abort( sal_Int32 CommandId ) +BaseContent::abort( sal_Int32 /*CommandId*/ ) { - m_pMyShell->abort( CommandId ); } diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 9275b47aeab3..359b420ee181 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -45,17 +45,16 @@ XInteractionRequestImpl::XInteractionRequestImpl( TaskManager *pShell,sal_Int32 CommandId) : p1( new XInteractionSupplyNameImpl ), p2( new XInteractionAbortImpl ), - m_nErrorCode(0), - m_nMinorError(0), m_xOrigin(xOrigin) { + sal_Int32 nErrorCode(0), nMinorError(0); if( pShell ) - pShell->retrieveError(CommandId,m_nErrorCode,m_nMinorError); + pShell->retrieveError(CommandId,nErrorCode,nMinorError); std::vector<uno::Reference<task::XInteractionContinuation>> continuations{ Reference<XInteractionContinuation>(p1), Reference<XInteractionContinuation>(p2) }; Any aAny; - if(m_nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) + if(nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) { NameClashException excep; excep.Name = aClashingName; @@ -64,7 +63,7 @@ XInteractionRequestImpl::XInteractionRequestImpl( excep.Message = "folder exists and overwrite forbidden"; aAny <<= excep; } - else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) + else if(nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) { InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 302c7fcc59d0..035b51a05ea8 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -131,7 +131,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< XInteractionSupplyNameImpl* const p1; XInteractionAbortImpl* const p2; - sal_Int32 m_nErrorCode,m_nMinorError; css::uno::Reference<css::task::XInteractionRequest> m_xRequest; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 7bdd707b9b10..f3f32ccfe18b 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -415,21 +415,6 @@ TaskManager::endTask( sal_Int32 CommandId, } -void -TaskManager::abort( sal_Int32 CommandId ) -{ - if( CommandId ) - { - osl::MutexGuard aGuard( m_aMutex ); - TaskMap::iterator it = m_aTaskMap.find( CommandId ); - if( it == m_aTaskMap.end() ) - return; - else - it->second.abort(); - } -} - - void TaskManager::clearError( sal_Int32 CommandId ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 8de0bae31198..2c20b350b5f2 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -88,7 +88,7 @@ namespace fileaccess { private: - bool m_bAbort,m_bHandled; + bool m_bHandled; sal_Int32 m_nErrorCode,m_nMinorCode; css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment; @@ -98,19 +98,13 @@ namespace fileaccess explicit TaskHandling( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) - : m_bAbort( false ), - m_bHandled( false ), + : m_bHandled( false ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorCode( TASKHANDLER_NO_ERROR ), m_xCommandEnvironment( xCommandEnv ) { } - void abort() - { - m_bAbort = true; - } - void setHandled() { m_bHandled = true; @@ -253,7 +247,6 @@ namespace fileaccess const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ); sal_Int32 getCommandId(); - void abort( sal_Int32 CommandId ); /** |