diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 13:56:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 13:57:17 +0200 |
| commit | 014e7933af751bfe0a03867373b82efa806f3a3d (patch) | |
| tree | 59be1f8b861bb6bb8a54e4c028683f15f0c615cf /dbaccess/source | |
| parent | 14157dcdf175f1ef45903f7ec3ed85d0f7c76798 (diff) | |
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.
Change-Id: Ie5f92bc40ce5425dc1c634b17addc2b0dd9bbda3
Diffstat (limited to 'dbaccess/source')
| -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 67556a3051cb..1fba4c04ceba 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: |