diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 22:14:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:53 +0200 |
| commit | 2f467535231af44af5ee857e2444a87779e82b2c (patch) | |
| tree | 1b16478b1bb4b2f6deecd8e4a846a6b8e75d5ed1 | |
| parent | cef74993a96feae0dd7489a11dfdf062687c0868 (diff) | |
svtools: replace boost::ptr_vector with std::vector
Change-Id: I70a2919e43495ce10c0c90ec91a25604d82e7d28
| -rw-r--r-- | include/svtools/parhtml.hxx | 4 | ||||
| -rw-r--r-- | svtools/inc/pch/precompiled_svt.hxx | 1 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index ee5c41979f89..85a514f0dc37 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -23,7 +23,7 @@ #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> namespace com { namespace sun { namespace star { namespace document { @@ -118,7 +118,7 @@ public: //SvxAdjust GetAdjust() const; // <P,TH,TD ALIGN=> }; -typedef ::boost::ptr_vector<HTMLOption> HTMLOptions; +typedef ::std::vector<HTMLOption> HTMLOptions; class SVT_DLLPUBLIC HTMLParser : public SvParser { diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index ba111fc0760e..023fb2ce0de8 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -282,7 +282,6 @@ #include <memory> #include <numeric> #include <o3tl/numeric.hxx> -#include <o3tl/ptr_container.hxx> #include <officecfg/Office/Common.hxx> #include <osl/conditn.hxx> #include <osl/diagnose.h> diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 2627bc1ac9b9..b9e228a849ea 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -20,7 +20,6 @@ #include <ctype.h> #include <comphelper/string.hxx> -#include <o3tl/ptr_container.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/color.hxx> @@ -1577,10 +1576,9 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) } // Token is known and can be saved - std::unique_ptr<HTMLOption> pOption( - new HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue)); + maOptions.push_back( + HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue)); - o3tl::ptr_container::push_back(maOptions, std::move(pOption)); } else // Ignore white space and unexpected characters |