diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-11 15:29:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:43 +0200 |
| commit | dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10 (patch) | |
| tree | 07bcabb24171f84069d7d1ae9a267f40350981d5 /sw/source/ui/uno/unomailmerge.cxx | |
| parent | 784634377e42d8c5d207e8a510bb7ee64a66ef9e (diff) | |
convert sw/source/ui/uno/*.cxx from String to OUString
Change-Id: I3726ae7496e66f0e0d9b6be1ada1766c7fd496db
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index d4f43204ca71..c68b141dc80f 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -132,7 +132,7 @@ static CloseResult CloseModelAndDocSh( static bool LoadFromURL_impl( Reference< frame::XModel > &rxModel, SfxObjectShellRef &rxDocSh, - const String &rURL, + const OUString &rURL, bool bClose ) throw (RuntimeException) { @@ -191,12 +191,12 @@ namespace ::osl::Mutex m_aMutex; Reference< util::XCloseable > m_xDocument; Timer m_aDeleteTimer; - String m_sTemporaryFile; + OUString m_sTemporaryFile; sal_Int32 m_nPendingDeleteAttempts; public: DelayedFileDeletion( const Reference< XModel >& _rxModel, - const String& _rTemporaryFile ); + const OUString& _rTemporaryFile ); protected: ~DelayedFileDeletion( ); @@ -217,7 +217,7 @@ namespace DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented }; - DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const String& _rTemporaryFile ) + DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile ) : m_xDocument( _rxModel, UNO_QUERY ) ,m_sTemporaryFile( _rTemporaryFile ) @@ -337,10 +337,10 @@ namespace static bool DeleteTmpFile_Impl( Reference< frame::XModel > &rxModel, SfxObjectShellRef &rxDocSh, - const String &rTmpFileURL ) + const OUString &rTmpFileURL ) { bool bRes = false; - if (rTmpFileURL.Len()) + if (!rTmpFileURL.isEmpty()) { bool bDelete = true; if ( eVetoed == CloseModelAndDocSh( rxModel, rxDocSh ) ) @@ -703,18 +703,18 @@ uno::Any SAL_CALL SwXMailMerge::execute( } aURLObj.SetSmartURL( aCurOutputURL ); - String aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + OUString aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); - String aDelim = OUString(INET_PATH_TOKEN); - if (aPath.Len() >= aDelim.Len() && - aPath.Copy( aPath.Len()-aDelim.Len() ).CompareTo( aDelim ) != COMPARE_EQUAL) + OUString aDelim = OUString(INET_PATH_TOKEN); + if (aPath.getLength() >= aDelim.getLength() && + aPath.copy( aPath.getLength() - aDelim.getLength() ) == aDelim) aPath += aDelim; if (bCurFileNameFromColumn) pMgr->SetEMailColumn( aCurFileNamePrefix ); else { - aPath += String( aCurFileNamePrefix ); - pMgr->SetEMailColumn( String() ); + aPath += aCurFileNamePrefix; + pMgr->SetEMailColumn( OUString() ); } pMgr->SetSubject( aPath ); if(MailMergeType::FILE == nCurOutputType) |