summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-23 16:41:52 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-12-24 07:28:28 +0000
commite3a31fcca771432a38e4c2e7cc4c4c6c1c157ee9 (patch)
tree0de9af64a417624e779a6080825d50f55e448119 /ucb
parent4dfba3b59021f55957fc486531f8fdc67cc307b0 (diff)
loplugin:unusedfields
Change-Id: I979592adb978c3757a1e54615021ee424a2e02bf Reviewed-on: https://gerrit.libreoffice.org/20892 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/core/ucbstore.cxx13
-rw-r--r--ucb/source/core/ucbstore.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.cxx5
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.hxx4
-rw-r--r--ucb/source/ucp/gio/gio_resultset.cxx2
5 files changed, 7 insertions, 19 deletions
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 80d39fed870d..00eee8f87ca4 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -313,7 +313,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
// Yep!
return Reference< XPersistentPropertySet >(
new PersistentPropertySet(
- m_xContext, *this, key ) );
+ *this, key ) );
}
else if ( create )
{
@@ -348,11 +348,6 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
{
// Fill new item...
-// // Set Values
-// xNameReplace->replaceByName(
-// OUString("Values"),
-// makeAny( ... ) );
-
// Insert new item.
xContainer->insertByName(
key, makeAny( xNameReplace ) );
@@ -361,7 +356,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
return Reference< XPersistentPropertySet >(
new PersistentPropertySet(
- m_xContext, *this, key ) );
+ *this, key ) );
}
}
catch (const IllegalArgumentException&)
@@ -1136,11 +1131,9 @@ struct PersistentPropertySet_Impl
PersistentPropertySet::PersistentPropertySet(
- const Reference< XComponentContext >& xContext,
PropertySetRegistry& rCreator,
const OUString& rKey )
-: m_xContext( xContext ),
- m_pImpl( new PersistentPropertySet_Impl( rCreator, rKey ) )
+: m_pImpl( new PersistentPropertySet_Impl( rCreator, rKey ) )
{
// register at creator.
rCreator.add( this );
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 40e4470d7907..6a35e67e48df 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -181,7 +181,6 @@ class PersistentPropertySet : public cppu::WeakImplHelper <
css::beans::XPropertySetInfoChangeNotifier,
css::beans::XPropertyAccess >
{
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
std::unique_ptr<PersistentPropertySet_Impl> m_pImpl;
private:
@@ -192,7 +191,6 @@ private:
public:
PersistentPropertySet(
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
PropertySetRegistry& rCreator,
const OUString& rKey );
virtual ~PersistentPropertySet();
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index cc647a4ead19..38999de1b902 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -37,9 +37,8 @@ namespace gio
typedef std::vector< ResultListEntry* > ResultList;
-DataSupplier::DataSupplier( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
- const uno::Reference< ::gio::Content >& rContent, sal_Int32 nOpenMode )
- : mxContent(rContent), m_xSMgr(rxSMgr), mnOpenMode(nOpenMode), mbCountFinal(false)
+DataSupplier::DataSupplier( const uno::Reference< ::gio::Content >& rContent, sal_Int32 nOpenMode )
+ : mxContent(rContent), mnOpenMode(nOpenMode), mbCountFinal(false)
{
}
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index d359cc4ca12d..5f442f38ef4e 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -54,14 +54,12 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier
{
private:
css::uno::Reference< ::gio::Content > mxContent;
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr;
sal_Int32 mnOpenMode;
bool mbCountFinal;
bool getData();
ResultList maResults;
public:
- DataSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr,
- const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode );
+ DataSupplier( const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode );
virtual ~DataSupplier();
virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override;
diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx
index cfc114866f01..eeb0c4ab5ab8 100644
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_resultset.cxx
@@ -42,7 +42,7 @@ void DynamicResultSet::initStatic()
{
m_xResultSet1 = new ::ucbhelper::ResultSet(
m_xContext, m_aCommand.Properties,
- new DataSupplier( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), m_xContent, m_aCommand.Mode ), m_xEnv );
+ new DataSupplier( m_xContent, m_aCommand.Mode ), m_xEnv );
}
void DynamicResultSet::initDynamic()