diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-27 17:15:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-04 08:49:01 +0200 |
| commit | 52fcc738eeb9c7ff3fc023668dc335076e8bef42 (patch) | |
| tree | b55c71ac2942ac1d162e1201b54936dd542ed184 /sc/source/filter/excel/xiname.cxx | |
| parent | 73873ef6b4d7ad8697bda3a44bb16b7eed9b93bd (diff) | |
convert sc/source/filter/inc/xi*.hxx from String to OUString
Change-Id: I211c250768ed63d3facfbbf7574cdec5415c983a
Diffstat (limited to 'sc/source/filter/excel/xiname.cxx')
| -rw-r--r-- | sc/source/filter/excel/xiname.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 66bc030f8c66..58575e581325 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -100,10 +100,10 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : bool bBuiltIn = ::get_flag( nFlags, EXC_NAME_BUILTIN ); // special case for BIFF5 filter range - name appears as plain text without built-in flag - if( (GetBiff() == EXC_BIFF5) && (maXclName.Equals(XclTools::GetXclBuiltInDefName(EXC_BUILTIN_FILTERDATABASE))) ) + if( (GetBiff() == EXC_BIFF5) && (maXclName == XclTools::GetXclBuiltInDefName(EXC_BUILTIN_FILTERDATABASE)) ) { bBuiltIn = true; - maXclName.Assign( EXC_BUILTIN_FILTERDATABASE ); + maXclName = OUString(EXC_BUILTIN_FILTERDATABASE); } // convert Excel name to Calc name @@ -115,8 +115,8 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : else if( bBuiltIn ) { // built-in name - if( maXclName.Len() ) - mcBuiltIn = maXclName.GetChar( 0 ); + if( !maXclName.isEmpty() ) + mcBuiltIn = maXclName[0]; if( mcBuiltIn == '?' ) // NUL character is imported as '?' mcBuiltIn = '\0'; maScName = XclTools::GetBuiltInDefName( mcBuiltIn ); @@ -281,7 +281,7 @@ void XclImpNameManager::ReadName( XclImpStream& rStrm ) maNameList.push_back( new XclImpName( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) ); } -const XclImpName* XclImpNameManager::FindName( const String& rXclName, SCTAB nScTab ) const +const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB nScTab ) const { const XclImpName* pGlobalName = 0; // a found global name const XclImpName* pLocalName = 0; // a found local name |