Kaydet (Commit) c471556c authored tarafından Takeshi Abe's avatar Takeshi Abe

Avoid temporary rtl::OUString in sd

üst 996f44c3
...@@ -128,42 +128,42 @@ SdFilterDetect::~SdFilterDetect() ...@@ -128,42 +128,42 @@ SdFilterDetect::~SdFilterDetect()
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{ {
// extract properties // extract properties
if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
{ {
lDescriptor[nProperty].Value >>= sTemp; lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp; aURL = sTemp;
} }
else if( !aURL.Len() && lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) ) else if( !aURL.Len() && lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) )
{ {
lDescriptor[nProperty].Value >>= sTemp; lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp; aURL = sTemp;
} }
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
{ {
lDescriptor[nProperty].Value >>= sTemp; lDescriptor[nProperty].Value >>= sTemp;
aTypeName = sTemp; aTypeName = sTemp;
} }
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) )
{ {
lDescriptor[nProperty].Value >>= sTemp; lDescriptor[nProperty].Value >>= sTemp;
aPreselectedFilterName = sTemp; aPreselectedFilterName = sTemp;
} }
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
nIndexOfInputStream = nProperty; nIndexOfInputStream = nProperty;
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
nIndexOfReadOnlyFlag = nProperty; nIndexOfReadOnlyFlag = nProperty;
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
nIndexOfContent = nProperty; nIndexOfContent = nProperty;
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
{ {
lDescriptor[nProperty].Value >>= bOpenAsTemplate; lDescriptor[nProperty].Value >>= bOpenAsTemplate;
nIndexOfTemplateFlag = nProperty; nIndexOfTemplateFlag = nProperty;
} }
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
lDescriptor[nProperty].Value >>= xInteraction; lDescriptor[nProperty].Value >>= xInteraction;
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
lDescriptor[nProperty].Value >>= bRepairPackage; lDescriptor[nProperty].Value >>= bRepairPackage;
else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")) ) else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
nIndexOfDocumentTitle = nProperty; nIndexOfDocumentTitle = nProperty;
} }
......
...@@ -1804,9 +1804,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r ...@@ -1804,9 +1804,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty ) for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty )
{ {
if( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) if( rxOptions[ nProperty ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RenderDevice")) )
rxOptions[ nProperty ].Value >>= xRenderDevice; rxOptions[ nProperty ].Value >>= xRenderDevice;
else if ( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ) ) else if ( rxOptions[ nProperty ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExportNotesPages")) )
{ {
rxOptions[ nProperty].Value >>= bExportNotesPages; rxOptions[ nProperty].Value >>= bExportNotesPages;
if ( bExportNotesPages ) if ( bExportNotesPages )
......
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