strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svtools: replace boost::ptr_vector with std::vector

Browse source 
Change-Id: I70a2919e43495ce10c0c90ec91a25604d82e7d28
This commit is contained in:
Michael Stahl 2015-07-23 22:14:07 +02:00
parent cef74993a9
commit 2f46753523
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/svtools/parhtml.hxx
View file

@ -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
{

1
svtools/inc/pch/precompiled_svt.hxx
View file

@ -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>

6
svtools/source/svhtml/parhtml.cxx
View file

@ -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