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 --- editeng/source/editeng/eehtml.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 384588409062..15d8c59f54cd 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -117,7 +117,7 @@ void EditHTMLParser::NextToken( int nToken ) bool bEquiv = false; for ( size_t i = 0; i < nArrLen; i++ ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_HTTPEQUIV: @@ -711,7 +711,7 @@ void EditHTMLParser::StartPara( bool bReal ) SvxAdjust eAdjust = SVX_ADJUST_LEFT; for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_ALIGN: @@ -772,7 +772,7 @@ void EditHTMLParser::AnchorStart() for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_HREF: -- cgit