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 /sw/source/filter/html/htmlcss1.cxx | |
| 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 '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 d333b6df580d..9881febf77ad 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: |