summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-18 13:23:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-18 14:12:25 +0100
commit9f806fcad27f96ad4530478ec4a4fdce69e20c8e (patch)
tree2c3cce2cf086bb471fb66d731d3cedb0ac8e462c /embeddedobj
parenteb0f855f8cd893d4f9ed99028f58f138ccc1211a (diff)
embeddedobj: Use appropriate OUString functions on string constants
Change-Id: I149dd1abf03437bb58829a5f16a8c2aef5eec092
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx6
-rw-r--r--embeddedobj/source/general/intercept.cxx4
-rw-r--r--embeddedobj/source/inc/docholder.hxx2
-rw-r--r--embeddedobj/source/msole/ownview.cxx3
4 files changed, 6 insertions, 9 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index e3f615df4e01..8367d94273bf 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -652,8 +652,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
uno::Reference< frame::XModel > xParentModel( m_xClientSite->getComponent(), uno::UNO_QUERY_THROW );
uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs();
for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ )
- if ( aModelProps[nInd].Name.equals(
- OUString( "DocumentBaseURL" ) ) )
+ if ( aModelProps[nInd].Name == "DocumentBaseURL" )
{
aModelProps[nInd].Value >>= aBaseURL;
break;
@@ -668,8 +667,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
if ( aBaseURL.isEmpty() )
{
for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ )
- if ( m_aDocMediaDescriptor[nInd].Name.equals(
- OUString( "DocumentBaseURL" ) ) )
+ if ( m_aDocMediaDescriptor[nInd].Name == "DocumentBaseURL" )
{
m_aDocMediaDescriptor[nInd].Value >>= aBaseURL;
break;
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index d64b49cf1a0a..3f0afee1a12b 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -174,7 +174,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Update";
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
- aStateEvent.State <<= (OUString( "($1) ") + m_pDocHolder->GetTitle() );
+ aStateEvent.State <<= ( "($1) " + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent);
{
@@ -198,7 +198,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Close and Return";
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
- aStateEvent.State <<= (OUString( "($2) ") + m_pDocHolder->GetTitle() );
+ aStateEvent.State <<= ( "($2) " + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent);
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 26e513b69444..a35209ebe35f 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -131,7 +131,7 @@ public:
OUString GetTitle() const
{
- return m_aContainerName + OUString( " - " ) + m_aDocumentNamePart;
+ return m_aContainerName + " - " + m_aDocumentNamePart;
}
OUString GetContainerName() const { return m_aContainerName; }
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 277b0c43e578..f572d02ba6d9 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -201,8 +201,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
if ( !aNameWithExtention.isEmpty() )
{
- OUString aURLToAnalyze =
- ( OUString( "file:///" ) + aNameWithExtention );
+ OUString aURLToAnalyze = "file:///" + aNameWithExtention;
aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze );
}