diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
commit | 975565399114f391df3333d6319040e690cde785 (patch) | |
tree | f19eee07dc7af68932d5a2f1060e620d7de081ad | |
parent | dc635425118c77d35534d1bf8b3aa12a1ad95752 (diff) |
MSVC 2012 apparently isn't ready yet for std::vector<std::unique_ptr<T>>
...producing error messages about trying to access private undefined unique_ptr
copy ctor etc.
Partial revert of 014e7933af751bfe0a03867373b82efa806f3a3d "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," going the awkward
std::unique_ptr x(...);
push_back(x.get());
x.release();
route instead (which could be simplified if boost::ptr_vector::push_back ever
started to support unique_ptr).
Change-Id: I15693030a0bbfdedbfdfbe76ede5d0c74f4e5b41
-rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 8 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.cxx | 6 | ||||
-rw-r--r-- | include/svtools/parhtml.hxx | 9 | ||||
-rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 48 | ||||
-rw-r--r-- | sfx2/source/bastyp/frmhtml.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 4 | ||||
-rw-r--r-- | svtools/source/svhtml/htmlsupp.cxx | 2 | ||||
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 6 | ||||
-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 |
18 files changed, 86 insertions, 89 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 1fba4c04ceba..67556a3051cb 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: diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 384588409062..15d8c59f54cd 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -117,7 +117,7 @@ void EditHTMLParser::NextToken( int nToken ) bool bEquiv = false; for ( size_t i = 0; i < nArrLen; i++ ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_HTTPEQUIV: @@ -711,7 +711,7 @@ void EditHTMLParser::StartPara( bool bReal ) SvxAdjust eAdjust = SVX_ADJUST_LEFT; for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_ALIGN: @@ -772,7 +772,7 @@ void EditHTMLParser::AnchorStart() for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption& aOption = *aOptions[i]; + const HTMLOption& aOption = aOptions[i]; switch( aOption.GetToken() ) { case HTML_O_HREF: diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 09027f46e2c6..ed4f4c386fcf 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_SVTOOLS_PARHTML_HXX #define INCLUDED_SVTOOLS_PARHTML_HXX -#include <sal/config.h> - -#include <memory> -#include <vector> - #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> +#include <boost/ptr_container/ptr_vector.hpp> + namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; @@ -121,7 +118,7 @@ public: //SvxAdjust GetAdjust() const; // <P,TH,TD ALIGN=> }; -typedef std::vector<std::unique_ptr<HTMLOption>> HTMLOptions; +typedef ::boost::ptr_vector<HTMLOption> HTMLOptions; class SVT_DLLPUBLIC HTMLParser : public SvParser { diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 28dc7e4355f9..00ce6f1b7253 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -965,7 +965,7 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_COLSPAN: @@ -1087,7 +1087,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_WIDTH: @@ -1147,7 +1147,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_WIDTH: @@ -1339,7 +1339,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_SRC: @@ -1431,7 +1431,7 @@ void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_WIDTH: @@ -1470,7 +1470,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_NAME: @@ -1497,7 +1497,7 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption& rOption = *rOptions[i]; + const HTMLOption& rOption = rOptions[i]; switch( rOption.GetToken() ) { case HTML_O_FACE : @@ -1922,13 +1922,13 @@ ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bo HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); for (; itr != itrEnd; ++itr) { - switch( (*itr)->GetToken() ) + switch( itr->GetToken() ) { case HTML_O_BORDER: - mbBorderOn = (*itr)->GetString().isEmpty() || ((*itr)->GetNumber() != 0); + mbBorderOn = itr->GetString().isEmpty() || (itr->GetNumber() != 0); break; case HTML_O_ID: - maTableName = (*itr)->GetString(); + maTableName = itr->GetString(); break; } } @@ -2148,26 +2148,26 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; for (; itr != itrEnd; ++itr) { - switch ((*itr)->GetToken()) + switch (itr->GetToken()) { case HTML_O_COLSPAN: - aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( (*itr)->GetString().toInt32(), 1, 256 ) ); + aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) ); break; case HTML_O_ROWSPAN: - aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( (*itr)->GetString().toInt32(), 1, 256 ) ); + aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) ); break; case HTML_O_SDVAL: - pValStr.reset(new OUString((*itr)->GetString())); + pValStr.reset(new OUString(itr->GetString())); break; case HTML_O_SDNUM: - pNumStr.reset(new OUString((*itr)->GetString())); + pNumStr.reset(new OUString(itr->GetString())); break; case HTML_O_CLASS: { // Pick up the number format associated with this class (if // any). OUString aElem("td"); - OUString aClass = (*itr)->GetString(); + OUString aClass = itr->GetString(); OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); const OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); @@ -2567,12 +2567,12 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); for (; itr != itrEnd; ++itr) { - switch( (*itr)->GetToken() ) + switch( itr->GetToken() ) { case HTML_O_ALIGN: { SvxCellHorJustify eVal = SVX_HOR_JUSTIFY_STANDARD; - const OUString& rOptVal = (*itr)->GetString(); + const OUString& rOptVal = itr->GetString(); if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) ) eVal = SVX_HOR_JUSTIFY_RIGHT; else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center ) ) @@ -2587,7 +2587,7 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& case HTML_O_VALIGN: { SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD; - const OUString& rOptVal = (*itr)->GetString(); + const OUString& rOptVal = itr->GetString(); if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_top ) ) eVal = SVX_VER_JUSTIFY_TOP; else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_middle ) ) @@ -2602,7 +2602,7 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& case HTML_O_BGCOLOR: { Color aColor; - (*itr)->GetColor( aColor ); + itr->GetColor( aColor ); rItemSet.Put( SvxBrushItem( aColor, ATTR_BACKGROUND ) ); } break; @@ -2991,11 +2991,11 @@ void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo ) HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); for (; itr != itrEnd; ++itr) { - switch( (*itr)->GetToken() ) + switch( itr->GetToken() ) { case HTML_O_FACE : { - const OUString& rFace = (*itr)->GetString(); + const OUString& rFace = itr->GetString(); OUString aFontName; sal_Int32 nPos = 0; while( nPos != -1 ) @@ -3012,14 +3012,14 @@ void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo ) break; case HTML_O_SIZE : { - sal_uInt32 nSize = getLimitedValue< sal_uInt32 >( (*itr)->GetNumber(), 1, SC_HTML_FONTSIZES ); + sal_uInt32 nSize = getLimitedValue< sal_uInt32 >( itr->GetNumber(), 1, SC_HTML_FONTSIZES ); mpCurrTable->PutItem( SvxFontHeightItem( maFontHeights[ nSize - 1 ], 100, ATTR_FONT_HEIGHT ) ); } break; case HTML_O_COLOR : { Color aColor; - (*itr)->GetColor( aColor ); + itr->GetColor( aColor ); mpCurrTable->PutItem( SvxColorItem( aColor, ATTR_FONT_COLOR ) ); } break; diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index dd14e59414d9..c667f1948492 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 ccc11d0703bd..0e036c90d222 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: diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index 2b3f89dd8998..7069e4e2a07e 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -52,7 +52,7 @@ bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas for( size_t i = aScriptOptions.size(); i; ) { - const HTMLOption& aOption = *aScriptOptions[--i]; + const HTMLOption& aOption = aScriptOptions[--i]; switch( aOption.GetToken() ) { case HTML_O_LANGUAGE: diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 265427de172e..5524bc038dd3 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -38,7 +38,6 @@ #include <svtools/htmlkywd.hxx> #include <memory> -#include <utility> using namespace ::com::sun::star; @@ -1583,7 +1582,8 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) std::unique_ptr<HTMLOption> pOption( new HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue)); - maOptions.push_back(std::move(pOption)); + maOptions.push_back(pOption.get()); + pOption.release(); } else // Ignore white space and unexpected characters @@ -2068,7 +2068,7 @@ bool HTMLParser::ParseMetaOptionsImpl( for ( size_t i = aOptions.size(); i; ) { - const HTMLOption& aOption = *aOptions[--i]; + const HTMLOption& aOption = aOptions[--i]; switch ( aOption.GetToken() ) { case HTML_O_NAME: diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 9881febf77ad..d333b6df580d 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 aea59edf6c2f..b680b5e94f05 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 79d484863a67..079f4792104d 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 41d9575d98b8..b4353db683bb 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 9f591b04c63c..83db8243380b 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 8af533105ff2..bb5efeb872d7 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 d5e8c2fc9deb..a33737b5171b 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 badf4382092e..65c924abc2fc 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 fcae16bd404f..4b352c7e1852 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 fdeeb61a8b53..ead053964fbe 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: |