[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Feb 22 06:40:14 UTC 2019
include/ucbhelper/interactionrequest.hxx | 1 -
ucb/source/cacher/cachedcontentresultsetstub.cxx | 8 +++-----
ucb/source/cacher/cachedcontentresultsetstub.hxx | 5 +----
ucb/source/ucp/hierarchy/hierarchyuri.cxx | 2 --
ucb/source/ucp/hierarchy/hierarchyuri.hxx | 1 -
ucb/source/ucp/tdoc/tdoc_uri.cxx | 9 ---------
ucb/source/ucp/tdoc/tdoc_uri.hxx | 2 --
ucbhelper/source/provider/interactionrequest.cxx | 5 +----
8 files changed, 5 insertions(+), 28 deletions(-)
New commits:
commit 131cc96a890b8988703532d09773bb0bde20ee8a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 21 16:03:13 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 22 07:39:44 2019 +0100
loplugin:unusedfields in ucb,ucbhelper
Change-Id: Id15c92e54669bd5f26adfe0d0b9dda0e8894ccf3
Reviewed-on: https://gerrit.libreoffice.org/68161
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 74df7f1f6c87..fca1a63c2cdd 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -314,7 +314,6 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
OUString m_aRealm;
OUString m_aUserName;
OUString m_aPassword;
- OUString m_aAccount;
css::ucb::RememberAuthentication m_eRememberPasswordMode;
css::ucb::RememberAuthentication const m_eDefaultRememberPasswordMode;
css::ucb::RememberAuthentication const m_eDefaultRememberAccountMode;
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index b9085f7ac323..a648beac5e76 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -497,10 +497,8 @@ FetchResult SAL_CALL CachedContentResultSetStub
// class CachedContentResultSetStubFactory
-CachedContentResultSetStubFactory::CachedContentResultSetStubFactory(
- const Reference< XMultiServiceFactory > & rSMgr )
+CachedContentResultSetStubFactory::CachedContentResultSetStubFactory()
{
- m_xSMgr = rSMgr;
}
CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory()
@@ -546,10 +544,10 @@ XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory,
OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
-CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
+CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & )
{
css::lang::XServiceInfo* pX =
- static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetStubFactory( rSMgr ));
+ static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetStubFactory);
return css::uno::Reference< css::uno::XInterface >::query( pX );
}
css::uno::Sequence< OUString >
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index c4ba74410680..5a4182a63efd 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -146,12 +146,9 @@ class CachedContentResultSetStubFactory final
, public css::lang::XServiceInfo
, public css::ucb::XCachedContentResultSetStubFactory
{
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr;
-
public:
- CachedContentResultSetStubFactory(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+ CachedContentResultSetStubFactory();
virtual ~CachedContentResultSetStubFactory() override;
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 8b7402d22dac..6bd2fc5952f1 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -46,7 +46,6 @@ void HierarchyUri::init() const
// Note: Maybe it's a re-init, setUri only resets m_aPath!
m_aService.clear();
m_aParentUri.clear();
- m_aName.clear();
// URI must match at least: <sheme>:
if ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 )
@@ -165,7 +164,6 @@ void HierarchyUri::init() const
( nLastSlash != m_aUri.getLength() - 1 ) ) // root
{
m_aParentUri = m_aUri.copy( 0, nLastSlash );
- m_aName = m_aUri.copy( nLastSlash + 1 );
}
// success
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index 4e67db7751ed..12973a9c3326 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -35,7 +35,6 @@ class HierarchyUri
mutable OUString m_aParentUri;
mutable OUString m_aService;
mutable OUString m_aPath;
- mutable OUString m_aName;
mutable bool m_bValid;
private:
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 126ef346b202..4c65da63b2b3 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -105,15 +105,6 @@ void Uri::init() const
m_aDocId = m_aPath.copy( 1, nSlash - 1 );
}
- if ( !m_aDocId.isEmpty() )
- {
- sal_Int32 nSlash = m_aPath.indexOf( '/', 1 );
- if ( nSlash != - 1 )
- m_aInternalPath = m_aPath.copy( nSlash );
- else
- m_aInternalPath = "/";
- }
-
m_eState = VALID;
}
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index dad3db6d5667..15e51e6e8d36 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -37,7 +37,6 @@ class Uri
mutable OUString m_aParentUri;
mutable OUString m_aPath;
mutable OUString m_aDocId;
- mutable OUString m_aInternalPath;
mutable OUString m_aName;
mutable OUString m_aDecodedName;
mutable State m_eState;
@@ -86,7 +85,6 @@ inline void Uri::setUri( const OUString & rUri )
m_aUri = rUri;
m_aParentUri.clear();
m_aDocId.clear();
- m_aInternalPath.clear();
m_aPath.clear();
m_aName.clear();
m_aDecodedName.clear();
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index b0684c2f8357..277c2611ac95 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -623,13 +623,10 @@ InteractionSupplyAuthentication::canSetAccount()
// virtual
void SAL_CALL
-InteractionSupplyAuthentication::setAccount( const OUString& Account )
+InteractionSupplyAuthentication::setAccount( const OUString& /*Account*/ )
{
OSL_ENSURE( m_bCanSetAccount,
"InteractionSupplyAuthentication::setAccount - Not supported!" );
-
- if ( m_bCanSetAccount )
- m_aAccount = Account;
}
More information about the Libreoffice-commits
mailing list