summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-31 18:04:19 +0200
committerNoel Grandin <noel@peralex.com>2013-11-08 14:50:59 +0200
commit9d7712b48ddaa0f308b669625b5ebbb1a3e75634 (patch)
treef9e16d3650522393bc943bf4a5b6f08c3f7f5940 /sfx2/source/appl
parentda20c7f4396b127072074f4d7999ed29deee02f0 (diff)
remove unnecessary use of OUString constructor in SFX2 module
Change-Id: Ieafc413136a9b4b907de034914d918212e4c16e3
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appbaslib.cxx4
-rw-r--r--sfx2/source/appl/appopen.cxx8
-rw-r--r--sfx2/source/appl/appserv.cxx9
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx16
-rw-r--r--sfx2/source/appl/xpackcreator.cxx4
6 files changed, 21 insertions, 22 deletions
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 14125482f4f1..15c539d4fd75 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -165,7 +165,7 @@ Sequence< OUString > SfxApplicationDialogLibraryContainer::impl_getStaticSupport
if( bNeedsInit )
{
OUString* pSeq = seqServiceNames.getArray();
- pSeq[0] = OUString("com.sun.star.script.ApplicationDialogLibraryContainer");
+ pSeq[0] = "com.sun.star.script.ApplicationDialogLibraryContainer";
bNeedsInit = sal_False;
}
return seqServiceNames;
@@ -194,7 +194,7 @@ Sequence< OUString > SfxApplicationScriptLibraryContainer::impl_getStaticSupport
{
Sequence< OUString > seqServiceNames( 1 );
OUString* pSeq = seqServiceNames.getArray();
- pSeq[0] = OUString("com.sun.star.script.ApplicationScriptLibraryContainer");
+ pSeq[0] = "com.sun.star.script.ApplicationScriptLibraryContainer";
return seqServiceNames;
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 26a357081417..a758478d36b1 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -891,8 +891,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
Sequence < OUString > aProtocols(2);
// add special protocols that always should be treated as internal
- aProtocols[0] = OUString("private:*");
- aProtocols[1] = OUString("vnd.sun.star.*");
+ aProtocols[0] = "private:*";
+ aProtocols[1] = "vnd.sun.star.*";
// get registered protocol handlers from configuration
Reference < XNameAccess > xAccess(officecfg::Office::ProtocolHandler::HandlerSet::get());
@@ -1036,12 +1036,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False );
if ( pNewViewItem && pNewViewItem->GetValue() )
- aTarget = OUString("_blank" );
+ aTarget = "_blank" ;
}
if ( bHidden )
{
- aTarget = OUString("_blank");
+ aTarget = "_blank";
DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" );
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 36bf04342a68..f7116e3e7d4b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -202,9 +202,8 @@ static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL )
using namespace osl;
DirectoryItem aDirItem;
- rURL = OUString( "$BRAND_BASE_DIR/" );
- rURL += OUString::createFromAscii( pName );
- rURL += OUString::createFromAscii( pExt );
+ rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
+ OUString::createFromAscii( pExt );
rtl::Bootstrap::expandMacros( rURL );
if (!rURL.isEmpty())
@@ -219,9 +218,9 @@ static void showDocument( const char* pBaseName )
try {
Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
Sequence < com::sun::star::beans::PropertyValue > args(2);
- args[0].Name = OUString("ViewOnly");
+ args[0].Name = "ViewOnly";
args[0].Value <<= sal_True;
- args[1].Name = OUString("ReadOnly");
+ args[1].Name = "ReadOnly";
args[1].Value <<= sal_True;
OUString aURL;
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index be63e3c7f41e..e51bea83fb16 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -300,7 +300,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8));
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = OUString("Data");
+ aSeq[0].Name = "Data";
aSeq[0].Value <<= aWinData.makeStringAndClear();
aWinOpt.SetUserData( aSeq );
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 201a15323b5e..1929c9b8b519 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -336,7 +336,7 @@ void ShutdownIcon::FromTemplate()
xFrame = Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
URL aTargetURL;
- aTargetURL.Complete = OUString( "slot:5500" );
+ aTargetURL.Complete = "slot:5500";
Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
xTrans->parseStrict( aTargetURL );
@@ -353,7 +353,7 @@ void ShutdownIcon::FromTemplate()
{
Sequence<PropertyValue> aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = OUString("Referer");
+ pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
if ( xNotifyer.is() )
@@ -444,15 +444,15 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
Reference < com::sun::star::task::XInteractionHandler2 > xInteraction(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
- aArgs[0].Name = OUString("InteractionHandler");
+ aArgs[0].Name = "InteractionHandler";
aArgs[0].Value <<= xInteraction;
sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG;
- aArgs[1].Name = OUString("MacroExecutionMode");
+ aArgs[1].Name = "MacroExecutionMode";
aArgs[1].Value <<= nMacroExecMode;
sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
- aArgs[2].Name = OUString("UpdateDocMode");
+ aArgs[2].Name = "UpdateDocMode";
aArgs[2].Value <<= nUpdateDoc;
// use the filedlghelper to get the current filter name,
@@ -474,7 +474,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( bReadOnly )
{
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString("ReadOnly");
+ aArgs[nArgs-1].Name = "ReadOnly";
aArgs[nArgs-1].Value <<= bReadOnly;
}
@@ -489,7 +489,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
sal_Int16 uVersion = (sal_Int16)iVersion;
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString("Version");
+ aArgs[nArgs-1].Name = "Version";
aArgs[nArgs-1].Value <<= uVersion;
}
@@ -514,7 +514,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( !aFilterName.isEmpty() )
{
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString("FilterName");
+ aArgs[nArgs-1].Name = "FilterName";
aArgs[nArgs-1].Value <<= aFilterName;
}
}
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 0b7c70c49f3e..fbe0a40f7f2a 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -38,8 +38,8 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
{
uno::Sequence< OUString > aRet(2);
- aRet[0] = OUString("com.sun.star.embed.PackageStructureCreator");
- aRet[1] = OUString("com.sun.star.comp.embed.PackageStructureCreator");
+ aRet[0] = "com.sun.star.embed.PackageStructureCreator";
+ aRet[1] = "com.sun.star.comp.embed.PackageStructureCreator";
return aRet;
}