summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlplug.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-29 13:56:43 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-29 13:57:17 +0200
commit014e7933af751bfe0a03867373b82efa806f3a3d (patch)
tree59be1f8b861bb6bb8a54e4c028683f15f0c615cf /sw/source/filter/html/htmlplug.cxx
parent14157dcdf175f1ef45903f7ec3ed85d0f7c76798 (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/htmlplug.cxx')
-rw-r--r--sw/source/filter/html/htmlplug.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index a33737b5171b..d5e8c2fc9deb 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -311,7 +311,7 @@ void SwHTMLParser::InsertEmbed()
// Wert einer Option beruecksichtigt werden.
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_ID:
@@ -507,7 +507,7 @@ void SwHTMLParser::NewObject()
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
{
- const HTMLOption& rOption = rHTMLOptions[--i];
+ const HTMLOption& rOption = *rHTMLOptions[--i];
switch( rOption.GetToken() )
{
case HTML_O_ID:
@@ -675,7 +675,7 @@ void SwHTMLParser::InsertApplet()
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
{
- const HTMLOption& rOption = rHTMLOptions[--i];
+ const HTMLOption& rOption = *rHTMLOptions[--i];
switch( rOption.GetToken() )
{
case HTML_O_ID:
@@ -800,7 +800,7 @@ void SwHTMLParser::InsertParam()
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
{
- const HTMLOption& rOption = rHTMLOptions[--i];
+ const HTMLOption& rOption = *rHTMLOptions[--i];
switch( rOption.GetToken() )
{
case HTML_O_NAME:
@@ -833,7 +833,7 @@ void SwHTMLParser::InsertFloatingFrame()
// Erstmal die Optionen f?r das Writer-Frame-Format holen
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_ID: