From 975565399114f391df3333d6319040e690cde785 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 29 Sep 2014 15:27:46 +0200 Subject: MSVC 2012 apparently isn't ready yet for std::vector> ...producing error messages about trying to access private undefined unique_ptr copy ctor etc. Partial revert of 014e7933af751bfe0a03867373b82efa806f3a3d "svtools: std::auto_ptr -> std::unique_ptr: ...changing HTMLOptions to std::vector> because boost::ptr_vector<...>::push_back only supports auto_ptr, not unique_ptr," going the awkward std::unique_ptr x(...); push_back(x.get()); x.release(); route instead (which could be simplified if boost::ptr_vector::push_back ever started to support unique_ptr). Change-Id: I15693030a0bbfdedbfdfbe76ede5d0c74f4e5b41 --- sfx2/source/bastyp/frmhtml.cxx | 2 +- sfx2/source/bastyp/sfxhtml.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index dd14e59414d9..c667f1948492 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -61,7 +61,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& aOption = *rOptions[i]; + const HTMLOption& aOption = rOptions[i]; switch( aOption.GetToken() ) { case HTML_O_BORDERCOLOR: diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index ccc11d0703bd..0e036c90d222 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -94,7 +94,7 @@ bool SfxHTMLParser::ParseMapOptions( for (size_t i = rOptions.size(); i; ) { - const HTMLOption& aOption = *rOptions[--i]; + const HTMLOption& aOption = rOptions[--i]; switch( aOption.GetToken() ) { case HTML_O_NAME: @@ -126,7 +126,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase { sal_uInt16 nEvent = 0; ScriptType eScrpType = STARBASIC; - const HTMLOption& rOption = *rOptions[--i]; + const HTMLOption& rOption = rOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_NAME: -- cgit v1.2.3