diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 16:05:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 17:51:30 +0200 |
| commit | 741629f48a3fe72fb1e9fb68077446907585e852 (patch) | |
| tree | 83e3c60e5095825d31927748731de00d3e600aa3 | |
| parent | dff61f82c02b487fe3a81d457f9bdf672c33db09 (diff) | |
Some glue for using std::unique_ptr with the Boost Pointer Container Library
Change-Id: Ie975e963ed64fb96542a9771f85eef72d8266496
| -rw-r--r-- | include/o3tl/ptr_container.hxx | 31 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/include/o3tl/ptr_container.hxx b/include/o3tl/ptr_container.hxx new file mode 100644 index 000000000000..6ce04c113b53 --- /dev/null +++ b/include/o3tl/ptr_container.hxx @@ -0,0 +1,31 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_O3TL_PTR_CONTAINER_HXX +#define INCLUDED_O3TL_PTR_CONTAINER_HXX + +#include <sal/config.h> + +#include <memory> + +// Some glue for using std::unique_ptr with the Boost Pointer Container Library: + +namespace o3tl { namespace ptr_container { + +template<typename C, typename T> +inline void push_back(C & container, std::unique_ptr<T> && element) { + container.push_back(element.get()); + element.release(); +} + +} } + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 5524bc038dd3..e7796727f356 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -21,6 +21,7 @@ #include <ctype.h> #include <stdio.h> #include <comphelper/string.hxx> +#include <o3tl/ptr_container.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/color.hxx> @@ -38,6 +39,7 @@ #include <svtools/htmlkywd.hxx> #include <memory> +#include <utility> using namespace ::com::sun::star; @@ -1582,8 +1584,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) std::unique_ptr<HTMLOption> pOption( new HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue)); - maOptions.push_back(pOption.get()); - pOption.release(); + o3tl::ptr_container::push_back(maOptions, std::move(pOption)); } else // Ignore white space and unexpected characters |