summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-10-18 19:26:00 +0900
committerDavid Tardon <dtardon@redhat.com>2014-10-22 11:02:55 +0000
commit294c80f1cd8279f9ef239b8251b8d4c51284e63d (patch)
treefbb3de1461ed5f8d1c88309f14831cb154e98cf9 /sw
parentf73112e2290bbbf7e86dcf72158cffc3f2d80a6a (diff)
fdo#75757: remove inheritance to std::vector
from SwOLENodes, by typedef'ing it instead. Change-Id: Idafdc69a4cf7629c8c82fab5f3472be3049dfeab Reviewed-on: https://gerrit.libreoffice.org/12019 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/docary.hxx2
-rw-r--r--sw/inc/node.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 333c91dad028..097a1b28cc05 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -238,7 +238,7 @@ public:
~SwUnoCrsrTbl();
};
-class SwOLENodes : public std::vector<SwOLENode*> {};
+typedef std::vector<SwOLENode*> SwOLENodes;
#endif // INCLUDED_SW_INC_DOCARY_HXX
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 6a2a49e1c9c3..f3ec9f04081b 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -33,6 +33,7 @@
#include <ndtyp.hxx>
#include <index.hxx>
#include <fmtcol.hxx>
+#include "docary.hxx"
// forward declarations
@@ -71,7 +72,6 @@ class IDocumentLinksAdministration;
class IDocumentFieldsAccess;
class IDocumentContentOperations;
class IDocumentListItems;
-class SwOLENodes;
class Point;
//UUUU