Tag: cws_src680_mingwport2 User: vg Date: 2006/07/12 12:08:58 Modified: dba/dbaccess/source/ui/misc/HtmlReader.cxx
Log: RESYNC: (1.24-1.25); FILE MERGED 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.4.1&r2=1.24.4.2 Delta lines: +21 -24 --------------------- --- HtmlReader.cxx 12 Jul 2006 10:39:12 -0000 1.24.4.1 +++ HtmlReader.cxx 12 Jul 2006 19:08:56 -0000 1.24.4.2 @@ -284,11 +284,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: @@ -414,11 +414,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: @@ -435,15 +435,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: @@ -486,11 +486,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: @@ -566,8 +566,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()); @@ -598,7 +596,7 @@ DELETEZ(pValue); eVal = SVX_HOR_JUSTIFY_STANDARD; } - TableDataOn(eVal,pValue,nTmpToken2); + TableDataOn(eVal,nTmpToken2); bTableHeader = TRUE; break; case HTML_TABLEDATA_OFF: @@ -674,14 +672,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]
