tdf#75757 Remove inheritance from std container

Change-Id: I476c83ea195281f977bb6fa5019f983609ff3a6e
Reviewed-on: https://gerrit.libreoffice.org/29347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>

2 files changed, 16 insertions, 2 deletions

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index e09129a34482..469fba1ea8ac 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -30,6 +30,7 @@
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShape.hxx>
 #include "fesh.hxx"
+#include <list>
 #include <vector>
 #include <set>
 #include <o3tl/typed_flags_set.hxx>
@@ -44,7 +45,6 @@ class SwAccessibleContext;
 class SwAccessibleContextMap_Impl;
 class SwAccessibleEventList_Impl;
 class SwAccessibleEventMap_Impl;
-class SwShapeList_Impl;
 class SdrObject;
 namespace accessibility { class AccessibleShape; }
 class SwAccessibleShapeMap_Impl;
@@ -56,6 +56,18 @@ class SwAccPreviewData;
 struct PreviewPage;
 namespace vcl { class Window; }
 
+// The shape list is filled if an accessible shape is destroyed. It
+// simply keeps a reference to the accessible shape's XShape. These
+// references are destroyed within the EndAction when firing events.
+// There are two reason for this. First of all, a new accessible shape
+// for the XShape might be created soon. It's then cheaper if the XShape
+// still exists. The other reason are situations where an accessible shape
+// is destroyed within an SwFrameFormat::Modify. In this case, destroying
+// the XShape at the same time (indirectly by destroying the accessible
+// shape) leads to an assert, because a client of the Modify is destroyed
+// within a Modify call.
+using SwShapeList_Impl = std::list<css::uno::Reference<css::drawing::XShape>>;
+
 enum class AccessibleStates
 {
     NONE                   = 0x0000,
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 713a2d4aa5e3..f5861b088b51 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -57,7 +57,6 @@ class SwTableFormat;
 class SwTableLine;
 class SwTableLineFormat;
 class SwTableNode;
-class SwTableToTextSaves;
 class SwTextFormatColl;
 class SwTextNode;
 class SwUndoTableToText;
@@ -83,6 +82,9 @@ public:
     bool Seek_Entry(SwNode* rP, sal_uInt16* pnPos) const;
 };
 
+struct SwTableToTextSave;
+using SwTableToTextSaves = std::vector<std::unique_ptr<SwTableToTextSave>>;
+
 class SW_DLLPUBLIC SwNodes
     : private BigPtrArray
 {