summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-10-02 22:19:38 +0200
committerMichael Stahl <mstahl@redhat.com>2015-10-02 23:31:28 +0200
commit38ea2d0ecc1d59844f9371ae6da7980c4e3a9e10 (patch)
tree31024c5f13a7d24c2579dd6742f0a6a334a9c2d1 /sw/inc
parent9b738520316b329251a9f815751fda4e25d25937 (diff)
sw: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: Ia9fa057971024f4af7d1ab8212412731b64728d7
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/dbmgr.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 0f5378afe250..d1dcad4eaab6 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -30,7 +30,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
+
+#include <memory>
+#include <vector>
namespace com{namespace sun{namespace star{
namespace sdbc{
@@ -136,7 +138,7 @@ struct SwDSParam : public SwDBData
bAfterSelection = true;
}
};
-typedef boost::ptr_vector<SwDSParam> SwDSParamArr;
+typedef std::vector<std::unique_ptr<SwDSParam>> SwDSParams_t;
struct SwMergeDescriptor
{
@@ -198,7 +200,7 @@ friend class SwConnectionDisposedListener_Impl;
bool bMergeSilent : 1; ///< suppress display of dialogs/boxes (used when called over API)
bool bMergeLock : 1; /**< prevent update of database fields while document is
actually printed at the SwViewShell */
- SwDSParamArr aDataSourceParams;
+ SwDSParams_t m_DataSourceParams;
SwDBManager_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send
/// Name of the embedded database that's included in the current document.
@@ -309,7 +311,7 @@ public:
const SwDSParam* CreateDSData(const SwDBData& rData)
{return FindDSData(rData, true);}
- const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;}
+ const SwDSParams_t& GetDSParamArray() const { return m_DataSourceParams; }
/// close all data sources - after fields were updated
void CloseAll(bool bIncludingMerge = true);