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 /dbaccess/source/ui/misc/HtmlReader.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 'dbaccess/source/ui/misc/HtmlReader.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 1fba4c04ceba..67556a3051cb 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -137,7 +137,7 @@ void OHTMLReader::NextToken( int nToken ) const HTMLOptions& rHtmlOptions = GetOptions(); for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rHtmlOptions[i]; + const HTMLOption& rOption = rHtmlOptions[i]; switch( rOption.GetToken() ) { case HTML_O_WIDTH: @@ -294,7 +294,7 @@ void OHTMLReader::fetchOptions() const HTMLOptions& options = GetOptions(); for (size_t i = 0, n = options.size(); i < n; ++i) { - const HTMLOption& rOption = *options[i]; + const HTMLOption& rOption = options[i]; switch( rOption.GetToken() ) { case HTML_O_SDVAL: @@ -315,7 +315,7 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal) const HTMLOptions& rHtmlOptions = GetOptions(); for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rHtmlOptions[i]; + const HTMLOption& rOption = rHtmlOptions[i]; switch( rOption.GetToken() ) { case HTML_O_ALIGN: @@ -343,7 +343,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) const HTMLOptions& rHtmlOptions = GetOptions(); for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rHtmlOptions[i]; + const HTMLOption& rOption = rHtmlOptions[i]; switch( rOption.GetToken() ) { case HTML_O_COLOR: |