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 | |
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')
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmldrawreader.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlform.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmlnumreader.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/html/htmlsect.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 16 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 32 |
10 files changed, 45 insertions, 45 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: diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index b680b5e94f05..aea59edf6c2f 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -270,7 +270,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) 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_ID: diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 079f4792104d..79d484863a67 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -219,7 +219,7 @@ void SwHTMLParser::NewField() for ( i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_TYPE: diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index b4353db683bb..41d9575d98b8 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1259,7 +1259,7 @@ void SwHTMLParser::NewForm( bool bAppend ) const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; sal_uInt16 nEvent = 0; bool bSetEvent = false; @@ -1428,7 +1428,7 @@ void SwHTMLParser::InsertInput() const HTMLOptions& rHTMLOptions = GetOptions( &nKeepCRLFToken ); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; sal_uInt16 nEvent = 0; bool bSetEvent = false; @@ -1911,7 +1911,7 @@ void SwHTMLParser::NewTextArea() const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; sal_uInt16 nEvent = 0; bool bSetEvent = false; @@ -2193,7 +2193,7 @@ void SwHTMLParser::NewSelect() const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; sal_uInt16 nEvent = 0; bool bSetEvent = false; @@ -2480,7 +2480,7 @@ void SwHTMLParser::InsertSelectOption() 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: diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 83db8243380b..9f591b04c63c 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -330,7 +330,7 @@ void SwHTMLParser::InsertImage() { sal_uInt16 nEvent = 0; ScriptType eScriptType2 = eDfltScriptType; - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_ID: @@ -833,7 +833,7 @@ void SwHTMLParser::InsertBodyOptions() const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; OUString aEvent; bool bSetEvent = false; @@ -1072,7 +1072,7 @@ void SwHTMLParser::NewAnchor() { sal_uInt16 nEvent = 0; ScriptType eScriptType2 = eDfltScriptType; - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_NAME: diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index bb5efeb872d7..8af533105ff2 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -137,7 +137,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) 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: @@ -440,7 +440,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken ) 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_VALUE: 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: diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 65c924abc2fc..badf4382092e 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -72,7 +72,7 @@ void SwHTMLParser::NewDivision( int nToken ) 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: @@ -549,7 +549,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) 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: diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 4b352c7e1852..fcae16bd404f 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3141,7 +3141,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, const HTMLOptions& rOptions = rParser.GetOptions(); for (size_t i = rOptions.size(); i; ) { - const HTMLOption& rOption = rOptions[--i]; + const HTMLOption& rOption = *rOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_ID: @@ -3898,7 +3898,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = 0; i < rHTMLOptions.size(); ++i) { - const HTMLOption& rOption = rHTMLOptions[i]; + const HTMLOption& rOption = *rHTMLOptions[i]; if( HTML_O_ALIGN==rOption.GetToken() ) { SvxAdjust eAdjust = @@ -4188,7 +4188,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, 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: @@ -4388,7 +4388,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, 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: @@ -4575,7 +4575,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, const HTMLOptions& rColGrpOptions = GetOptions(); for (size_t i = rColGrpOptions.size(); i; ) { - const HTMLOption& rOption = rColGrpOptions[--i]; + const HTMLOption& rOption = *rColGrpOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_ID: @@ -4659,7 +4659,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, const HTMLOptions& rColOptions = GetOptions(); for (size_t i = rColOptions.size(); i; ) { - const HTMLOption& rOption = rColOptions[--i]; + const HTMLOption& rOption = *rColOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_ID: @@ -4804,7 +4804,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) const HTMLOptions& rHTMLOptions = GetOptions(); for ( size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; if( HTML_O_ALIGN == rOption.GetToken() ) { if (rOption.GetString().equalsIgnoreAsciiCase( @@ -5033,7 +5033,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, for (size_t i = rOptions.size(); i; ) { - const HTMLOption& rOption = rOptions[--i]; + const HTMLOption& rOption = *rOptions[--i]; switch( rOption.GetToken() ) { case HTML_O_ID: diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index ead053964fbe..fdeeb61a8b53 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1288,7 +1288,7 @@ void SwHTMLParser::NextToken( int nToken ) 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_HREF: @@ -1900,7 +1900,7 @@ void SwHTMLParser::NextToken( int nToken ) const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; if( HTML_O_DIR == rOption.GetToken() ) { const OUString& rDir = rOption.GetString(); @@ -3430,7 +3430,7 @@ void SwHTMLParser::NewStdAttr( int nToken ) 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: @@ -3483,7 +3483,7 @@ void SwHTMLParser::NewStdAttr( int nToken, 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: @@ -3563,7 +3563,7 @@ void SwHTMLParser::NewBasefontAttr() 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_SIZE: @@ -3664,7 +3664,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) 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_SIZE: @@ -3883,7 +3883,7 @@ void SwHTMLParser::NewPara() 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: @@ -4002,7 +4002,7 @@ void SwHTMLParser::NewHeading( int nToken ) 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: @@ -4126,7 +4126,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl ) 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: @@ -4254,7 +4254,7 @@ void SwHTMLParser::NewDefList() 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: @@ -4769,7 +4769,7 @@ void SwHTMLParser::NewCharFmt( int nToken ) 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: @@ -4837,7 +4837,7 @@ void SwHTMLParser::InsertSpacer() 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: @@ -5039,7 +5039,7 @@ void SwHTMLParser::InsertIDOption() const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) { - const HTMLOption& rOption = rHTMLOptions[--i]; + const HTMLOption& rOption = *rHTMLOptions[--i]; if( HTML_O_ID==rOption.GetToken() ) { aId = rOption.GetString(); @@ -5077,7 +5077,7 @@ void SwHTMLParser::InsertLineBreak() 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_CLEAR: @@ -5224,7 +5224,7 @@ void SwHTMLParser::InsertHorzRule() 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: @@ -5377,7 +5377,7 @@ void SwHTMLParser::ParseMoreMetaOptions() 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: |