diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-02 15:11:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-04 09:09:34 +0200 |
| commit | 5b9e37c904b8e72475df62758231f317f3204b20 (patch) | |
| tree | e373ce4d08221f3877f83cf6c1918d2cd9f20943 /sc/source/filter/excel | |
| parent | 38d967bc53d30628cfb6e67c3c3c38885209436f (diff) | |
convert source/filter/inc/*.hxx from String to OUString
Change-Id: I7b70d5c699819103260c2b248203c41f1d543a79
Diffstat (limited to 'sc/source/filter/excel')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/exctools.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/excel/xilink.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index b605741c914a..a2df17e82eea 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -1327,7 +1327,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal } ConvErr ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpStream& /*rStrm*/, sal_Size /*nFormulaLen*/, - const String& /*rUrl*/, const vector<String>& /*rTabNames*/ ) + const OUString& /*rUrl*/, const vector<OUString>& /*rTabNames*/ ) { // not implemented ... return ConvErrNi; diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 23493ab74157..e52cb4dc9820 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -1255,7 +1255,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa } ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, - const String& rUrl, const vector<String>& rTabNames ) + const OUString& rUrl, const vector<OUString>& rTabNames ) { if( !GetDocShell() ) return ConvErrNi; diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index e0bbfebefe6b..b053ac3a7d83 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -187,19 +187,19 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) rIn.Ignore( 1 ); // statt nUser! if( nName ) - pName = new String( rIn.ReadUniString( nName ) ); + pName = new OUString( rIn.ReadUniString( nName ) ); else { - pName = new String( RTL_CONSTASCII_USTRINGPARAM( "Scenery" ) ); + pName = new OUString( "Scenery" ); rIn.Ignore( 1 ); } - pUserName = new String( rIn.ReadUniString() ); + pUserName = new OUString( rIn.ReadUniString() ); if( nComment ) - pComment = new String( rIn.ReadUniString() ); + pComment = new OUString( rIn.ReadUniString() ); else - pComment = new String; + pComment = new OUString; sal_uInt16 n = nCref; sal_uInt16 nC, nR; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index d72e734d2f47..f7119dc3c4ed 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -371,7 +371,7 @@ XclImpExtName::XclImpExtName( const XclImpSupbook& rSupbook, XclImpStream& rStrm const ScTokenArray* pArray = NULL; sal_uInt16 nFmlaLen; rStrm >> nFmlaLen; - vector<String> aTabNames; + vector<OUString> aTabNames; sal_uInt16 nCount = rSupbook.GetTabCount(); aTabNames.reserve(nCount); for (sal_uInt16 i = 0; i < nCount; ++i) |