include/svl/aeitem.hxx | 4 +++-
svl/source/items/aeitem.cxx | 3 ---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit d50eea97b3d2e1e1e47f7cdad4cb0c24fb0ed26d
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Oct 1 18:58:45 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 2 13:57:54 2019 +0200
Avoid std::vector inheritance for SfxAllEnumValueArr
No need to inherit, just create a typedef
Change-Id: Ifeabb90e640e10e590f793716c022f91850ae8b9
Reviewed-on: https://gerrit.libreoffice.org/79991
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 621468f32988..648986825bcf 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -24,8 +24,10 @@
#include <cstddef>
#include <memory>
+#include <vector>
-class SfxAllEnumValueArr;
+struct SfxAllEnumValue_Impl;
+typedef std::vector<SfxAllEnumValue_Impl> SfxAllEnumValueArr;
// MSVC hack:
class SAL_DLLPUBLIC_RTTI SfxAllEnumItem_Base: public SfxEnumItem<sal_uInt16> {
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 37962147e70c..03431b91594a 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -22,7 +22,6 @@
#include <climits>
#include <cstddef>
-#include <vector>
struct SfxAllEnumValue_Impl
{
@@ -30,8 +29,6 @@ struct SfxAllEnumValue_Impl
OUString aText;
};
-class SfxAllEnumValueArr : public std::vector<SfxAllEnumValue_Impl> {};
-
SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal):
SfxAllEnumItem_Base(which, nVal)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
