diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-02 15:11:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-04 09:09:38 +0200 |
commit | b68a0caf33249c9fae957c667aa0d55f28daefcd (patch) | |
tree | 7cd2f52ff9d14929982f43a801067fc36c336086 | |
parent | 5b9e37c904b8e72475df62758231f317f3204b20 (diff) |
convert sc/source/filter/inc/Xcl*.hxx from String to OUString
Change-Id: Idf65f981bb0719dab43da6b65c8275ef04d65393
-rw-r--r-- | sc/source/filter/inc/XclExpChangeTrack.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/inc/XclImpChangeTrack.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index b13de41dbe7d..6651a750c528 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -41,7 +41,7 @@ private: virtual void SaveCont( XclExpStream& rStrm ); public: - XclExpUserBView( const String& rUsername, const sal_uInt8* pGUID ); + XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); inline const sal_uInt8* GetGUID() const { return aGUID; } @@ -253,7 +253,7 @@ private: public: inline XclExpChTrInfo( - const String& rUsername, + const OUString& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ); @@ -265,7 +265,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ) : +inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ) : sUsername( rUsername ), mnLogNumber( nLogNumber ), aDateTime( rDateTime ) @@ -335,7 +335,7 @@ public: class XclExpChTrAction : public ExcRecord { private: - String sUsername; + OUString sUsername; DateTime aDateTime; sal_uInt32 nIndex; // action number XclExpChTrAction* pAddAction; // additional record for this action @@ -386,7 +386,7 @@ public: sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN ); virtual ~XclExpChTrAction(); - inline const String& GetUsername() const { return sUsername; } + inline const OUString& GetUsername() const { return sUsername; } inline const DateTime& GetDateTime() const { return aDateTime; } inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } inline sal_Bool ForceInfoRecord() const { return bForceInfo; } diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 2fceacd8806d..307caced5dfe 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -57,7 +57,7 @@ class XclImpChangeTrack : protected XclImpRoot { private: XclImpChTrRecHeader aRecHeader; - String sOldUsername; + OUString sOldUsername; ScChangeTrack* pChangeTrack; SotStorageStreamRef xInStrm; // input stream @@ -84,7 +84,7 @@ private: SCTAB ReadTabNum(); void ReadDateTime( DateTime& rDateTime ); - inline void ReadString( String& rString ); + inline void ReadString( OUString& rString ); sal_Bool CheckRecord( sal_uInt16 nOpCode ); @@ -149,7 +149,7 @@ inline void XclImpChangeTrack::Read2DRange( ScRange& rRange ) rRange.aEnd.SetCol( static_cast<SCCOL>(pStrm->ReaduInt16()) ); } -inline void XclImpChangeTrack::ReadString( String& rString ) +inline void XclImpChangeTrack::ReadString( OUString& rString ) { rString = pStrm->ReadUniString(); } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index f4d67bc04a4b..dbaf1beab1ca 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -99,7 +99,7 @@ static inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID ) //___________________________________________________________________ -XclExpUserBView::XclExpUserBView( const String& rUsername, const sal_uInt8* pGUID ) : +XclExpUserBView::XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ) : sUsername( rUsername ) { memcpy( aGUID, pGUID, 16 ); |