sc/inc/cellsuno.hxx | 8 +++-----
sc/source/ui/unoobj/cellsuno.cxx | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 188632be71502a2e16d9b688761c7e4870ce35c6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jun 16 10:37:49 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jun 17 10:20:37 2020 +0200
inline typedef
Change-Id: Ib3c11a59d155e308caa3f11f43bb2c6552569889
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96515
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index f737d5d3523c..32dc4bc5d084 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1160,8 +1160,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
};
-typedef std::vector< ScRangeList > ScMyRangeLists;
-
class ScUniqueCellFormatsObj final : public cppu::WeakImplHelper<
css::container::XIndexAccess,
css::container::XEnumerationAccess,
@@ -1170,7 +1168,7 @@ class ScUniqueCellFormatsObj final : public
cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- ScMyRangeLists aRangeLists;
+ std::vector<ScRangeList> aRangeLists;
public:
ScUniqueCellFormatsObj(ScDocShell* pDocSh, const
ScRange& rR);
@@ -1202,12 +1200,12 @@ class ScUniqueCellFormatsEnumeration final : public
cppu::WeakImplHelper<
public SfxListener
{
private:
- ScMyRangeLists aRangeLists;
+ std::vector<ScRangeList> aRangeLists;
ScDocShell* pDocShell;
sal_Int32 nCurrentPosition;
public:
- ScUniqueCellFormatsEnumeration(ScDocShell*
pDocShell, const ScMyRangeLists& rRangeLists);
+ ScUniqueCellFormatsEnumeration(ScDocShell*
pDocShell, const std::vector<ScRangeList>& rRangeLists);
virtual ~ScUniqueCellFormatsEnumeration() override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 43870353bcbb..2db272db63cc 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -9315,7 +9315,7 @@ uno::Reference<container::XEnumeration> SAL_CALL
ScUniqueCellFormatsObj::createE
return nullptr;
}
-ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell*
pDocSh, const ScMyRangeLists& rRangeLists) :
+ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell*
pDocSh, const std::vector<ScRangeList>& rRangeLists) :
aRangeLists(rRangeLists),
pDocShell( pDocSh ),
nCurrentPosition(0)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
