User: hr Date: 06/06/19 20:20:03 Modified: /dba/dbaccess/source/ui/misc/ HtmlReader.cxx
Log: INTEGRATION: CWS warnings01 (1.22.4); FILE MERGED 2006/05/29 11:19:13 sb 1.22.4.3: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170. 2006/05/23 23:57:43 sb 1.22.4.2: RESYNC: (1.22-1.24); FILE MERGED 2006/03/24 15:36:21 fs 1.22.4.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: HtmlReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.24&r2=1.25 Delta lines: +18 -21 --------------------- --- HtmlReader.cxx 4 May 2006 08:44:26 -0000 1.24 +++ HtmlReader.cxx 20 Jun 2006 03:20:01 -0000 1.25 @@ -280,11 +280,11 @@ case HTML_TABLE_ON: ++m_nTableCount; { // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab - const HTMLOptions* pOptions = GetOptions(); - sal_Int16 nArrLen = pOptions->Count(); + const HTMLOptions* pHtmlOptions = GetOptions(); + sal_Int16 nArrLen = pHtmlOptions->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) { - const HTMLOption* pOption = (*pOptions)[i]; + const HTMLOption* pOption = (*pHtmlOptions)[i]; switch( pOption->GetToken() ) { case HTML_O_WIDTH: @@ -410,11 +410,11 @@ void OHTMLReader::fetchOptions() { m_bInTbl = TRUE; - const HTMLOptions* pOptions = GetOptions(); - sal_Int16 nArrLen = pOptions->Count(); + const HTMLOptions* options = GetOptions(); + sal_Int16 nArrLen = options->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) { - const HTMLOption* pOption = (*pOptions)[i]; + const HTMLOption* pOption = (*options)[i]; switch( pOption->GetToken() ) { case HTML_O_SDVAL: @@ -431,15 +431,15 @@ } } //--------------------------------------------------------------------------------- -void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,String *pValue,int nToken) +void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal,int nToken) { DBG_CHKTHIS(OHTMLReader,NULL); sal_Bool bHorJustifyCenterTH = (nToken == HTML_TABLEHEADER_ON); - const HTMLOptions* pOptions = GetOptions(); - sal_Int16 nArrLen = pOptions->Count(); + const HTMLOptions* pHtmlOptions = GetOptions(); + sal_Int16 nArrLen = pHtmlOptions->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) { - const HTMLOption* pOption = (*pOptions)[i]; + const HTMLOption* pOption = (*pHtmlOptions)[i]; switch( pOption->GetToken() ) { case HTML_O_ALIGN: @@ -482,11 +482,11 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) { DBG_CHKTHIS(OHTMLReader,NULL); - const HTMLOptions* pOptions = GetOptions(); - sal_Int16 nArrLen = pOptions->Count(); + const HTMLOptions* pHtmlOptions = GetOptions(); + sal_Int16 nArrLen = pHtmlOptions->Count(); for ( sal_Int16 i = 0; i < nArrLen; i++ ) { - const HTMLOption* pOption = (*pOptions)[i]; + const HTMLOption* pOption = (*pHtmlOptions)[i]; switch( pOption->GetToken() ) { case HTML_O_COLOR: @@ -562,8 +562,6 @@ String aColumnName; SvxCellHorJustify eVal; String *pValue=NULL; - sal_Int16 nWidth = 0; - sal_Int16 nHeight = 0; String aTableName; FontDescriptor aFont = ::dbaui::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont()); @@ -594,7 +592,7 @@ DELETEZ(pValue); eVal = SVX_HOR_JUSTIFY_STANDARD; } - TableDataOn(eVal,pValue,nTmpToken2); + TableDataOn(eVal,nTmpToken2); bTableHeader = TRUE; break; case HTML_TABLEDATA_OFF: @@ -670,14 +668,13 @@ DBG_CHKTHIS(OHTMLReader,NULL); m_bMetaOptions = sal_True; USHORT nContentOption = HTML_O_CONTENT; - rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; String aName, aContent; USHORT nAction = HTML_META_NONE; - BOOL bHTTPEquiv = FALSE, bChanged = FALSE; - const HTMLOptions *pOptions = GetOptions(&nContentOption); - for( USHORT i = pOptions->Count(); i; ) + BOOL bHTTPEquiv = FALSE; + const HTMLOptions *pHtmlOptions = GetOptions(&nContentOption); + for( USHORT i = pHtmlOptions->Count(); i; ) { - const HTMLOption *pOption = (*pOptions)[ --i ]; + const HTMLOption *pOption = (*pHtmlOptions)[ --i ]; switch( pOption->GetToken() ) { case HTML_O_HTTPEQUIV: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
