summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:57:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-05 12:12:26 +0100
commit191f85df5851473af270be486f95f940e3091fef (patch)
tree753d9513ccda8ee2a132bdad74eedc47bd71b179 /configmgr
parent983566119c926d0e2478f74548f00a789de55c15 (diff)
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad, and adds a bunch more fixes. Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a Reviewed-on: https://gerrit.libreoffice.org/68680 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/readwriteaccess.cxx2
-rw-r--r--configmgr/source/rootaccess.cxx2
-rw-r--r--configmgr/source/rootaccess.hxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 422451c3e319..c7721c16ac57 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -88,7 +88,7 @@ private:
virtual sal_Bool SAL_CALL hasPendingChanges() override
{ return getRoot()->hasPendingChanges(); }
- virtual css::util::ChangesSet SAL_CALL getPendingChanges() override
+ virtual css::uno::Sequence< ::css::util::ElementChange > SAL_CALL getPendingChanges() override
{ return getRoot()->getPendingChanges(); }
css::beans::Property SAL_CALL getPropertyByHierarchicalName(
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 8b707bbe87d1..25673975a9e6 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -180,7 +180,7 @@ sal_Bool RootAccess::hasPendingChanges() {
return !changes.empty();
}
-css::util::ChangesSet RootAccess::getPendingChanges()
+css::uno::Sequence< ::css::util::ElementChange > RootAccess::getPendingChanges()
{
assert(thisIs(IS_UPDATE));
osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 9564bbf34a63..389cc9ad62b1 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -90,7 +90,7 @@ public:
virtual sal_Bool SAL_CALL hasPendingChanges() override;
- virtual css::util::ChangesSet SAL_CALL getPendingChanges() override;
+ virtual css::uno::Sequence< ::css::util::ElementChange > SAL_CALL getPendingChanges() override;
private:
virtual ~RootAccess() override;