diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-04 17:48:32 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-05 15:21:07 -0500 |
| commit | e422d9efc36407cae4220c025a4c2d8e8de14be9 (patch) | |
| tree | f166728385f95f4152212e36d28a5b685100a60b /sc/source/filter/html | |
| parent | b2d3a5e2a3e5870778af63a30d7f3e6322294d06 (diff) | |
Removed SearchName() in favor of findByName().
Diffstat (limited to 'sc/source/filter/html')
| -rw-r--r-- | sc/source/filter/html/htmlimp.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 90ece03f8646..57609f9e385d 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -210,8 +210,7 @@ void ScHTMLImport::WriteToDocument( if( pTable->GetTableName().Len() ) { String aName( ScfTools::GetNameFromHTMLName( pTable->GetTableName() ) ); - USHORT nPos; - if( !mpDoc->GetRangeName()->SearchName( aName, nPos ) ) + if (!mpDoc->GetRangeName()->findByName(aName)) InsertRangeName( mpDoc, aName, aNewRange ); } } @@ -237,22 +236,22 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) ) { // build list with all HTML tables ULONG nIndex = 1; - USHORT nPos; - BOOL bLoop = TRUE; + bool bLoop = true; while( bLoop ) { aToken = ScfTools::GetNameFromHTMLIndex( nIndex++ ); - bLoop = pRangeNames->SearchName( aToken, nPos ); - if( bLoop ) + const ScRangeData* pRangeData = pRangeNames->findByName(aToken); + if (pRangeData) { - const ScRangeData* pRangeData = (*pRangeNames)[ nPos ]; ScRange aRange; - if( pRangeData && pRangeData->IsReference( aRange ) && !aRangeList.In( aRange ) ) + if( pRangeData->IsReference( aRange ) && !aRangeList.In( aRange ) ) { ScGlobal::AddToken( aNewName, aToken, ';' ); aRangeList.Append( aRange ); } } + else + bLoop = false; } } else |