summaryrefslogtreecommitdiff
path: root/sw/inc/fmtcol.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-09-11 16:22:36 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-11 17:44:28 +0200
commit3aec17698adc403eac018a5c9f00bf75640b1e42 (patch)
tree0a7110d36407ef822145233a9ed0cb52a10c8b89 /sw/inc/fmtcol.hxx
parenta0c41f53cd13f12d6e122c92e530bd0bd9c14d79 (diff)
sw: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I8baa909f5e3ddb6b227337f3731e4d4b4ca183e5
Diffstat (limited to 'sw/inc/fmtcol.hxx')
-rw-r--r--sw/inc/fmtcol.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 65ffe3901cf3..5ab04ac1ebba 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -22,9 +22,11 @@
#include "swdllapi.h"
#include <frmatr.hxx>
#include <swtypes.hxx>
-#include <boost/ptr_container/ptr_vector.hpp>
#include <rtl/ustring.hxx>
+#include <vector>
+#include <memory>
+
class SwDoc;
namespace sw{ class DocumentStylePoolManager; }
@@ -211,14 +213,14 @@ public:
void RegisterToFormat( SwFormat& );
};
-class SwFormatCollConditions : public boost::ptr_vector<SwCollCondition> {};
+class SwFormatCollConditions : public std::vector<std::unique_ptr<SwCollCondition>> {};
class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl
{
friend class SwDoc;
friend class ::sw::DocumentStylePoolManager;
protected:
- SwFormatCollConditions aCondColls;
+ SwFormatCollConditions m_CondColls;
SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
SwTextFormatColl* pDerFrom = 0 )
@@ -235,7 +237,7 @@ public:
virtual ~SwConditionTextFormatColl();
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
- const SwFormatCollConditions& GetCondColls() const { return aCondColls; }
+ const SwFormatCollConditions& GetCondColls() const { return m_CondColls; }
void InsertCondition( const SwCollCondition& rCond );
bool RemoveCondition( const SwCollCondition& rCond );