summaryrefslogtreecommitdiff
path: root/embeddedobj/source/general
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r--embeddedobj/source/general/docholder.cxx16
-rw-r--r--embeddedobj/source/general/intercept.cxx20
-rw-r--r--embeddedobj/source/general/xcreator.cxx8
3 files changed, 22 insertions, 22 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index c34cb8276eff..8bd51d6679be 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
m_aOutplaceFrameProps.realloc( 3 );
beans::NamedValue aArg;
- aArg.Name = OUString("TopWindow");
+ aArg.Name = "TopWindow";
aArg.Value <<= sal_True;
m_aOutplaceFrameProps[0] <<= aArg;
- aArg.Name = OUString("MakeVisible");
+ aArg.Name = "MakeVisible";
aArg.Value <<= sal_False;
m_aOutplaceFrameProps[1] <<= aArg;
@@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
}
m_refCount--;
- aArg.Name = OUString("ParentFrame");
+ aArg.Name = "ParentFrame";
aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame
m_aOutplaceFrameProps[2] <<= aArg;
}
@@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
uno::Sequence< uno::Any > aArgs( 2 );
beans::NamedValue aArg;
- aArg.Name = OUString("ContainerWindow");
+ aArg.Name = "ContainerWindow";
aArg.Value <<= xOwnWindow;
aArgs[0] <<= aArg;
uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY );
if ( xContFrame.is() )
{
- aArg.Name = OUString("ParentFrame");
+ aArg.Name = "ParentFrame";
aArg.Value <<= xContFrame;
aArgs[1] <<= aArg;
}
@@ -974,13 +974,13 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
if ( xServiceInfo.is()
&& xServiceInfo->supportsService("com.sun.star.report.ReportDefinition") )
{
- sUrl = OUString(".component:DB/ReportDesign");
+ sUrl = ".component:DB/ReportDesign";
}
else if( xServiceInfo.is()
&& xServiceInfo->supportsService("com.sun.star.chart2.ChartDocument"))
- sUrl = OUString("private:factory/schart");
+ sUrl = "private:factory/schart";
else
- sUrl = OUString("private:object");
+ sUrl = "private:object";
xComponentLoader->loadComponentFromURL( sUrl,
OUString( "_self" ),
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 1f160564fd7c..0f328cb27652 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -103,12 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder )
m_pDisposeEventListeners(0),
m_pStatCL(0)
{
- m_aInterceptedURL[0] = OUString(".uno:Save");
- m_aInterceptedURL[1] = OUString(".uno:SaveAll");
- m_aInterceptedURL[2] = OUString(".uno:CloseDoc");
- m_aInterceptedURL[3] = OUString(".uno:CloseWin");
- m_aInterceptedURL[4] = OUString(".uno:CloseFrame");
- m_aInterceptedURL[5] = OUString(".uno:SaveAs");
+ m_aInterceptedURL[0] = ".uno:Save";
+ m_aInterceptedURL[1] = ".uno:SaveAll";
+ m_aInterceptedURL[2] = ".uno:CloseDoc";
+ m_aInterceptedURL[3] = ".uno:CloseWin";
+ m_aInterceptedURL[4] = ".uno:CloseFrame";
+ m_aInterceptedURL[5] = ".uno:SaveAs";
}
@@ -166,7 +166,7 @@ Interceptor::dispatch(
if ( nInd == aNewArgs.getLength() )
{
aNewArgs.realloc( nInd + 1 );
- aNewArgs[nInd].Name = OUString( "SaveTo" );
+ aNewArgs[nInd].Name = "SaveTo";
aNewArgs[nInd].Value <<= sal_True;
}
@@ -194,7 +194,7 @@ Interceptor::addStatusListener(
{ // Save
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
- aStateEvent.FeatureDescriptor = OUString("Update");
+ aStateEvent.FeatureDescriptor = "Update";
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (OUString( "($1) ") + m_pDocHolder->GetTitle() );
@@ -218,7 +218,7 @@ Interceptor::addStatusListener(
{ // Close and return
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
- aStateEvent.FeatureDescriptor = OUString("Close and Return");
+ aStateEvent.FeatureDescriptor = "Close and Return";
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (OUString( "($2) ") + m_pDocHolder->GetTitle() );
@@ -240,7 +240,7 @@ Interceptor::addStatusListener(
{ // SaveAs
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
- aStateEvent.FeatureDescriptor = OUString("SaveCopyTo");
+ aStateEvent.FeatureDescriptor = "SaveCopyTo";
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (OUString( "($3)"));
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 64d2e03ee395..f909ba5ff2bf 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -43,8 +43,8 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
{
uno::Sequence< OUString > aRet(2);
- aRet[0] = OUString("com.sun.star.embed.EmbeddedObjectCreator");
- aRet[1] = OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
+ aRet[0] = "com.sun.star.embed.EmbeddedObjectCreator";
+ aRet[1] = "com.sun.star.comp.embed.EmbeddedObjectCreator";
return aRet;
}
@@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
{
// use system fallback
// TODO: in future users factories can be tested
- aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
+ aEmbedFactory = "com.sun.star.embed.OLEEmbeddedObjectFactory";
}
uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) );
@@ -186,7 +186,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Any aAny = xPropSet->getPropertyValue("MediaType");
aAny >>= aMediaType;
if ( aMediaType == "application/vnd.sun.star.oleobject" )
- aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
+ aEmbedFactory = "com.sun.star.embed.OLEEmbeddedObjectFactory";
}
catch ( const uno::Exception& )
{