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 /sw/source/filter/html/htmlcss1.cxx | |
| 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 'sw/source/filter/html/htmlcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 9881febf77ad..d333b6df580d 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1684,7 +1684,7 @@ void SwHTMLParser::NewStyle() const HTMLOptions& rOptions2 = GetOptions(); for (size_t i = rOptions2.size(); i; ) { - const HTMLOption& rOption = *rOptions2[--i]; + const HTMLOption& rOption = rOptions2[--i]; if( HTML_O_TYPE == rOption.GetToken() ) sType = rOption.GetString(); } @@ -1763,7 +1763,7 @@ void SwHTMLParser::InsertLink() const HTMLOptions& rOptions2 = GetOptions(); for (size_t i = rOptions2.size(); i; ) { - const HTMLOption& rOption = *rOptions2[--i]; + const HTMLOption& rOption = rOptions2[--i]; switch( rOption.GetToken() ) { case HTML_O_REL: |