sw/inc/doc.hxx | 1 -
sw/inc/docary.hxx | 2 +-
sw/source/core/tox/tox.cxx | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 680e72353350f6aeaeef0114830b4f941749ece3
Author: Noel Grandin <noelgran...@gmail.com>
Date: Mon May 1 11:24:26 2017 +0200
SwTOXTypes can just be a std::vector typedef
Change-Id: I0b20f4dfdbc692e9122f64a11b65bd4234e00ee7
Reviewed-on: https://gerrit.libreoffice.org/37120
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f75ed2775890..61d57940d2f9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -117,7 +117,6 @@ class SwSectionData;
class SwSelBoxes;
class SwTableAutoFormatTable;
class SwTOXBaseSection;
-class SwTOXTypes;
class SwTabCols;
class SwTable;
class SwTableAutoFormat;
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 6d25e85dcc74..255bc8127ff7 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -300,7 +300,7 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {};
+typedef std::vector<SwTOXType*> SwTOXTypes;
class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> {
public:
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index cb26ad4a6d1b..5b00f54c474a 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -457,7 +457,7 @@ void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase&
rSource )
{
maMSTOCExpression = rSource.maMSTOCExpression;
SwTOXType* pType = const_cast<SwTOXType*>(rSource.GetTOXType());
- if( pDoc && !pDoc->GetTOXTypes().Contains( pType ))
+ if( pDoc && std::find(pDoc->GetTOXTypes().begin(),
pDoc->GetTOXTypes().end(), pType) == pDoc->GetTOXTypes().end())
{
// type not in pDoc, so create it now
const SwTOXTypes& rTypes = pDoc->GetTOXTypes();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
