Kaydet (Commit) cec3fd6d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:stringconstant: handle OUString+=OUString(literal)

Change-Id: I655751536bd084d01bce436c043eca754c58849f
üst c92853c9
...@@ -111,22 +111,17 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable ...@@ -111,22 +111,17 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable
static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
{ {
const OUString aChar( "\"" );
const OUString aClassName( rObjDesc.maClassName.GetHexName() ); const OUString aClassName( rObjDesc.maClassName.GetHexName() );
OUString aParams; OUString aParams;
if( !aClassName.isEmpty() ) if( !aClassName.isEmpty() )
{ {
aParams += OUString( ";classname=\"" ); aParams += ";classname=\"" + aClassName + "\"";
aParams += aClassName;
aParams += aChar;
} }
if( !rObjDesc.maTypeName.isEmpty() ) if( !rObjDesc.maTypeName.isEmpty() )
{ {
aParams += OUString( ";typename=\"" ); aParams += ";typename=\"" + rObjDesc.maTypeName + "\"";
aParams += rObjDesc.maTypeName;
aParams += aChar;
} }
if( !rObjDesc.maDisplayName.isEmpty() ) if( !rObjDesc.maDisplayName.isEmpty() )
...@@ -147,30 +142,18 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj ...@@ -147,30 +142,18 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj
pToAccept[nChar] = sal_True; pToAccept[nChar] = sal_True;
} }
aParams += OUString( ";displayname=\"" ); aParams += ";displayname=\""
aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); + rtl::Uri::encode(
aParams += aChar; rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8)
+ "\"";
} }
aParams += OUString( ";viewaspect=\"" ); aParams += ";viewaspect=\"" + OUString::number(rObjDesc.mnViewAspect)
aParams += OUString::number( rObjDesc.mnViewAspect ); + "\";width=\"" + OUString::number(rObjDesc.maSize.Width())
aParams += aChar; + "\";height=\"" + OUString::number(rObjDesc.maSize.Height())
+ "\";posx=\"" + OUString::number(rObjDesc.maDragStartPos.X())
aParams += OUString( ";width=\"" ); + "\";posy=\"" + OUString::number(rObjDesc.maDragStartPos.X()) + "\"";
aParams += OUString::number( rObjDesc.maSize.Width() );
aParams += aChar;
aParams += OUString( ";height=\"" );
aParams += OUString::number( rObjDesc.maSize.Height() );
aParams += aChar;
aParams += OUString( ";posx=\"" );
aParams += OUString::number( rObjDesc.maDragStartPos.X() );
aParams += aChar;
aParams += OUString( ";posy=\"" );
aParams += OUString::number( rObjDesc.maDragStartPos.X() );
aParams += aChar;
return aParams; return aParams;
} }
......
...@@ -32,14 +32,14 @@ bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const ...@@ -32,14 +32,14 @@ bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const
{ {
case SotClipboardFormatId::INET_IMAGE: case SotClipboardFormatId::INET_IMAGE:
{ {
OUString sString; OUString sString(
(sString += aImageURL ) += OUString(TOKEN_SEPARATOR); aImageURL + OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetURL
(sString += aTargetURL ) += OUString(TOKEN_SEPARATOR); + OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetFrame
(sString += aTargetFrame ) += OUString(TOKEN_SEPARATOR); + OUStringLiteral1<TOKEN_SEPARATOR>() + aAlternateText
(sString += aAlternateText ) += OUString(TOKEN_SEPARATOR); + OUStringLiteral1<TOKEN_SEPARATOR>()
sString += OUString::number( aSizePixel.Width() ); + OUString::number(aSizePixel.Width())
sString += OUString(TOKEN_SEPARATOR); + OUStringLiteral1<TOKEN_SEPARATOR>()
sString += OUString::number( aSizePixel.Height() ); + OUString::number(aSizePixel.Height()));
OString sOut(OUStringToOString(sString, OString sOut(OUStringToOString(sString,
RTL_TEXTENCODING_UTF8)); RTL_TEXTENCODING_UTF8));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment