diff options
author | Ádám Csaba Király <kiraly.adam.csaba@gmail.com> | 2013-03-05 10:35:52 +0100 |
---|---|---|
committer | Muthu Subramanian K <muthusuba@gmail.com> | 2013-03-05 12:48:36 +0000 |
commit | 10bb5b8e24b90f881ac0ef758bb11a0bbd531a67 (patch) | |
tree | 267abbb4d2fa1bcb47e2defccea21cef67dacb0a /svtools | |
parent | de02e1e546a2141567afd8a90e54bcde72550ab1 (diff) |
fdo#38838, replacement of String with OUString
Replaced String with OUString in mediawindow.cxx, basdoc.cxx,
basdoc.hxx and bastype3.cxx. In other files I only replaced,
what was necessary for the changes in basdoc to work.
Change-Id: I1ad0e7e262f8becdf57f182853aaa914a88895a4
Reviewed-on: https://gerrit.libreoffice.org/2554
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/transfer.hxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 93dab759a89b..d7f2a350cbee 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -79,8 +79,8 @@ struct TransferableObjectDescriptor Point maDragStartPos; Size maSize; sal_uInt32 mnOle2Misc; - String maTypeName; - String maDisplayName; + OUString maTypeName; + OUString maDisplayName; sal_Bool mbCanLink; TransferableObjectDescriptor() diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 55e72daa1981..e702089e8d08 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -155,14 +155,14 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto aParams += aChar; } - if( rObjDesc.maTypeName.Len() ) + if( !rObjDesc.maTypeName.isEmpty() ) { aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); aParams += rObjDesc.maTypeName; aParams += aChar; } - if( rObjDesc.maDisplayName.Len() ) + if( !rObjDesc.maDisplayName.isEmpty() ) { // the display name might contain unacceptable characters, encode all of them // this seems to be the only parameter currently that might contain such characters |