summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-07 14:58:31 +0200
committerNoel Grandin <noel@peralex.com>2013-10-08 10:03:15 +0200
commit61d3417d75c47e0522e4ebe994cee3f8f76d622b (patch)
treefc5c2f7038595d8d66673bdf5e4cc16bc20efc68 /sc
parent062560f065887ffbbf0e0eab0893c7dcccb82a00 (diff)
convert sc/source/filter/xcl97/*.cxx from String to OUString
Change-Id: I582e9af0336dd84eb45056b987af35c88aaa49a5
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx2
-rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx8
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx14
3 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index dbaf1beab1ca..c7e3adfae55c 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1454,7 +1454,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
aRecList.push_back( new XclExpChTr0x0195 );
aRecList.push_back( new XclExpChTr0x0194( *pTempChangeTrack ) );
- String sLastUsername;
+ OUString sLastUsername;
DateTime aLastDateTime( DateTime::EMPTY );
sal_uInt32 nIndex = 1;
sal_Int32 nLogNumber = 1;
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 948543a595eb..f16aba682d28 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -157,13 +157,13 @@ sal_Bool XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab,
{
// external ref - read doc and tab name and find sc tab num
// - URL
- String aEncUrl( pStrm->ReadUniString() );
+ OUString aEncUrl( pStrm->ReadUniString() );
OUString aUrl;
bool bSelf;
XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl );
pStrm->Ignore( 1 );
// - sheet name, always separated from URL
- String aTabName( pStrm->ReadUniString() );
+ OUString aTabName( pStrm->ReadUniString() );
pStrm->Ignore( 1 );
rExtInfo.mbExternal = true;
@@ -324,10 +324,10 @@ void XclImpChangeTrack::ReadChTrInfo()
{
pStrm->DisableDecryption();
pStrm->Ignore( 32 );
- String sUsername( pStrm->ReadUniString() );
+ OUString sUsername( pStrm->ReadUniString() );
if( !pStrm->IsValid() ) return;
- if( sUsername.Len() )
+ if( !sUsername.isEmpty() )
pChangeTrack->SetUser( sUsername );
pStrm->Seek( 148 );
if( !pStrm->IsValid() ) return;
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 6d7837694faf..d61383af8608 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -747,8 +747,8 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje
// Excel has one alignment per NoteObject while Calc supports
// one alignment per paragraph - use the first paragraph
// alignment (if set) as our overall alignment.
- String aParaText( rEditObj.GetText( 0 ) );
- if( aParaText.Len() )
+ OUString aParaText( rEditObj.GetText( 0 ) );
+ if( !aParaText.isEmpty() )
{
SfxItemSet aSet( rEditObj.GetParaAttribs( 0));
const SfxPoolItem* pItem = NULL;
@@ -838,12 +838,12 @@ XclObjOle::~XclObjOle()
void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
{
// write only as embedded, not linked
- String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) );
+ OUString aStorageName( "MBD" );
sal_Char aBuf[ sizeof(sal_uInt32) * 2 + 1 ];
// FIXME Eeek! Is this just a way to get a unique id?
sal_uInt32 nPictureId = sal_uInt32(sal_uIntPtr(this) >> 2);
sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) );
- aStorageName.AppendAscii( aBuf );
+ aStorageName += OUString::createFromAscii(aBuf);
SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
if( xOleStg.Is() )
@@ -1203,8 +1203,8 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) const
ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
{
- String sTmpName;
- String sTmpComm;
+ OUString sTmpName;
+ OUString sTmpComm;
OUString aTmp;
Color aDummyCol;
sal_uInt16 nFlags;
@@ -1232,7 +1232,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
sal_Bool bContLoop = sal_True;
SCROW nRow;
SCCOL nCol;
- String sText;
+ OUString sText;
double fVal;
for( size_t nRange = 0; (nRange < pRList->size()) && bContLoop; nRange++ )