diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-30 14:38:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-04 08:49:02 +0200 |
| commit | a599196064003b724c8ffe3144b77292a4082df3 (patch) | |
| tree | 71eb81534fa4b370d8f7c0015bc594cd441014a9 /sc/source/filter/excel | |
| parent | 9b57cc2b9a4266136a9cc6ad76f7997f41a6f535 (diff) | |
covnert sc/source/filter/inc/namebuff.hxx from String to OUString
Change-Id: I08d7224df62723b70b46981f1b6d61379ab62747
Diffstat (limited to 'sc/source/filter/excel')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/namebuff.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index ae00ca9f7b30..b605741c914a 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -712,7 +712,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s if( pExtName && pExtName->IsDDE() && rR.pExtSheetBuff->IsLink( ( sal_uInt16 ) nINT16 ) ) { - String aAppl, aExtDoc; + OUString aAppl, aExtDoc; TokenId nPar1, nPar2; rR.pExtSheetBuff->GetLink( ( sal_uInt16 ) nINT16 , aAppl, aExtDoc ); diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index b3592972704a..7cfaa8a5d034 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -102,7 +102,7 @@ ScFormulaCellGroupRef SharedFormulaBuffer::Find( const ScAddress& rRefPos ) cons return it->second; } -sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const sal_Bool bSWB ) +sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const sal_Bool bSWB ) { maEntries.push_back( Cont( rFPAN, rTN, bSWB ) ); // return 1-based index of EXTERNSHEET @@ -177,7 +177,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const } -sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const +sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const { OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" ); @@ -219,14 +219,14 @@ ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) : } -void ExtNameBuff::AddDDE( const String& rName, sal_Int16 nRefIdx ) +void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( rName, 0x0001 ); maExtNames[ nRefIdx ].push_back( aNew ); } -void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ) +void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ) { ExtName aNew( rName, 0x0002 ); aNew.nStorageId = nStorageId; @@ -234,7 +234,7 @@ void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nSt } -void ExtNameBuff::AddName( const String& rName, sal_Int16 nRefIdx ) +void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( GetScAddInName( rName ), 0x0004 ); maExtNames[ nRefIdx ].push_back( aNew ); |