diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-18 18:40:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-19 09:13:23 +0100 |
| commit | bd4f553ef03b45b4126314fa8287f933988575ea (patch) | |
| tree | 976a9895e9f08e0b84baeec5bd993316ae003182 /tools | |
| parent | 2e4c6b51699362252d0bbdc27e0311c68e2ab21b (diff) | |
remove some UniString ctors
Change-Id: Ic2e712f4447b733b79d980e178d9d6d9d8bf0e40
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/inetmsg.hxx | 4 | ||||
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 8 | ||||
| -rw-r--r-- | tools/source/fsys/unx.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index c65f9b043d15..040a7ac1d3ef 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -116,9 +116,9 @@ protected: sal_uIntPtr nIndex, rtl_TextEncoding eEncoding) const { if ( nIndex < m_aHeaderList.size() ) { - return UniString( m_aHeaderList[ nIndex ]->GetName(), eEncoding ); + return rtl::OStringToOUString(m_aHeaderList[ nIndex ]->GetName(), eEncoding); } else { - return UniString(); + return rtl::OUString(); } } diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 8365d4236350..a5c88a68f910 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -915,13 +915,13 @@ sal_Bool DirEntry::First() DIR *pDir = opendir(aPathName.getStr()); if ( pDir ) { - WildCard aWildeKarte( String(CMP_LOWER( aName ), osl_getThreadTextEncoding()) ); + WildCard aWildeKarte(rtl::OStringToOUString(CMP_LOWER(aName), osl_getThreadTextEncoding())); for ( dirent* pEntry = readdir( pDir ); pEntry; pEntry = readdir( pDir ) ) { rtl::OString aFound(pEntry->d_name); - if ( aWildeKarte.Matches( String(CMP_LOWER( aFound ), osl_getThreadTextEncoding()))) + if (aWildeKarte.Matches(rtl::OStringToOUString(CMP_LOWER(aFound), osl_getThreadTextEncoding()))) { aName = aFound; closedir( pDir ); @@ -1330,7 +1330,7 @@ DirEntry &DirEntry::operator+=( const DirEntry& rEntry ) String DirEntry::GetAccessDelimiter( FSysPathStyle eFormatter ) { - return String( ACCESSDELIM_C( GetStyle( eFormatter ) ) ); + return rtl::OUString( ACCESSDELIM_C( GetStyle( eFormatter ) ) ); } /************************************************************************* @@ -1774,7 +1774,7 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const FileStat aDestStat(rNewName); if ( aDestStat.IsKind(FSYS_KIND_DIR ) ) { - aDest += String(aName, osl_getThreadTextEncoding()); + aDest += DirEntry(rtl::OStringToOUString(aName, osl_getThreadTextEncoding())); } if ( aDest.Exists() ) { diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 1e3f408260c3..6be35f1271e3 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -237,8 +237,8 @@ String DirEntry::GetVolume() const mymnttab &rMnt = mymnt::get(); return ((buf.st_dev == rMnt.mountdevice || GetMountEntry(buf.st_dev, &rMnt)) ? - String(rMnt.mountspecial, osl_getThreadTextEncoding()) : - String()); + rtl::OStringToOUString(rMnt.mountspecial, osl_getThreadTextEncoding()) : + rtl::OUString()); } /************************************************************************* |