strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Combined two html option loops.

Browse source
This commit is contained in:
Kohei Yoshida 2011-08-04 00:05:26 -04:00
parent 24d8e4eaf4
commit 0a99c69971
1 changed files with 33 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
sc/source/filter/html/htmlpars.cxx
View file

@ -2225,57 +2225,54 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
// read needed options from the <td> tag // read needed options from the <td> tag
ScHTMLSize aSpanSize( 1, 1 ); ScHTMLSize aSpanSize( 1, 1 );
::std::auto_ptr< String > pValStr, pNumStr; ::std::auto_ptr< String > pValStr, pNumStr;
for( ScHTMLOptionIterator aIter( rInfo ); aIter.is(); ++aIter ) const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions();
HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end();
sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
for (; itr != itrEnd; ++itr)
{ {
switch( aIter->GetToken() ) switch (itr->GetToken())
{ {
case HTML_O_COLSPAN: case HTML_O_COLSPAN:
aSpanSize.mnCols = static_cast< SCCOL >( getLimitedValue< sal_Int32 >( aIter->GetString().ToInt32(), 1, 256 ) ); aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) );
break; break;
case HTML_O_ROWSPAN: case HTML_O_ROWSPAN:
aSpanSize.mnRows = static_cast< SCROW >( getLimitedValue< sal_Int32 >( aIter->GetString().ToInt32(), 1, 256 ) ); aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) );
break; break;
case HTML_O_SDVAL: case HTML_O_SDVAL:
pValStr.reset( new String( aIter->GetString() ) ); pValStr.reset( new String( itr->GetString() ) );
break; break;
case HTML_O_SDNUM: case HTML_O_SDNUM:
pNumStr.reset( new String( aIter->GetString() ) ); pNumStr.reset( new String( itr->GetString() ) );
break;
case HTML_O_CLASS:
{
// Pick up the number format associated with this class (if
// any).
rtl::OUString aElem(RTL_CONSTASCII_USTRINGPARAM("td"));
rtl::OUString aClass = itr->GetString();
rtl::OUString aProp(RTL_CONSTASCII_USTRINGPARAM("mso-number-format"));
const ScHTMLStyles& rStyles = mpParser->GetStyles();
const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp);
rtl::OUString aNumFmt = decodeNumberFormat(rVal);
nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt);
if (nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
{
xub_StrLen nErrPos = 0;
short nDummy;
bool bValidFmt = GetFormatTable()->PutEntry(aNumFmt, nErrPos, nDummy, nNumberFormat);
if (!bValidFmt)
nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
}
}
break; break;
} }
} }
ImplDataOn( aSpanSize ); ImplDataOn( aSpanSize );
const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions(); if (nNumberFormat != NUMBERFORMAT_ENTRY_NOT_FOUND)
HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); mxDataItemSet->Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nNumberFormat) );
for (; itr != itrEnd; ++itr)
{
if (itr->GetToken() == HTML_O_CLASS)
{
// This <td> has class property. Pick up the number format
// associated with this class (if any).
rtl::OUString aElem(RTL_CONSTASCII_USTRINGPARAM("td"));
rtl::OUString aClass = itr->GetString();
rtl::OUString aProp(RTL_CONSTASCII_USTRINGPARAM("mso-number-format"));
const ScHTMLStyles& rStyles = mpParser->GetStyles();
const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp);
rtl::OUString aNumFmt = decodeNumberFormat(rVal);
sal_uInt32 nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt);
bool bValidFmt = false;
if ( nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
{
xub_StrLen nErrPos = 0;
short nDummy;
bValidFmt = GetFormatTable()->PutEntry(aNumFmt, nErrPos, nDummy, nNumberFormat);
}
else
bValidFmt = true;
if (bValidFmt)
mxDataItemSet->Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nNumberFormat) );
}
}
ProcessFormatOptions( *mxDataItemSet, rInfo ); ProcessFormatOptions( *mxDataItemSet, rInfo );
CreateNewEntry( rInfo ); CreateNewEntry( rInfo );