summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-19 08:54:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-19 09:30:45 +0100
commited51a3a41670252cc2db95614f496b6559f02e0f (patch)
treec0bd901de9c084c9c389ab0321599cc8b0213ee2 /sw
parent876083ba299ec3d8ccece11d44d21fc636d0630d (diff)
ByteString->rtl::OString
Diffstat (limited to 'sw')
-rwxr-xr-xsw/source/ui/dochdl/swdtflvr.cxx23
1 files changed, 12 insertions, 11 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index c7591f96cc28..8da8d8cf9e4d 100755
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -3505,21 +3505,22 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
return sal_False;
rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
- const ByteString aAppNm( GetpApp()->GetAppName(), eEncoding );
- const ByteString aTopic( pDocShell->GetTitle( SFX_TITLE_FULLNAME ),
- eEncoding );
- const ByteString aName( sName, eEncoding );
+ const rtl::OString aAppNm(rtl::OUStringToOString(
+ GetpApp()->GetAppName(), eEncoding));
+ const rtl::OString aTopic(rtl::OUStringToOString(
+ pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding));
+ const rtl::OString aName(rtl::OUStringToOString(sName, eEncoding));
- sal_Char* pMem = new char[ aAppNm.Len() + aTopic.Len() + aName.Len() + 4 ];
+ sal_Char* pMem = new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ];
- xub_StrLen nLen = aAppNm.Len();
- memcpy( pMem, aAppNm.GetBuffer(), nLen );
+ sal_Int32 nLen = aAppNm.getLength();
+ memcpy( pMem, aAppNm.getStr(), nLen );
pMem[ nLen++ ] = 0;
- memcpy( pMem + nLen, aTopic.GetBuffer(), aTopic.Len() );
- nLen = nLen + aTopic.Len();
+ memcpy( pMem + nLen, aTopic.getStr(), aTopic.getLength() );
+ nLen = nLen + aTopic.getLength();
pMem[ nLen++ ] = 0;
- memcpy( pMem + nLen, aName.GetBuffer(), aName.Len() );
- nLen = nLen + aName.Len();
+ memcpy( pMem + nLen, aName.getStr(), aName.getLength() );
+ nLen = nLen + aName.getLength();
pMem[ nLen++ ] = 0;
pMem[ nLen++ ] = 0;