summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-27 15:55:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-28 07:18:23 +0200
commit18f80da7a689ab962735c0f657497b8f1ed4d606 (patch)
tree0053645981775d0ed756f4e751c9626e492b5b94 /framework
parentb32ead5dd27c6f2b760e4196ebe0378fb8ec1a69 (diff)
loplugin:checkunusedparams more part2
Change-Id: Ibb940c2a7098313dfa282734894b1abc1ac40bc2 Reviewed-on: https://gerrit.libreoffice.org/40489 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx9
-rw-r--r--framework/source/accelerators/presethandler.cxx4
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx4
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx6
5 files changed, 10 insertions, 15 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2f257eb11926..ecc33938ab75 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -799,19 +799,16 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
SolarMutexGuard g;
bool bPreferred;
- css::uno::Reference< css::container::XNameAccess > xAccess;
bPreferred = true;
// on-demand creation of the primary write cache
impl_getCFG(bPreferred, true);
- m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess;
- impl_ts_save(bPreferred, xAccess);
+ impl_ts_save(bPreferred);
bPreferred = false;
// on-demand creation of the secondary write cache
impl_getCFG(bPreferred, true);
- m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- impl_ts_save(bPreferred, xAccess);
+ impl_ts_save(bPreferred);
}
void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
@@ -1097,7 +1094,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( bool bPreferred, const css:
m_aSecondaryReadCache.takeOver(aReadCache);
}
-void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/)
+void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred)
{
if (bPreferred)
{
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 22519dff34f8..65af45a5c3e0 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -297,7 +297,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser
return m_xWorkingStorageUser;
}
-css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
+css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare()
{
css::uno::Reference< css::embed::XStorage > xWorking;
{
@@ -308,7 +308,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare
return SharedStorages::get().m_lStoragesShare.getParentStorage(xWorking);
}
-css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
+css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser()
{
css::uno::Reference< css::embed::XStorage > xWorking;
{
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index bb2fd77d927e..09b717f6d383 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -303,7 +303,7 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper<
private:
void impl_ts_load(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
- void impl_ts_save(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
+ void impl_ts_save(bool bPreferred);
void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const bool bPreferred);
void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const bool bPreferred);
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 1fe4d407a78b..da2d6b5b3736 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -202,8 +202,8 @@ class PresetHandler
@return css::embed::XStorage
A valid storage if a paranet exists. NULL otherwise.
*/
- css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild);
- css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild);
+ css::uno::Reference< css::embed::XStorage > getParentStorageShare();
+ css::uno::Reference< css::embed::XStorage > getParentStorageUser ();
/** @short free all internal structures and let this handler
work on a new type of configuration sets.
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 00c66f75be67..8b1e0bdc9a94 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -898,10 +898,8 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
// initialize root storages for all resource types
m_xUserRootCommit.set( m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
- m_xDefaultConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageShare(
- m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageShare());
- m_xUserConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageUser(
- m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
+ m_xDefaultConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageShare();
+ m_xUserConfigStorage = m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageUser();
if ( m_xUserConfigStorage.is() )
{