diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
| commit | 975565399114f391df3333d6319040e690cde785 (patch) | |
| tree | f19eee07dc7af68932d5a2f1060e620d7de081ad /editeng | |
| parent | dc635425118c77d35534d1bf8b3aa12a1ad95752 (diff) | |
MSVC 2012 apparently isn't ready yet for std::vector<std::unique_ptr<T>>
...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<std::unique_ptr<...>> 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
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/eehtml.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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: |