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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/frmhtml.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index c667f1948492..dd14e59414d9 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -61,7 +61,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& aOption = rOptions[i]; + const HTMLOption& aOption = *rOptions[i]; switch( aOption.GetToken() ) { case HTML_O_BORDERCOLOR: diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 0e036c90d222..ccc11d0703bd 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -94,7 +94,7 @@ bool SfxHTMLParser::ParseMapOptions( for (size_t i = rOptions.size(); i; ) { - const HTMLOption& aOption = rOptions[--i]; + const HTMLOption& aOption = *rOptions[--i]; switch( aOption.GetToken() ) { case HTML_O_NAME: @@ -126,7 +126,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase { sal_uInt16 nEvent = 0; ScriptType eScrpType = STARBASIC; - const HTMLOption& rOption = rOptions[--i]; + const HTMLOption& rOption = *rOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_NAME: |