diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 09:23:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-05 21:39:45 +0100 |
| commit | 5218c0d6a8171400bee0d972ff05757849df4d19 (patch) | |
| tree | b323cfd6b6a8e080ad77b1ee0aeb5b132db1147c /tools/source | |
| parent | 6747dd33754a15e7d9f5aae01bb8299b6a05e365 (diff) | |
UniString(const rtl::OString ...) no longer implemented
Change-Id: Ie4fc4ed1a54889c1745a0d71d02211d6868340fa
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 12 | ||||
| -rw-r--r-- | tools/source/string/strucvt.cxx | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 3b6e9cd118bf..254c38310cfe 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -281,7 +281,7 @@ FSysError DirEntry::ImpParseName( const rtl::OString& rPfad ) DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); // die einzelnen Namen auf einen Stack packen - String aPfad( rPfad, osl_getThreadTextEncoding() ); + String aPfad(rtl::OStringToOUString(rPfad, osl_getThreadTextEncoding())); DirEntryStack aStack; do @@ -1789,8 +1789,8 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const // MoveTo nun atomar SetLastError(0); - DirEntry aFromDevice(String(bFrom, osl_getThreadTextEncoding())); - DirEntry aToDevice(String(bTo,osl_getThreadTextEncoding())); + DirEntry aFromDevice(rtl::OStringToOUString(bFrom, osl_getThreadTextEncoding())); + DirEntry aToDevice(rtl::OStringToOUString(bTo,osl_getThreadTextEncoding())); aFromDevice.ToAbs(); aToDevice.ToAbs(); aFromDevice=aFromDevice.GetDevice(); @@ -1811,11 +1811,11 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const //nein, also inter-device-move mit copy/delete FSysError nCopyError = CopyTo(rNewName, FSYS_ACTION_COPYFILE); - DirEntry aKill(String(bTo, osl_getThreadTextEncoding())); - FileStat aKillStat(String(bTo, osl_getThreadTextEncoding())); + DirEntry aKill(rtl::OStringToOUString(bTo, osl_getThreadTextEncoding())); + FileStat aKillStat(String(rtl::OStringToOUString(bTo, osl_getThreadTextEncoding()))); if ( aKillStat.IsKind(FSYS_KIND_DIR ) ) { - aKill += String(aName, osl_getThreadTextEncoding()); + aKill += String(rtl::OStringToOUString(aName, osl_getThreadTextEncoding())); } if (nCopyError==FSYS_ERR_OK) diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index f8d2dbd0d6b3..f4144c74040d 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -28,18 +28,6 @@ // ======================================================================= -UniString::UniString( const rtl::OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) -{ - DBG_CTOR( UniString, DbgCheckUniString ); - - mpData = NULL; - rtl_string2UString( (rtl_uString **)(&mpData), - rByteStr.getStr(), rByteStr.getLength(), - eTextEncoding, nCvtFlags ); -} - -// ----------------------------------------------------------------------- - UniString::UniString( const char* pByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) { |