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

embeddedobj: Use appropriate OUString functions on string constants

Change-Id: I149dd1abf03437bb58829a5f16a8c2aef5eec092
üst eb0f855f
...@@ -652,8 +652,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const ...@@ -652,8 +652,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
uno::Reference< frame::XModel > xParentModel( m_xClientSite->getComponent(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xParentModel( m_xClientSite->getComponent(), uno::UNO_QUERY_THROW );
uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs(); uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs();
for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ ) for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ )
if ( aModelProps[nInd].Name.equals( if ( aModelProps[nInd].Name == "DocumentBaseURL" )
OUString( "DocumentBaseURL" ) ) )
{ {
aModelProps[nInd].Value >>= aBaseURL; aModelProps[nInd].Value >>= aBaseURL;
break; break;
...@@ -668,8 +667,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const ...@@ -668,8 +667,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
if ( aBaseURL.isEmpty() ) if ( aBaseURL.isEmpty() )
{ {
for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ ) for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ )
if ( m_aDocMediaDescriptor[nInd].Name.equals( if ( m_aDocMediaDescriptor[nInd].Name == "DocumentBaseURL" )
OUString( "DocumentBaseURL" ) ) )
{ {
m_aDocMediaDescriptor[nInd].Value >>= aBaseURL; m_aDocMediaDescriptor[nInd].Value >>= aBaseURL;
break; break;
......
...@@ -174,7 +174,7 @@ Interceptor::addStatusListener( ...@@ -174,7 +174,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Update"; aStateEvent.FeatureDescriptor = "Update";
aStateEvent.IsEnabled = sal_True; aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False; aStateEvent.Requery = sal_False;
aStateEvent.State <<= (OUString( "($1) ") + m_pDocHolder->GetTitle() ); aStateEvent.State <<= ( "($1) " + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent); Control->statusChanged(aStateEvent);
{ {
...@@ -198,7 +198,7 @@ Interceptor::addStatusListener( ...@@ -198,7 +198,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Close and Return"; aStateEvent.FeatureDescriptor = "Close and Return";
aStateEvent.IsEnabled = sal_True; aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False; aStateEvent.Requery = sal_False;
aStateEvent.State <<= (OUString( "($2) ") + m_pDocHolder->GetTitle() ); aStateEvent.State <<= ( "($2) " + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent); Control->statusChanged(aStateEvent);
......
...@@ -131,7 +131,7 @@ public: ...@@ -131,7 +131,7 @@ public:
OUString GetTitle() const OUString GetTitle() const
{ {
return m_aContainerName + OUString( " - " ) + m_aDocumentNamePart; return m_aContainerName + " - " + m_aDocumentNamePart;
} }
OUString GetContainerName() const { return m_aContainerName; } OUString GetContainerName() const { return m_aContainerName; }
......
...@@ -201,8 +201,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( ...@@ -201,8 +201,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
if ( !aNameWithExtention.isEmpty() ) if ( !aNameWithExtention.isEmpty() )
{ {
OUString aURLToAnalyze = OUString aURLToAnalyze = "file:///" + aNameWithExtention;
( OUString( "file:///" ) + aNameWithExtention );
aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze ); aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze );
} }
......
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