summaryrefslogtreecommitdiff
path: root/sot/source/sdstor
diff options
context:
space:
mode:
Diffstat (limited to 'sot/source/sdstor')
-rw-r--r--sot/source/sdstor/stgdir.cxx2
-rw-r--r--sot/source/sdstor/stgole.cxx4
-rw-r--r--sot/source/sdstor/storinfo.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 7a69118569ef..da8d00ad9fd8 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -758,7 +758,7 @@ StgDirStrm::StgDirStrm( StgIo& r )
{
StgEntry aRoot;
aRoot.Init();
- aRoot.SetName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Root Entry" ) ) );
+ aRoot.SetName( rtl::OUString("Root Entry") );
aRoot.SetType( STG_ROOT );
pRoot = new StgDirEntry( aRoot );
pRoot->SetDirty();
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 68a7a3a00c6f..b23280ccb14f 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -103,7 +103,7 @@ void StgInternalStream::Commit()
///////////////////////// class StgCompObjStream /////////////////////////
StgCompObjStream::StgCompObjStream( BaseStorage& rStg, sal_Bool bWr )
- : StgInternalStream( rStg, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\1CompObj" ) ), bWr )
+ : StgInternalStream( rStg, rtl::OUString("\1CompObj"), bWr )
{
memset( &aClsId, 0, sizeof( ClsId ) );
nCbFormat = 0;
@@ -168,7 +168,7 @@ sal_Bool StgCompObjStream::Store()
/////////////////////////// class StgOleStream ///////////////////////////
StgOleStream::StgOleStream( BaseStorage& rStg, sal_Bool bWr )
- : StgInternalStream( rStg, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\1Ole" ) ), bWr )
+ : StgInternalStream( rStg, rtl::OUString("\1Ole"), bWr )
{
nFlags = 0;
}
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index d3a84809f423..b0be41e9a295 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -47,7 +47,7 @@ sal_uLong ReadClipboardFormat( SvStream & rStm )
sal_Char * p = new sal_Char[ nLen ];
if( rStm.Read( p, nLen ) == (sal_uLong) nLen )
{
- nFormat = SotExchange::RegisterFormatName( String::CreateFromAscii( p, short(nLen-1) ) );
+ nFormat = SotExchange::RegisterFormatName(rtl::OUString(p, nLen-1, RTL_TEXTENCODING_ASCII_US));
}
else
rStm.SetError( SVSTREAM_GENERALERROR );