[Libreoffice-commits] core.git: 4 commits - sd/source sfx2/source shell/source stoc/source stoc/test
Noel Grandin
noel at peralex.com
Fri Nov 8 04:51:30 PST 2013
sd/source/core/drawdoc4.cxx | 2
sd/source/filter/html/HtmlOptionsDialog.cxx | 3
sd/source/filter/html/buttonset.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 2
sd/source/ui/remotecontrol/ImagePreparer.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 8 -
sd/source/ui/view/DocumentRenderer.cxx | 6 -
sfx2/source/appl/appbaslib.cxx | 4
sfx2/source/appl/appopen.cxx | 8 -
sfx2/source/appl/appserv.cxx | 9 -
sfx2/source/appl/childwin.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 16 +-
sfx2/source/appl/xpackcreator.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 12 +-
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/dialog/backingcomp.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 4
sfx2/source/doc/docfac.cxx | 10 -
sfx2/source/doc/docfile.cxx | 16 +-
sfx2/source/doc/doctempl.cxx | 8 -
sfx2/source/doc/doctemplates.cxx | 58 ++++------
sfx2/source/doc/guisaveas.cxx | 12 +-
sfx2/source/doc/ownsubfilterservice.cxx | 4
sfx2/source/doc/printhelper.cxx | 6 -
sfx2/source/doc/sfxbasemodel.cxx | 28 ++--
sfx2/source/inet/inettbc.cxx | 8 -
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewprn.cxx | 20 +--
shell/source/cmdmail/cmdmailmsg.cxx | 14 +-
shell/source/cmdmail/cmdmailsuppl.cxx | 2
shell/source/unix/exec/shellexec.cxx | 2
shell/source/win32/SysShExec.cxx | 2
shell/source/win32/simplemail/smplmailsuppl.cxx | 2
shell/source/win32/workbench/TestSmplMail.cxx | 6 -
stoc/source/corereflection/criface.cxx | 2
stoc/source/inspect/introspection.cxx | 2
stoc/source/invocation/invocation.cxx | 6 -
stoc/source/javavm/javavm.cxx | 52 ++++----
stoc/source/servicemanager/servicemanager.cxx | 15 +-
stoc/source/simpleregistry/simpleregistry.cxx | 2
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 2
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 2
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 2
stoc/test/testiadapter.cxx | 6 -
stoc/test/testintrosp.cxx | 46 +++----
stoc/test/testsmgr_cpnt.cxx | 6 -
48 files changed, 215 insertions(+), 222 deletions(-)
New commits:
commit 272e48c681cf80b978d3cfc9c8d843bc7d1e71d2
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 4 09:19:35 2013 +0200
remove unnecessary use of OUString constructor in SD module
Change-Id: Id3591b232b43deeb70e3e2fffb5c6a8f561223dd
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index daa51ca..5084044 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1056,7 +1056,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
case SVX_NUMBER_NONE:
- aPageNumValue = OUString(" ");
+ aPageNumValue = " ";
break;
default:
aPageNumValue += OUString::number(nNum);
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 75c7e74..25c94ea 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -121,8 +121,7 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames()
throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = OUString("com.sun.star.ui.dialog.FilterOptionsDialog");
+ aRet[0] = "com.sun.star.ui.dialog.FilterOptionsDialog";
return aRet;
}
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 9e0c36a..4ff9f57 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -94,7 +94,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
if( xInputStream.is() && xGraphicProvider.is() ) try
{
Sequence< PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = OUString("InputStream" );
+ aMediaProperties[0].Name = "InputStream";
aMediaProperties[0].Value <<= xInputStream;
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index dbcd826..9fbaafc 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -158,7 +158,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
// get Powerpoint filter
- OUString aExt = OUString(".ppt");
+ OUString aExt = ".ppt";
pFilter = aMatch.GetFilter4Extension( aExt );
if( pFilter )
xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 34b41bc..f9641b0 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -386,7 +386,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUr
if ( !bHasBaseURL )
{
aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" );
+ aArgs[nEnd-1].Name = "DocumentBaseURL";
aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True );
}
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index e340e01..0fddd1b 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -189,7 +189,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
bWasReadOnly = pItem && pItem->GetValue();
const SfxFilter* pFilter = 0;
- OUString aPrefix = OUString("private:factory/");
+ OUString aPrefix = "private:factory/";
if( aURL.startsWith( aPrefix ) )
{
if( SvtModuleOptions().IsImpress() )
@@ -313,7 +313,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
if ( !bRepairAllowed )
{
- aTypeName = OUString();
+ aTypeName = "";
pFilter = 0;
}
}
@@ -324,7 +324,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
}
catch( Exception& )
{
- aTypeName = OUString();
+ aTypeName = "";
pFilter = 0;
}
@@ -497,7 +497,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
}
if (!pFilter)
- aTypeName = OUString();
+ aTypeName = "";
return aTypeName;
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 89141cd..ceac0ac 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -393,7 +393,7 @@ namespace {
{
// load the writer PrinterOptions into the custom tab
beans::PropertyValue aOptionsUIFile;
- aOptionsUIFile.Name = OUString("OptionsUIFile");
+ aOptionsUIFile.Name = "OptionsUIFile";
if( mbImpress )
aOptionsUIFile.Value <<= OUString("modules/simpress/ui/printeroptions.ui");
else
@@ -1495,7 +1495,7 @@ private:
if (mpOptions->IsDate())
{
aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date( Date::SYSTEM ) );
- aInfo.msTimeDate += OUString((sal_Unicode)' ');
+ aInfo.msTimeDate += " ";
}
if (mpOptions->IsTime())
@@ -2002,7 +2002,7 @@ private:
if (mpOptions->IsPrintPageName())
{
rInfo.msPageString = pPage->GetName();
- rInfo.msPageString += OUString(sal_Unicode(' '));
+ rInfo.msPageString += " ";
}
else
rInfo.msPageString = "";
commit 9d7712b48ddaa0f308b669625b5ebbb1a3e75634
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 18:04:19 2013 +0200
remove unnecessary use of OUString constructor in SFX2 module
Change-Id: Ieafc413136a9b4b907de034914d918212e4c16e3
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 1412548..15c539d 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 26a3570..a758478 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 36bf043..f7116e3 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 be63e3c..e51bea8 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 201a153..1929c9b 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 0b7c70c..fbe0a40f7 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;
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index c35c156..14124f6 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -484,7 +484,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
// The DocumentService property is only a preselection, and all preselections are considered as optional!
// This "wrong" type will be sorted out now because we match only allowed filters to the detected type
uno::Sequence< beans::NamedValue > lQuery(1);
- lQuery[0].Name = OUString("Name");
+ lQuery[0].Name = "Name";
lQuery[0].Value <<= sTypeName;
pFilter = GetFilterForProps(lQuery, nMust, nDont);
@@ -677,7 +677,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, S
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = OUString("MediaType");
+ aSeq[0].Name = "MediaType";
aSeq[0].Value <<= rMediaType;
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -706,7 +706,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const OUString& rType, SfxFilte
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = OUString("Name");
+ aSeq[0].Name = "Name";
aSeq[0].Value <<= OUString( rType );
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -745,7 +745,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const OUString& rExt, Sf
sExt = sExt.copy(1);
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = OUString("Extensions");
+ aSeq[0].Name = "Extensions";
uno::Sequence < OUString > aExts(1);
aExts[0] = sExt;
aSeq[0].Value <<= aExts;
@@ -759,7 +759,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
OUString aName = SotExchange::GetFormatName( nId );
- aSeq[0].Name = OUString("ClipboardFormat");
+ aSeq[0].Name = "ClipboardFormat";
aSeq[0].Value <<= aName;
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -996,7 +996,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
// Extension preferred by the filter. This takes precedence
// over those that are given in the file format type.
lFilterProperties[nFilterProperty].Value >>= sExtension;
- sExtension = OUString("*.") + sExtension;
+ sExtension = "*." + sExtension;
}
else if ( lFilterProperties[nFilterProperty].Name == "Type" )
{
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 09c57b3..2576b14 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -666,7 +666,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
// so we must retrieve this as an argument from the parsed URL
lNewArgs.realloc( lNewArgs.getLength()+1 );
nMarkArg = lNewArgs.getLength()-1;
- lNewArgs[nMarkArg].Name = OUString("Bookmark");
+ lNewArgs[nMarkArg].Name = "Bookmark";
lNewArgs[nMarkArg].Value <<= aURL.Mark;
}
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index dface02..d202a1c 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -640,7 +640,7 @@ void SAL_CALL BackingComp::dispose()
// kill the menu
css::util::URL aURL;
- aURL.Complete = OUString(".uno:close");
+ aURL.Complete = ".uno:close";
css::uno::Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(m_xContext);
if (xParser.is())
xParser->parseStrict(aURL);
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 4b6d749..fa3408f 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -501,7 +501,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = OUString("Referer");
+ pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
dispatchURL( TEMPLATE_URL, OUString(), xFrame, aArgs );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fc92e36..bc606f8 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2181,7 +2181,7 @@ CmisYesNo::CmisYesNo( Window* pParent, bool bValue )
CmisPropertyLine::CmisPropertyLine( Window* pParent )
{
m_nNumValue = 1;
- m_sId = OUString("");
+ m_sId = "";
m_sType = CMIS_TYPE_STRING;
m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui");
get( m_pFrame, "CmisFrame" );
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 614cb26..ecfbf17 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2327,7 +2327,7 @@ namespace comp_CompatWriterDocProps {
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< OUString > aServiceNames(1);
- aServiceNames[ 0 ] = OUString( "com.sun.star.writer.DocumentProperties" );
+ aServiceNames[ 0 ] = "com.sun.star.writer.DocumentProperties";
return aServiceNames;
}
@@ -2350,7 +2350,7 @@ OUString SAL_CALL _getImplementationName() {
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< OUString > s(1);
- s[0] = OUString("com.sun.star.document.DocumentProperties");
+ s[0] = "com.sun.star.document.DocumentProperties";
return s;
}
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index cc2119a..7018591 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -201,7 +201,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU
static OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection");
static OUString CONF_ROOT("/org.openoffice.Setup");
- static OUString CONF_PATH = OUString("Office/Factories/" ) + OUString( rServiceName );
+ static OUString CONF_PATH = "Office/Factories/" + rServiceName;
static OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged");
static OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter");
@@ -272,18 +272,18 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU
aProps2.getUnpackedValueOrDefault("PreferredFilter", OUString() );
uno::Sequence< beans::PropertyValue > aArgs( 3 );
- aArgs[0].Name = OUString("FilterName");
+ aArgs[0].Name = "FilterName";
aArgs[0].Value <<= aFilterName;
- aArgs[1].Name = OUString("AsTemplate");
+ aArgs[1].Name = "AsTemplate";
aArgs[1].Value <<= sal_True;
- aArgs[2].Name = OUString("URL");
+ aArgs[2].Name = "URL";
aArgs[2].Value <<= OUString( rTemplateName );
uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( OUString( rServiceName ) ), uno::UNO_QUERY );
xLoadable->load( aArgs );
aArgs.realloc( 2 );
- aArgs[1].Name = OUString("Overwrite");
+ aArgs[1].Name = "Overwrite";
aArgs[1].Value <<= sal_True;
uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a82ebe5..95ff9dd 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -887,9 +887,9 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& a
if ( !aInfo.isEmpty() && !aData[LOCKFILE_EDITTIME_ID].isEmpty() )
{
- aInfo += OUString( " ( " );
+ aInfo += " ( " ;
aInfo += aData[LOCKFILE_EDITTIME_ID];
- aInfo += OUString( " )" );
+ aInfo += " )";
}
}
@@ -1264,9 +1264,9 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
new utl::ProgressHandlerWrap( xStatusIndicator ) );
uno::Sequence< beans::PropertyValue > aAddProps( 2 );
- aAddProps[0].Name = OUString("RepairPackage");
+ aAddProps[0].Name = "RepairPackage";
aAddProps[0].Value <<= (sal_Bool)true;
- aAddProps[1].Name = OUString("StatusIndicator");
+ aAddProps[1].Name = "StatusIndicator";
aAddProps[1].Value <<= xProgressHandler;
// the first arguments will be filled later
@@ -2222,7 +2222,7 @@ void SfxMedium::ClearBackup_Impl()
if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) )
{
pImp->m_bRemoveBackup = false;
- pImp->m_aBackupURL = OUString();
+ pImp->m_aBackupURL = "";
}
else
{
@@ -2232,7 +2232,7 @@ void SfxMedium::ClearBackup_Impl()
}
}
else
- pImp->m_aBackupURL = OUString();
+ pImp->m_aBackupURL = "";
}
//----------------------------------------------------------------
@@ -2818,7 +2818,7 @@ void SfxMedium::CompleteReOpen()
{
pTmpFile = pImp->pTempFile;
pImp->pTempFile = NULL;
- pImp->m_aName = OUString();
+ pImp->m_aName = "";
}
GetMedium_Impl();
@@ -3280,7 +3280,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
return;
DELETEZ( pImp->pTempFile );
- pImp->m_aName = OUString();
+ pImp->m_aName = "";
}
pImp->pTempFile = new ::utl::TempFile();
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index afd3b92..e52d6c5 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -832,7 +832,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
uno::Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = OUString("Hidden");
+ aArgs[0].Name = "Hidden";
aArgs[0].Value <<= sal_True;
INetURLObject aTemplURL( rName );
@@ -1604,8 +1604,8 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle,
// now get the content of the region
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps(2);
- aProps[0] = OUString(TITLE );
- aProps[1] = OUString(TARGET_URL );
+ aProps[0] = TITLE;
+ aProps[1] = TARGET_URL;
try
{
@@ -1641,7 +1641,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot )
{
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps(1);
- aProps[0] = OUString(TITLE );
+ aProps[0] = TITLE;
try
{
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 341d86f..654a7e3 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -406,9 +406,7 @@ void SfxDocTplService_Impl::init_Impl()
// set maRootContent to the root of the templates hierarchy. Create the
// entry if necessary
- maRootURL = OUString( TEMPLATE_ROOT_URL );
- maRootURL += OUString( '/' );
- maRootURL += aLang;
+ maRootURL = ( TEMPLATE_ROOT_URL "/" ) + aLang;
OUString aTemplVersPropName( TEMPLATE_VERSION );
OUString aTemplVers( TEMPLATE_VERSION_VALUE );
@@ -445,7 +443,7 @@ void SfxDocTplService_Impl::init_Impl()
"cannot create DocumentProperties service:" << e.Message);
}
- OUString const aService = OUString( SERVICENAME_TYPEDETECTION );
+ OUString const aService = SERVICENAME_TYPEDETECTION;
mxType = uno::Reference< XTypeDetection > ( mxContext->getServiceManager()->createInstanceWithContext(aService, mxContext), UNO_QUERY );
getDirList();
@@ -616,9 +614,9 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt
rURL, embed::ElementModes::READWRITE);
uno::Sequence<beans::PropertyValue> medium(2);
- medium[0].Name = OUString("DocumentBaseURL");
+ medium[0].Name = "DocumentBaseURL";
medium[0].Value <<= rURL;
- medium[1].Name = OUString("URL");
+ medium[1].Name = "URL";
medium[1].Value <<= rURL;
m_xDocProps->storeToStorage(xStorage, medium);
@@ -696,9 +694,9 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder,
if ( ! Content::create( aLinkURL, maCmdEnv, comphelper::getProcessComponentContext(), aLink ) )
{
Sequence< OUString > aNames(3);
- aNames[0] = OUString( TITLE );
- aNames[1] = OUString( IS_FOLDER );
- aNames[2] = OUString( TARGET_URL );
+ aNames[0] = TITLE;
+ aNames[1] = IS_FOLDER;
+ aNames[2] = TARGET_URL;
Sequence< Any > aValues(3);
aValues[0] = makeAny( rTitle );
@@ -747,8 +745,8 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
try
{
Sequence< OUString > aNames(2);
- aNames[0] = OUString( TITLE );
- aNames[1] = OUString( IS_FOLDER );
+ aNames[0] = TITLE;
+ aNames[1] = IS_FOLDER;
Sequence< Any > aValues(2);
aValues[0] = makeAny( aFolderName );
@@ -757,9 +755,9 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
OUString aType;
if ( bFsysFolder )
- aType = OUString( TYPE_FSYS_FOLDER );
+ aType = TYPE_FSYS_FOLDER;
else
- aType = OUString( TYPE_FOLDER );
+ aType = TYPE_FOLDER;
aParent.insertNewContent( aType, aNames, aValues, rNewFolder );
bCreatedFolder = sal_True;
@@ -812,8 +810,8 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString&
try
{
Sequence< OUString > aNames(2);
- aNames[0] = OUString( TITLE );
- aNames[1] = OUString( IS_FOLDER );
+ aNames[0] = TITLE;
+ aNames[1] = IS_FOLDER;
Sequence< Any > aValues(2);
aValues[0] = makeAny( aTryName );
@@ -872,14 +870,14 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a
if ( nInd )
aTryName += OUString::number( nInd );
if ( aExt.toChar() != '.' )
- aTryName += OUString( "." );
+ aTryName += ".";
aTryName += aExt;
try
{
Sequence< OUString > aNames(2);
- aNames[0] = OUString( TITLE );
- aNames[1] = OUString( IS_DOCUMENT );
+ aNames[0] = TITLE;
+ aNames[1] = IS_DOCUMENT;
Sequence< Any > aValues(2);
aValues[0] = makeAny( aTryName );
@@ -1562,7 +1560,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps( 1 );
- aProps[0] = OUString(TARGET_URL );
+ aProps[0] = TARGET_URL;
try
{
@@ -1679,7 +1677,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps( 1 );
- aProps[0] = OUString(TARGET_URL );
+ aProps[0] = TARGET_URL;
ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY;
xResultSet = aGroup.createCursor( aProps, eInclude );
@@ -1795,7 +1793,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
uno::Sequence< uno::Any > aArgs( 1 );
beans::PropertyValue aPathProp;
- aPathProp.Name = OUString("nodepath");
+ aPathProp.Name = "nodepath";
aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" );
aArgs[0] <<= aPathProp;
@@ -1871,9 +1869,9 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
// store template
uno::Sequence< PropertyValue > aStoreArgs( 2 );
- aStoreArgs[0].Name = OUString("FilterName");
+ aStoreArgs[0].Name = "FilterName";
aStoreArgs[0].Value <<= aFilterName;
- aStoreArgs[1].Name = OUString("DocumentTitle");
+ aStoreArgs[1].Name = "DocumentTitle";
aStoreArgs[1].Value <<= rTemplateName;
if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() ))
@@ -2379,9 +2377,9 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps(3);
- aProps[0] = OUString(TITLE );
- aProps[1] = OUString(TARGET_URL );
- aProps[2] = OUString(PROPERTY_TYPE );
+ aProps[0] = TITLE ;
+ aProps[1] = TARGET_URL;
+ aProps[2] = PROPERTY_TYPE;
try
{
@@ -2490,7 +2488,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
Content aContent;
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps(1);
- aProps[0] = OUString(TITLE );
+ aProps[0] = TITLE;
try
{
@@ -2556,7 +2554,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList,
uno::Reference< XResultSet > xResultSet;
Sequence< OUString > aProps(1);
- aProps[0] = OUString(TITLE );
+ aProps[0] = TITLE;
try
{
@@ -2648,13 +2646,13 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData )
if ( pData->getUpdateType() )
{
- aPropName = OUString( PROPERTY_TYPE );
+ aPropName = PROPERTY_TYPE;
setProperty( aTemplate, aPropName, makeAny( pData->getType() ) );
}
if ( pData->getUpdateLink() )
{
- aPropName = OUString( TARGET_URL );
+ aPropName = TARGET_URL;
setProperty( aTemplate, aPropName, makeAny( pData->getTargetURL() ) );
}
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index ddf8e07..0dbd75d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -532,7 +532,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont )
{
uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
- aSearchRequest[0].Name = OUString("DocumentService");
+ aSearchRequest[0].Name = "DocumentService";
aSearchRequest[0].Value <<= GetDocServiceName();
return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
@@ -550,9 +550,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
{
// Preselect PDF-Filter for EXPORT
uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
- aSearchRequest[0].Name = OUString("Type");
+ aSearchRequest[0].Name = "Type";
aSearchRequest[0].Value <<= OUString("pdf_Portable_Document_Format");
- aSearchRequest[1].Name = OUString("DocumentService");
+ aSearchRequest[1].Name = "DocumentService";
aSearchRequest[1].Value <<= GetDocServiceName();
aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
@@ -660,7 +660,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
// the saving is acceptable
// in case the configuration entry is not set or set to false
// or in case of version creation
- OUString aVersionCommentString = OUString("VersionComment");
+ OUString aVersionCommentString = "VersionComment";
if ( officecfg::Office::Common::Save::Document::AlwaysSaveAs::get()
&& GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() )
{
@@ -839,7 +839,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName )
sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence()
{
uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
- aSearchRequest[0].Name = OUString("DocumentService");
+ aSearchRequest[0].Name = "DocumentService";
aSearchRequest[0].Value <<= GetDocServiceName();
uno::Reference< container::XEnumeration > xFilterEnum =
@@ -1186,7 +1186,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
if ( xFrameDispatch.is() )
{
util::URL aURL;
- aURL.Complete = OUString(".uno:SetDocumentProperties");
+ aURL.Complete = ".uno:SetDocumentProperties";
uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) );
if ( xTransformer->parseStrict( aURL ) )
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 26926ce..d3b85a6 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -44,8 +44,8 @@ OwnSubFilterService::~OwnSubFilterService()
uno::Sequence< OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames()
{
uno::Sequence< OUString > aRet(2);
- aRet[0] = OUString("com.sun.star.document.OwnSubFilter");
- aRet[1] = OUString("com.sun.star.comp.document.OwnSubFilter");
+ aRet[0] = "com.sun.star.document.OwnSubFilter";
+ aRet[1] = "com.sun.star.comp.document.OwnSubFilter";
return aRet;
}
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 603331c..7be793d 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -650,7 +650,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
aCheckedArgs[nProps++].Value <<= sFileURL;
// and append the local filename
aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
- aCheckedArgs[nProps].Name = OUString("LocalFileName");
+ aCheckedArgs[nProps].Name = "LocalFileName";
aCheckedArgs[nProps++].Value <<= OUString( sTemp );
}
else
@@ -666,7 +666,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
aCheckedArgs[nProps++].Value <<= sTemp;
// and append the local filename
aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
- aCheckedArgs[nProps].Name = OUString("LocalFileName");
+ aCheckedArgs[nProps].Name = "LocalFileName";
aCheckedArgs[nProps++].Value <<= sPath;
}
else
@@ -710,7 +710,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
sal_Bool bTemp = sal_Bool();
if ( rProp.Value >>= bTemp )
{
- aCheckedArgs[nProps].Name = OUString("Collate");
+ aCheckedArgs[nProps].Name = "Collate";
aCheckedArgs[nProps++].Value <<= bTemp;
}
else
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7c74009..996fdb0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1038,13 +1038,13 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
aRectSeq[3] = aTmpRect.Bottom();
seqArgsNew.realloc( ++nNewLength );
- seqArgsNew[ nNewLength - 1 ].Name = OUString("WinExtent");
+ seqArgsNew[ nNewLength - 1 ].Name = "WinExtent";
seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq;
if ( !m_pData->m_aPreusedFilterName.isEmpty() )
{
seqArgsNew.realloc( ++nNewLength );
- seqArgsNew[ nNewLength - 1 ].Name = OUString("PreusedFilterName");
+ seqArgsNew[ nNewLength - 1 ].Name = "PreusedFilterName";
seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName;
}
@@ -1060,7 +1060,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
aBorderSeq[3] = aBorder.Bottom();
seqArgsNew.realloc( ++nNewLength );
- seqArgsNew[ nNewLength - 1 ].Name = OUString("DocumentBorder");
+ seqArgsNew[ nNewLength - 1 ].Name = "DocumentBorder";
seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq;
}
@@ -2221,54 +2221,54 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
aFlavorSeq[0].MimeType =
OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
- aFlavorSeq[0].HumanPresentableName = OUString( "GDIMetaFile" );
+ aFlavorSeq[0].HumanPresentableName = "GDIMetaFile";
aFlavorSeq[0].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[1].MimeType =
OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
- aFlavorSeq[1].HumanPresentableName = OUString( "GDIMetaFile" );
+ aFlavorSeq[1].HumanPresentableName = "GDIMetaFile";
aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[2].MimeType =
OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" );
- aFlavorSeq[2].HumanPresentableName = OUString( "Enhanced Windows MetaFile" );
+ aFlavorSeq[2].HumanPresentableName = "Enhanced Windows MetaFile";
aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[3].MimeType =
OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" );
- aFlavorSeq[3].HumanPresentableName = OUString( "Windows MetaFile" );
+ aFlavorSeq[3].HumanPresentableName = "Windows MetaFile";
aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[4].MimeType =
OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" );
- aFlavorSeq[4].HumanPresentableName = OUString( "Star Object Descriptor (XML)" );
+ aFlavorSeq[4].HumanPresentableName = "Star Object Descriptor (XML)";
aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[5].MimeType =
OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" );
- aFlavorSeq[5].HumanPresentableName = OUString( "Star Embed Source (XML)" );
+ aFlavorSeq[5].HumanPresentableName = "Star Embed Source (XML)";
aFlavorSeq[5].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[6].MimeType =
OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" );
- aFlavorSeq[6].HumanPresentableName = OUString( "Bitmap" );
+ aFlavorSeq[6].HumanPresentableName = "Bitmap";
aFlavorSeq[6].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[7].MimeType =
OUString( "image/png" );
- aFlavorSeq[7].HumanPresentableName = OUString( "PNG" );
+ aFlavorSeq[7].HumanPresentableName = "PNG";
aFlavorSeq[7].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
if ( nSuppFlavors == 10 )
{
aFlavorSeq[8].MimeType =
OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" );
- aFlavorSeq[8].HumanPresentableName = OUString( "Enhanced Windows MetaFile" );
+ aFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile";
aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 );
aFlavorSeq[9].MimeType =
OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" );
- aFlavorSeq[9].HumanPresentableName = OUString( "Windows MetaFile" );
+ aFlavorSeq[9].HumanPresentableName = "Windows MetaFile";
aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 );
}
@@ -2767,7 +2767,7 @@ void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTi
if ( nArg == nCount )
{
rSeq.realloc( nCount+1 );
- rSeq[nCount].Name = OUString( "Title" );
+ rSeq[nCount].Name = "Title";
rSeq[nCount].Value <<= rTitle;
}
}
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 4c28036..924896c 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -112,17 +112,17 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*
if ( xDispatch.is() )
{
Sequence< PropertyValue > aArgs( 2 );
- aArgs[0].Name = OUString("Referer");
+ aArgs[0].Name = "Referer";
aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER ));
- aArgs[1].Name = OUString( "FileName" );
+ aArgs[1].Name = "FileName";
aArgs[1].Value = makeAny( OUString( aName ));
if ( !aFilter.isEmpty() )
{
aArgs.realloc( 4 );
- aArgs[2].Name = OUString("FilterOptions");
+ aArgs[2].Name = "FilterOptions";
aArgs[2].Value = makeAny( OUString( aOptions ));
- aArgs[3].Name = OUString("FilterName");
+ aArgs[3].Name = "FilterName";
aArgs[3].Value = makeAny( OUString( aFilter ));
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6d7b016..ccd7d98 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3102,7 +3102,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
else
{
::com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = OUString(".component:DB/DataSourceBrowser");
+ aTargetURL.Complete = ".component:DB/DataSourceBrowser";
Reference < ::com::sun::star::util::XURLTransformer > xTrans(
::com::sun::star::util::URLTransformer::create(
::comphelper::getProcessComponentContext() ) );
@@ -3116,7 +3116,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
{
Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = OUString("Referer");
+ pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
xDisp->dispatch( aTargetURL, aArgs );
}
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index c6a4afa..056582a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -130,10 +130,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_
setValue( rProps[nProp].Name, rProps[nProp].Value );
Sequence< beans::PropertyValue > aRenderOptions( 3 );
- aRenderOptions[0].Name = OUString( "ExtraPrintUIOptions" );
- aRenderOptions[1].Name = OUString( "View" );
+ aRenderOptions[0].Name = "ExtraPrintUIOptions";
+ aRenderOptions[1].Name = "View" ;
aRenderOptions[1].Value = i_rViewProp;
- aRenderOptions[2].Name = OUString( "IsPrinter" );
+ aRenderOptions[2].Name = "IsPrinter";
aRenderOptions[2].Value <<= sal_True;
try
{
@@ -214,7 +214,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
}
Sequence< beans::PropertyValue > aRenderOptions( 1 );
- aRenderOptions[ 0 ].Name = OUString( "RenderDevice" );
+ aRenderOptions[ 0 ].Name = "RenderDevice";
aRenderOptions[ 0 ].Value <<= mxDevice;
aRenderOptions = getJobProperties( aRenderOptions );
@@ -704,22 +704,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
{
if ( aProps[nProp].Name == "Copies" )
{
- aProps[nProp]. Name = OUString("CopyCount");
+ aProps[nProp]. Name = "CopyCount";
}
else if ( aProps[nProp].Name == "RangeText" )
{
- aProps[nProp]. Name = OUString("Pages");
+ aProps[nProp]. Name = "Pages";
}
else if ( aProps[nProp].Name == "Asynchron" )
{
- aProps[nProp]. Name = OUString("Wait");
+ aProps[nProp]. Name = "Wait";
sal_Bool bAsynchron = sal_False;
aProps[nProp].Value >>= bAsynchron;
aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
}
else if ( aProps[nProp].Name == "Silent" )
{
- aProps[nProp]. Name = OUString("MonitorVisible");
+ aProps[nProp]. Name = "MonitorVisible";
sal_Bool bPrintSilent = sal_False;
aProps[nProp].Value >>= bPrintSilent;
aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
@@ -739,13 +739,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
// it would be better if writer handled this internally
if( nId == SID_PRINTDOCDIRECT )
{
- aProps[nLen].Name = OUString( "PrintSelectionOnly" );
+ aProps[nLen].Name = "PrintSelectionOnly";
aProps[nLen].Value = makeAny( bSelection );
}
else // if nId == SID_PRINTDOC ; nothing to do with the previous HACK
{
// should the printer selection and properties dialogue display an help button
- aProps[nLen].Name = OUString( "HideHelpButton" );
+ aProps[nLen].Name = "HideHelpButton";
aProps[nLen].Value = makeAny( bPrintOnHelp );
}
commit da20c7f4396b127072074f4d7999ed29deee02f0
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:51:16 2013 +0200
remove unnecessary use of OUString constructor in SHELL module
Change-Id: Ibdb750dc8e0f4cd0f186d5801c0a269edd939547
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index 20ca8f7..fa080d9 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -166,25 +166,25 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
Sequence< OUString > aRet( 7 );
if( !m_aBody.isEmpty() )
- aRet[nItems++] = OUString("body");
+ aRet[nItems++] = "body";
if( !m_aOriginator.isEmpty() )
- aRet[nItems++] = OUString("from");
+ aRet[nItems++] = "from";
if( !m_aRecipient.isEmpty() )
- aRet[nItems++] = OUString("to");
+ aRet[nItems++] = "to";
if( m_CcRecipients.getLength() )
- aRet[nItems++] = OUString("cc");
+ aRet[nItems++] = "cc";
if( m_BccRecipients.getLength() )
- aRet[nItems++] = OUString("bcc");
+ aRet[nItems++] = "bcc";
if( !m_aSubject.isEmpty() )
- aRet[nItems++] = OUString("subject");
+ aRet[nItems++] = "subject";
if( m_Attachments.getLength() )
- aRet[nItems++] = OUString("attachment");
+ aRet[nItems++] = "attachment";
aRet.realloc( nItems );
return aRet;
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index ab670af..5b1b403 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -145,7 +145,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OUString aConfigRoot = "org.openoffice.Office.Common/ExternalMailer";
PropertyValue aProperty;
- aProperty.Name = OUString("nodepath");
+ aProperty.Name = "nodepath";
aProperty.Value = makeAny( aConfigRoot );
Sequence< Any > aArgumentList( 1 );
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index b313867..777affc 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -66,7 +66,7 @@ namespace // private
Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.sys.shell.SystemShellExecute");
+ aRet[0] = "com.sun.star.sys.shell.SystemShellExecute";
return aRet;
}
}
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 1a39e9a..0d4d779 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -66,7 +66,7 @@ namespace // private
Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.sys.shell.SystemShellExecute");
+ aRet[0] = "com.sun.star.sys.shell.SystemShellExecute";
return aRet;
}
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 6f530db..fea3996 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -39,7 +39,7 @@ namespace // private
Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.sys.shell.SimpleSystemMail");
+ aRet[0] = "com.sun.star.sys.shell.SimpleSystemMail";
return aRet;
}
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index f0fbb18..99e0835 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -110,12 +110,12 @@ int SAL_CALL main(int , char*, char* )
xSmplMailMsg->setOriginator( OUString("tino.rachui at germany.sun.com") );
Sequence< OUString > ccRecips( 1 );
- ccRecips[0] = OUString("tino.rachui at germany.sun.com");
+ ccRecips[0] = "tino.rachui at germany.sun.com";
xSmplMailMsg->setCcRecipient( ccRecips );
Sequence< OUString > bccRecips( 1 );
- bccRecips[0] = OUString("tino.rachui at germany.sun.com");
+ bccRecips[0] = "tino.rachui at germany.sun.com";
xSmplMailMsg->setBccRecipient( bccRecips );
@@ -129,7 +129,7 @@ int SAL_CALL main(int , char*, char* )
osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
attachements[0] = aFileURL;
- aFile = OUString("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe");
+ aFile = "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe";
osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
attachements[1] = aFile;
commit cd30747b74683dc5766073a4a9b3a4c0e5db3723
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:49:01 2013 +0200
remove unnecessary use of OUString constructor in STOC module
Change-Id: I980223cedb6d0054ef71cbd81691f70a24f506ad
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index 2831022..b6387ca 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -737,7 +737,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
InvocationTargetException aExc;
aExc.Context = *(const Reference< XInterface > *)rObj.getValue();
- aExc.Message = OUString("exception occurred during invocation!");
+ aExc.Message = "exception occurred during invocation!";
uno_any_destruct(
&aExc.TargetException,
reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 7738a13..2ca6beb 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2312,7 +2312,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
}
else
{
- if( aMethName != OUString("queryInterface") )
+ if( aMethName != "queryInterface" )
{
rMethodConcept_i |= MethodConcept::DANGEROUS;
continue;
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 80a71e4..1d8df1e 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -70,7 +70,7 @@ namespace stoc_inv
static Sequence< OUString > inv_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(SERVICENAME);
+ seqNames.getArray()[0] = SERVICENAME;
return seqNames;
}
@@ -668,7 +668,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
{
CannotConvertException aExc;
aExc.Context = *this;
- aExc.Message = OUString("invocation type mismatch!");
+ aExc.Message = "invocation type mismatch!";
throw aExc;
}
}
@@ -708,7 +708,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
RuntimeException aExc;
aExc.Context = *this;
- aExc.Message = OUString("invocation lacking of introspection access!");
+ aExc.Message = "invocation lacking of introspection access!";
throw aExc;
}
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 3f8139a..a102b86 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -294,13 +294,13 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
// read ftp proxy name
css::uno::Reference<css::registry::XRegistryKey> ftpProxy_name = xRegistryRootKey->openKey("Settings/ooInetFTPProxyName");
if(ftpProxy_name.is() && !ftpProxy_name->getStringValue().isEmpty()) {
- OUString ftpHost = OUString("ftp.proxyHost=");
+ OUString ftpHost = "ftp.proxyHost=";
ftpHost += ftpProxy_name->getStringValue();
// read ftp proxy port
css::uno::Reference<css::registry::XRegistryKey> ftpProxy_port = xRegistryRootKey->openKey("Settings/ooInetFTPProxyPort");
if(ftpProxy_port.is() && ftpProxy_port->getLongValue()) {
- OUString ftpPort = OUString("ftp.proxyPort=");
+ OUString ftpPort = "ftp.proxyPort=";
ftpPort += OUString::number(ftpProxy_port->getLongValue());
pjvm->pushProp(ftpHost);
@@ -311,13 +311,13 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
// read http proxy name
css::uno::Reference<css::registry::XRegistryKey> httpProxy_name = xRegistryRootKey->openKey("Settings/ooInetHTTPProxyName");
if(httpProxy_name.is() && !httpProxy_name->getStringValue().isEmpty()) {
- OUString httpHost = OUString("http.proxyHost=");
+ OUString httpHost = "http.proxyHost=";
httpHost += httpProxy_name->getStringValue();
// read http proxy port
css::uno::Reference<css::registry::XRegistryKey> httpProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPProxyPort");
if(httpProxy_port.is() && httpProxy_port->getLongValue()) {
- OUString httpPort = OUString("http.proxyPort=");
+ OUString httpPort = "http.proxyPort=";
httpPort += OUString::number(httpProxy_port->getLongValue());
pjvm->pushProp(httpHost);
@@ -328,13 +328,13 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
// read https proxy name
css::uno::Reference<css::registry::XRegistryKey> httpsProxy_name = xRegistryRootKey->openKey("Settings/ooInetHTTPSProxyName");
if(httpsProxy_name.is() && !httpsProxy_name->getStringValue().isEmpty()) {
- OUString httpsHost = OUString("https.proxyHost=");
+ OUString httpsHost = "https.proxyHost=";
httpsHost += httpsProxy_name->getStringValue();
// read https proxy port
css::uno::Reference<css::registry::XRegistryKey> httpsProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPSProxyPort");
if(httpsProxy_port.is() && httpsProxy_port->getLongValue()) {
- OUString httpsPort = OUString("https.proxyPort=");
+ OUString httpsPort = "https.proxyPort=";
httpsPort += OUString::number(httpsProxy_port->getLongValue());
pjvm->pushProp(httpsHost);
@@ -345,8 +345,8 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
// read nonProxyHosts
css::uno::Reference<css::registry::XRegistryKey> nonProxies_name = xRegistryRootKey->openKey("Settings/ooInetNoProxy");
if(nonProxies_name.is() && !nonProxies_name->getStringValue().isEmpty()) {
- OUString httpNonProxyHosts = OUString("http.nonProxyHosts=");
- OUString ftpNonProxyHosts= OUString("ftp.nonProxyHosts=");
+ OUString httpNonProxyHosts = "http.nonProxyHosts=";
+ OUString ftpNonProxyHosts = "ftp.nonProxyHosts=";
OUString value= nonProxies_name->getStringValue();
// replace the separator ";" by "|"
value= value.replace((sal_Unicode)';', (sal_Unicode)'|');
@@ -449,11 +449,11 @@ void getJavaPropsFromSafetySettings(
OUString sVal;
switch( val)
{
- case 0: sVal= OUString("host");
+ case 0: sVal = "host";
break;
- case 1: sVal= OUString("unrestricted");
+ case 1: sVal = "unrestricted";
break;
- case 3: sVal= OUString("none");
+ case 3: sVal = "none";
break;
}
OUString sProperty("appletviewer.security.mode=");
@@ -1077,62 +1077,62 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
}
else if ( aAccessor == "ooInetHTTPProxyName" )
{
- aPropertyName = OUString("http.proxyHost");
+ aPropertyName = "http.proxyHost";
rEvent.Element >>= aPropertyValue;
}
else if ( aAccessor == "ooInetHTTPProxyPort" )
{
- aPropertyName = OUString("http.proxyPort");
+ aPropertyName = "http.proxyPort";
sal_Int32 n = 0;
rEvent.Element >>= n;
aPropertyValue = OUString::number(n);
}
else if ( aAccessor == "ooInetHTTPSProxyName" )
{
- aPropertyName = OUString("https.proxyHost");
+ aPropertyName = "https.proxyHost";
rEvent.Element >>= aPropertyValue;
}
else if ( aAccessor == "ooInetHTTPSProxyPort" )
{
- aPropertyName = OUString("https.proxyPort");
+ aPropertyName = "https.proxyPort";
sal_Int32 n = 0;
rEvent.Element >>= n;
aPropertyValue = OUString::number(n);
}
else if ( aAccessor == "ooInetFTPProxyName" )
{
- aPropertyName = OUString("ftp.proxyHost");
+ aPropertyName = "ftp.proxyHost";
rEvent.Element >>= aPropertyValue;
}
else if ( aAccessor == "ooInetFTPProxyPort" )
{
- aPropertyName = OUString("ftp.proxyPort");
+ aPropertyName = "ftp.proxyPort";
sal_Int32 n = 0;
rEvent.Element >>= n;
aPropertyValue = OUString::number(n);
}
else if ( aAccessor == "ooInetNoProxy" )
{
- aPropertyName = OUString("http.nonProxyHosts");
- aPropertyName2 = OUString("ftp.nonProxyHosts");
+ aPropertyName = "http.nonProxyHosts";
+ aPropertyName2 = "ftp.nonProxyHosts";
rEvent.Element >>= aPropertyValue;
aPropertyValue = aPropertyValue.replace(';', '|');
}
else if ( aAccessor == "NetAccess" )
{
- aPropertyName = OUString("appletviewer.security.mode");
+ aPropertyName = "appletviewer.security.mode";
sal_Int32 n = 0;
if (rEvent.Element >>= n)
switch (n)
{
case 0:
- aPropertyValue = OUString("host");
+ aPropertyValue = "host";
break;
case 1:
- aPropertyValue = OUString("unrestricted");
+ aPropertyValue = "unrestricted";
break;
case 3:
- aPropertyValue = OUString("none");
+ aPropertyValue = "none";
break;
}
else
@@ -1141,13 +1141,13 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
}
else if ( aAccessor == "Security" )
{
- aPropertyName = OUString("stardiv.security.disableSecurity");
+ aPropertyName = "stardiv.security.disableSecurity";
sal_Bool b = sal_Bool();
if (rEvent.Element >>= b)
if (b)
- aPropertyValue = OUString("false");
+ aPropertyValue = "false";
else
- aPropertyValue = OUString("true");
+ aPropertyValue = "true";
else
return;
bSecurityChanged = true;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 4b262f3..18f3b7a 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -73,7 +73,7 @@ namespace stoc_bootstrap
Sequence< OUString > smgr_wrapper_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory");
+ seqNames.getArray()[0] = "com.sun.star.lang.MultiServiceFactory";
return seqNames;
}
@@ -85,8 +85,8 @@ OUString smgr_wrapper_getImplementationName()
Sequence< OUString > smgr_getSupportedServiceNames()
{
Sequence< OUString > seqNames(2);
- seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory");
- seqNames.getArray()[1] = OUString("com.sun.star.lang.ServiceManager");
+ seqNames.getArray()[0] = "com.sun.star.lang.MultiServiceFactory";
+ seqNames.getArray()[1] = "com.sun.star.lang.ServiceManager";
return seqNames;
}
@@ -98,8 +98,8 @@ OUString smgr_getImplementationName()
Sequence< OUString > regsmgr_getSupportedServiceNames()
{
Sequence< OUString > seqNames(2);
- seqNames.getArray()[0] = OUString("com.sun.star.lang.MultiServiceFactory");
- seqNames.getArray()[1] = OUString("com.sun.star.lang.RegistryServiceManager");
+ seqNames.getArray()[0] = "com.sun.star.lang.MultiServiceFactory";
+ seqNames.getArray()[1] = "com.sun.star.lang.RegistryServiceManager";
return seqNames;
}
@@ -864,8 +864,7 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName)
else
{
UnknownPropertyException except;
- except.Message = OUString( "ServiceManager : unknown property " );
- except.Message += PropertyName;
+ except.Message = "ServiceManager : unknown property " + PropertyName;
throw except;
}
}
@@ -1507,7 +1506,7 @@ Reference<XInterface > ORegistryServiceManager::loadWithImplementationName(
try
{
- OUString implementationName = OUString("/IMPLEMENTATIONS/") + name;
+ OUString implementationName = "/IMPLEMENTATIONS/" + name;
Reference<XRegistryKey > xImpKey = m_xRootKey->openKey(implementationName);
if( xImpKey.is() )
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index bd6b308..a3e517c 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -1131,7 +1131,7 @@ css::uno::Reference< css::uno::XInterface > SimpleRegistry_CreateInstance(
css::uno::Sequence< OUString > simreg_getSupportedServiceNames() {
css::uno::Sequence< OUString > names(1);
- names[0] = OUString("com.sun.star.registry.SimpleRegistry");
+ names[0] = "com.sun.star.registry.SimpleRegistry";
return names;
}
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 5f75887..b042197 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -217,7 +217,7 @@ OUString getImplementationName() {
css::uno::Sequence< OUString > getSupportedServiceNames() {
css::uno::Sequence< OUString > s(1);
- s[0] = OUString("com.sun.star.uri.ExternalUriReferenceTranslator");
+ s[0] = "com.sun.star.uri.ExternalUriReferenceTranslator";
return s;
}
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 3ee11ed..48cc768 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -460,7 +460,7 @@ OUString getImplementationName() {
css::uno::Sequence< OUString > getSupportedServiceNames() {
css::uno::Sequence< OUString > s(1);
- s[0] = OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+ s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript";
return s;
}
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 88d5883..16aa078 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -144,7 +144,7 @@ OUString getImplementationName() {
css::uno::Sequence< OUString > getSupportedServiceNames() {
css::uno::Sequence< OUString > s(1);
- s[0] = OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory");
+ s[0] = "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory";
return s;
}
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 779096a..b9875d8 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -855,7 +855,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
{
IllegalArgumentException aExc;
aExc.ArgumentPosition = 5;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
@@ -863,7 +863,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
{
RuntimeException aExc;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
@@ -871,7 +871,7 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE
void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
{
RuntimeException aExc;
- aExc.Message = OUString("dum dum dum ich tanz im kreis herum...");
+ aExc.Message = "dum dum dum ich tanz im kreis herum...";
aExc.Context = *this;
throw aExc;
}
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 06c3167..a9a68f8 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -102,19 +102,19 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
OUString aRetStr;
switch( eType )
{
- case TypeClass_TYPE: aRetStr = OUString("TYPE TYPE"); break;
- case TypeClass_INTERFACE: aRetStr = OUString("TYPE INTERFACE"); break;
- case TypeClass_SERVICE: aRetStr = OUString("TYPE SERVICE"); break;
- case TypeClass_STRUCT: aRetStr = OUString("TYPE STRUCT"); break;
- case TypeClass_TYPEDEF: aRetStr = OUString("TYPE TYPEDEF"); break;
- case TypeClass_UNION: aRetStr = OUString("TYPE UNION"); break;
- case TypeClass_ENUM: aRetStr = OUString("TYPE ENUM"); break;
- case TypeClass_EXCEPTION: aRetStr = OUString("TYPE EXCEPTION"); break;
- case TypeClass_ARRAY: aRetStr = OUString("TYPE ARRAY"); break;
- case TypeClass_SEQUENCE: aRetStr = OUString("TYPE SEQUENCE"); break;
- case TypeClass_VOID: aRetStr = OUString("TYPE void"); break;
- case TypeClass_ANY: aRetStr = OUString("TYPE any"); break;
- case TypeClass_UNKNOWN: aRetStr = OUString("TYPE unknown"); break;
+ case TypeClass_TYPE: aRetStr = "TYPE TYPE"; break;
+ case TypeClass_INTERFACE: aRetStr = "TYPE INTERFACE"; break;
+ case TypeClass_SERVICE: aRetStr = "TYPE SERVICE"; break;
+ case TypeClass_STRUCT: aRetStr = "TYPE STRUCT"; break;
+ case TypeClass_TYPEDEF: aRetStr = "TYPE TYPEDEF"; break;
+ case TypeClass_UNION: aRetStr = "TYPE UNION"; break;
+ case TypeClass_ENUM: aRetStr = "TYPE ENUM"; break;
+ case TypeClass_EXCEPTION: aRetStr = "TYPE EXCEPTION"; break;
+ case TypeClass_ARRAY: aRetStr = "TYPE ARRAY"; break;
+ case TypeClass_SEQUENCE: aRetStr = "TYPE SEQUENCE"; break;
+ case TypeClass_VOID: aRetStr = "TYPE void"; break;
+ case TypeClass_ANY: aRetStr = "TYPE any"; break;
+ case TypeClass_UNKNOWN: aRetStr = "TYPE unknown"; break;
case TypeClass_BOOLEAN:
{
sal_Bool b = *(sal_Bool*)aValue.getValue();
@@ -215,17 +215,17 @@ Sequence< Property > ImplPropertySetInfo::getProperties(void)
pSeq = new Sequence<Property>( 3 );
Property * pAry = pSeq->getArray();
- pAry[0].Name = OUString("Factor");
+ pAry[0].Name = "Factor";
pAry[0].Handle = -1;
pAry[0].Type = getCppuType( (double*) NULL );
pAry[0].Attributes = BOUND | TRANSIENT;
- pAry[1].Name = OUString("MyCount");
+ pAry[1].Name = "MyCount";
pAry[1].Handle = -1;
pAry[1].Type = getCppuType( (sal_Int32*) NULL );
pAry[1].Attributes = BOUND | TRANSIENT;
- pAry[2].Name = OUString("Info");
+ pAry[2].Name = "Info";
pAry[2].Handle = -1;
pAry[2].Type = getCppuType( (OUString*) NULL );
pAry[2].Attributes = TRANSIENT;
@@ -439,7 +439,7 @@ void ImplIntroTest::Init( void )
// Properties initialization
aAnyArray[0] <<= 3.14;
aAnyArray[1] <<= (sal_Int32)42;
- aAnyArray[2] <<= OUString( OUString("Hallo") );
+ aAnyArray[2] <<= OUString( "Hallo" );
// Einmal fuer den internen Gebrauch die PropertySetInfo abholen
m_xMyInfo = getPropertySetInfo();
@@ -457,13 +457,12 @@ void ImplIntroTest::Init( void )
// String-Sequence initialization
aStringSeq.realloc( 3 );
- OUString* pStr = aStringSeq.getArray();
- pStr[ 0 ] = OUString( OUString("String 0") );
- pStr[ 1 ] = OUString( OUString("String 1") );
- pStr[ 2 ] = OUString( OUString("String 2") );
+ aStringSeq[ 0 ] = "String 0";
+ aStringSeq[ 1 ] = "String 1";
+ aStringSeq[ 2 ] = "String 2";
// structs initialization
- m_aFirstStruct.Name = OUString("FirstStruct-Name");
+ m_aFirstStruct.Name = "FirstStruct-Name";
m_aFirstStruct.Handle = 77777;
//XIdlClassRef Type;
m_aFirstStruct.Attributes = -222;
@@ -1199,8 +1198,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( xRefl.is(), "### no corereflection!" );
// Introspection
- libName = OUString(
- "introspection.uno" SAL_DLLEXTENSION);
+ libName = OUString( "introspection.uno" SAL_DLLEXTENSION);
fprintf(stderr, "3\n" );
xImplReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"),
libName, Reference< XSimpleRegistry >() );
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index d077821..f680140 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -155,8 +155,8 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw ()
Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw ()
{
Sequence< OUString > aSNS( 2 );
- aSNS.getArray()[0] = OUString(SERVICE_NAME);
- aSNS.getArray()[1] = OUString("com.sun.star.bridge.Bridge");
+ aSNS.getArray()[0] = SERVICE_NAME;
+ aSNS.getArray()[1] = "com.sun.star.bridge.Bridge";
return aSNS;
}
@@ -179,7 +179,7 @@ extern "C" void SAL_CALL test_ServiceManager()
#if ! defined SAL_DLLPREFIX
#define SAL_DLLPREFIX ""
#endif
- OUString atUModule2 = OUString( SAL_DLLPREFIX "testsmgr_component" SAL_DLLEXTENSION );
+ OUString atUModule2 = SAL_DLLPREFIX "testsmgr_component" SAL_DLLEXTENSION ;
// expand shared library name
OString atModule2( OUStringToOString(atUModule2, RTL_TEXTENCODING_ASCII_US) );
More information about the Libreoffice-commits
mailing list