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
static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
{
const OUString aChar( "\"" );
const OUString aClassName( rObjDesc.maClassName.GetHexName() );
OUString aParams;
if( !aClassName.isEmpty() )
{
aParams += OUString( ";classname=\"" );
aParams += aClassName;
aParams += aChar;
aParams += ";classname=\"" + aClassName + "\"";
}
if( !rObjDesc.maTypeName.isEmpty() )
{
aParams += OUString( ";typename=\"" );
aParams += rObjDesc.maTypeName;
aParams += aChar;
aParams += ";typename=\"" + rObjDesc.maTypeName + "\"";
}
if( !rObjDesc.maDisplayName.isEmpty() )
......@@ -147,30 +142,18 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj
pToAccept[nChar] = sal_True;
}
aParams += OUString( ";displayname=\"" );
aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
aParams += aChar;
aParams += ";displayname=\""
+ rtl::Uri::encode(
rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8)
+ "\"";
}
aParams += OUString( ";viewaspect=\"" );
aParams += OUString::number( rObjDesc.mnViewAspect );
aParams += aChar;
aParams += OUString( ";width=\"" );
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;
aParams += ";viewaspect=\"" + OUString::number(rObjDesc.mnViewAspect)
+ "\";width=\"" + OUString::number(rObjDesc.maSize.Width())
+ "\";height=\"" + OUString::number(rObjDesc.maSize.Height())
+ "\";posx=\"" + OUString::number(rObjDesc.maDragStartPos.X())
+ "\";posy=\"" + OUString::number(rObjDesc.maDragStartPos.X()) + "\"";
return aParams;
}
......
......@@ -32,14 +32,14 @@ bool INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const
{
case SotClipboardFormatId::INET_IMAGE:
{
OUString sString;
(sString += aImageURL ) += OUString(TOKEN_SEPARATOR);
(sString += aTargetURL ) += OUString(TOKEN_SEPARATOR);
(sString += aTargetFrame ) += OUString(TOKEN_SEPARATOR);
(sString += aAlternateText ) += OUString(TOKEN_SEPARATOR);
sString += OUString::number( aSizePixel.Width() );
sString += OUString(TOKEN_SEPARATOR);
sString += OUString::number( aSizePixel.Height() );
OUString sString(
aImageURL + OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetURL
+ OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetFrame
+ OUStringLiteral1<TOKEN_SEPARATOR>() + aAlternateText
+ OUStringLiteral1<TOKEN_SEPARATOR>()
+ OUString::number(aSizePixel.Width())
+ OUStringLiteral1<TOKEN_SEPARATOR>()
+ OUString::number(aSizePixel.Height()));
OString sOut(OUStringToOString(sString,
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