diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-15 11:05:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:31 +0200 |
| commit | 610b2b94b33b0fc2d79cd515f9e293ca1c2610e8 (patch) | |
| tree | 6eab2639cb8104ca54daa3f7a2ebd83ef1566cf0 | |
| parent | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (diff) | |
remove unnecessary use of OUString constructor when assigning
change code like
aStr = OUString("xxxx");
to
aStr = "xxxx";
Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
315 files changed, 952 insertions, 984 deletions
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 5468b2e865cd..8c8fcf36d72e 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -80,7 +80,7 @@ Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); aNames.realloc( nLength + 1 ); - aNames[nLength] = OUString( "com.sun.star.accessibility.AccessibleComboBox" ); + aNames[nLength] = "com.sun.star.accessibility.AccessibleComboBox"; return aNames; } diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index a5c3da98c2cf..e120fc00b60c 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -292,7 +292,7 @@ OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeExceptio Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException) { Sequence< OUString > aNames(1); - aNames[0] = OUString( "com.sun.star.awt.AccessibleStatusBar" ); + aNames[0] = "com.sun.star.awt.AccessibleStatusBar"; return aNames; } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 87556d88a809..76b717f88cee 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -252,8 +252,8 @@ EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) : notifier_ = n; } Sequence< OUString > s(2); - s[0] = OUString( "FontHeight" ); - s[1] = OUString( "FontName" ); + s[0] = "FontHeight"; + s[1] = "FontName"; n->addPropertiesChangeListener(s, listener_.get()); } @@ -779,9 +779,9 @@ void EditorWindow::HandleProcedureCompletion() OUString sText("\nEnd "); aSel = GetEditView()->GetSelection(); if( sProcType.equalsIgnoreAsciiCase("function") ) - sText += OUString( "Function\n" ); + sText += "Function\n"; if( sProcType.equalsIgnoreAsciiCase("sub") ) - sText += OUString( "Sub\n" ); + sText += "Sub\n"; if( nLine+1 == pEditEngine->GetParagraphCount() ) { @@ -2539,7 +2539,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) } else { - aWatchStr = OUString( "Null" ); + aWatchStr = "Null"; if( pItem->mpObject != NULL ) { bCollapse = true; diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 55877b065205..90e3dbb55a20 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -115,7 +115,7 @@ void SbiParser::Line() aGen.Statement(); KeywordSymbolInfo aInfo; - aInfo.m_aKeywordSymbol = OUString( "line" ); + aInfo.m_aKeywordSymbol = "line"; aInfo.m_eSbxDataType = GetType(); aInfo.m_eTok = SYMBOL; @@ -278,7 +278,7 @@ void SbiParser::Name() aGen.Statement(); KeywordSymbolInfo aInfo; - aInfo.m_aKeywordSymbol = OUString( "name" ); + aInfo.m_aKeywordSymbol = "name"; aInfo.m_eSbxDataType = GetType(); aInfo.m_eTok = SYMBOL; diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index 7a8de19cb44d..0aacd14e3523 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -477,7 +477,7 @@ OUString Service::getImplementationName_static() { css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { css::uno::Sequence< OUString > names(1); - names[0] = OUString( "com.sun.star.test.bridges.testacquire" ); + names[0] = "com.sun.star.test.bridges.testacquire"; return names; } @@ -513,7 +513,7 @@ bool writeInfo(void * registryKey, OUString const & implementationName, css::uno::Sequence< OUString > const & serviceNames) { OUString keyName( "/" ); keyName += implementationName; - keyName += OUString( "/UNO/SERVICES" ); + keyName += "/UNO/SERVICES"; css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 9124b757a57b..393202c95ba6 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -122,7 +122,7 @@ Service::get(OUString const & rName) throw (css::uno::RuntimeException) css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { css::uno::Sequence< OUString > aNames(1); - aNames[0] = OUString( "com.sun.star.test.bridges.testequals" ); + aNames[0] = "com.sun.star.test.bridges.testequals"; return aNames; } @@ -175,7 +175,7 @@ bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, { OUString aKeyName( "/" ); aKeyName += OUString::createFromAscii(pImplementationName); - aKeyName += OUString( "/UNO/SERVICES" ); + aKeyName += "/UNO/SERVICES"; css::uno::Reference< css::registry::XRegistryKey > xKey; try { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index d9d19cf2f5af..7851547c000a 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -69,7 +69,7 @@ void parseCommandLine( char *argv[] , if( -1 == nIndex ) { *pConnection = sTemp; - *pProtocol = OUString( "iiop" ); + *pProtocol = "iiop"; } else { diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index fe55c5721b54..ae4a90d4e7c9 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -138,8 +138,8 @@ class DemoRenderer lang::Locale aLocale; rendering::FontInfo aFontInfo; - aFontInfo.FamilyName = OUString( "Swiss" ); - aFontInfo.StyleName = OUString( "SansSerif" ); + aFontInfo.FamilyName = "Swiss"; + aFontInfo.StyleName = "SansSerif"; geometry::Matrix2D aFontMatrix( 1, 0, 0, 1 ); rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale ); diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 597e2be1e706..30d0d52bb332 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1092,7 +1092,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang uno::RuntimeException) { XMLRangeHelper::CellRange aRange; - aRange.aTableName = OUString( "local-table" ); + aRange.aTableName = "local-table"; // attention: this data provider has the limitation that it stores // internally if data comes from columns or rows. It is intended for diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index babde9aa7194..a595f25f15a9 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -41,7 +41,7 @@ namespace comphelper { uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - OUString aStringID = OUString( "_rels/" ); + OUString aStringID = "_rels/"; aStringID += aStreamName; return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, xContext ); } @@ -50,7 +50,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::Read uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - OUString aStringID = OUString( "[Content_Types].xml" ); + OUString aStringID = "[Content_Types].xml"; return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, xContext ); } diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 678bdae536d1..aad82fea8d39 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -228,14 +228,14 @@ namespace dbtools // format is: // <detail_column> = :<new_param_name> sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink ); - sFilter += OUString( " = :" ); + sFilter += " = :"; // generate a parameter name which is not already used - _rNewParamName = OUString( "link_from_" ); + _rNewParamName = "link_from_"; _rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters ); while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() ) { - _rNewParamName += OUString( "_" ); + _rNewParamName += "_"; } return sFilter += _rNewParamName; diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 51b492c8b8bd..791a06b23631 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -126,7 +126,7 @@ namespace dbtools if ( _rData.sCommand.isEmpty() ) break; - sStatement = OUString( "SELECT * FROM " ); + sStatement = "SELECT * FROM "; OUString sCatalog, sSchema, sTable; qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation ); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 40e9a8237fc3..f227e8124a82 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -358,7 +358,7 @@ namespace connectivity { namespace hsqldb // ask the provider to obtain a graphic Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = OUString( "URL" ); + aMediaProperties[0].Name = "URL"; aMediaProperties[0].Value <<= sImageURL; xGraphic = xProvider->queryGraphic( aMediaProperties ); OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" ); diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index ce6d2fd00c4e..1b2499386911 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -560,7 +560,7 @@ OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodN { OUString sLoggedResult( sReturn ); if ( sLoggedResult.isEmpty() ) - sLoggedResult = OUString( "<empty string>" ); + sLoggedResult = "<empty string>"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 851e18e9a902..33a22aa90b6b 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -48,7 +48,7 @@ OUString MorkDriver::getImplementationName_Static( ) throw(css::uno::RuntimeExc css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException) { css::uno::Sequence< OUString > aSNS(1); - aSNS[0] = OUString( "com.sun.star.sdbc.Driver"); + aSNS[0] = "com.sun.star.sdbc.Driver"; return aSNS; } diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 685c13e84722..8440d50d9770 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -192,8 +192,8 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& // * for windows system address book // "sdbc:address:outlookexp:" -> aboutlookdirectory://oe/ // - m_sBindDN = OUString( ""); - m_sPassword = OUString( ""); + m_sBindDN = ""; + m_sPassword = ""; m_bUseSSL = sal_False; if ( aAddrbookScheme.equalsAscii( getSdbcScheme( SDBC_MOZILLA ) ) ) { @@ -280,19 +280,19 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& throwSQLException( STR_NO_HOSTNAME, *this ); if ( nPortNumber > 0 ) { - m_sMozillaURI += OUString( ":" ); + m_sMozillaURI += ":"; m_sMozillaURI += OUString::number( nPortNumber ); } if ( !sBaseDN.isEmpty() ) { - m_sMozillaURI += OUString( "/" ); + m_sMozillaURI += "/"; m_sMozillaURI += sBaseDN; } else throwSQLException( STR_NO_BASEDN, *this ); // Addition of a fake query to enable the Mozilla LDAP directory to work correctly. - m_sMozillaURI += OUString( "?(or(DisplayName,=,DontDoThisAtHome)))"); + m_sMozillaURI += "?(or(DisplayName,=,DontDoThisAtHome)))"; } else if ( aAddrbookScheme.equalsAscii( getSdbcScheme( SDBC_OUTLOOK_MAPI ) ) ) { diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 8d789380a255..0f945dc05beb 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -93,7 +93,7 @@ Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (Run // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS( 1 ); - aSNS[0] = OUString( "com.sun.star.sdbc.Driver"); + aSNS[0] = "com.sun.star.sdbc.Driver"; return aSNS; } diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 48e867b13310..3469a62b75a0 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -94,7 +94,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere { // get the symbol for the method creating the factory - const OUString sFactoryCreationFunc = OUString( "OMozillaBootstrap_CreateInstance"); + const OUString sFactoryCreationFunc = "OMozillaBootstrap_CreateInstance"; // reinterpret_cast<OMozabConnection_CreateInstanceFunction> removed GNU C OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData); @@ -130,7 +130,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory( else if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { Sequence< OUString > aSNS( 1 ); - aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); + aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap"; aReq.CREATE_PROVIDER( aImplName, aSNS, diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index b68424f8d59d..b9c4629056df 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -90,7 +90,7 @@ Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap Sequence< OUString > aSNS( 1 ); - aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); + aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap"; return aSNS; } @@ -240,7 +240,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { Sequence< OUString > aSNS( 1 ); - aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); + aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap"; xFactory = ::cppu::createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pServiceManager), diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index c42dca5a3cab..34849a0023a5 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1523,7 +1523,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > seq(1); - seq[0] = OUString( "com.sun.star.ui.dialogs.ColorPicker" ); + seq[0] = "com.sun.star.ui.dialogs.ColorPicker"; return seq; } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 86e405832478..ddfb173f622c 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -133,8 +133,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() ); Sequence< OUString > aProps( 2 ); - aProps.getArray()[ 0 ] = OUString( "IsFolder" ); - aProps.getArray()[ 1 ] = OUString( "IsDocument" ); + aProps.getArray()[ 0 ] = "IsFolder"; + aProps.getArray()[ 1 ] = "IsDocument"; ::com::sun::star::uno::Reference< XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 7bd2c7649fa3..12c76bcf4ca6 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -323,7 +323,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(OUString aURL) try { uno::Sequence< beans::PropertyValue > aArg(1); - aArg.getArray()[0].Name = OUString( "Hidden" ); + aArg.getArray()[0].Name = "Hidden"; aArg.getArray()[0].Value <<= (sal_Bool) sal_True; xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); } diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 4c2212271779..f5a73241d23e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -153,7 +153,7 @@ namespace dbmm Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException) { Sequence< OUString > aServices(1); - aServices[0] = OUString( "com.sun.star.sdb.application.MacroMigrationWizard" ); + aServices[0] = "com.sun.star.sdb.application.MacroMigrationWizard"; return aServices; } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 34040d6cc205..99512571e71f 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -286,7 +286,7 @@ namespace dbmm Reference< XCommandProcessor > xCommandProcessor( _rDocument.xCommandProcessor, UNO_SET_THROW ); Command aCommand; - aCommand.Name = OUString( "openDesign" ); + aCommand.Name = "openDesign"; aCommand.Argument <<= aLoadArgs.getPropertyValues(); Reference< XComponent > xDocComponent( xCommandProcessor->execute( diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index cd212eab1780..5a218c3533b7 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -119,7 +119,7 @@ namespace sdbtools Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static() { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.sdb.tools.ConnectionTools" ); + aSupported[0] = "com.sun.star.sdb.tools.ConnectionTools"; return aSupported; } diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 1dcbe7cdefb0..f46db0297407 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -275,7 +275,7 @@ namespace dbaui sal_Int32 nCommandIdentifier = _rxCommandProcessor->createCommandIdentifier(); Command aCommand; - aCommand.Name = OUString( "close" ); + aCommand.Name = "close"; _rxCommandProcessor->execute( aCommand, nCommandIdentifier, NULL ); bSuccess = true; } diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index dd362aaf8dfe..3e5a3c797b6f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -433,7 +433,7 @@ OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode( ) thr Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes( ) throw (RuntimeException) { Sequence< OUString > aModes(1); - aModes[1] = OUString( "DataMode" ); + aModes[1] = "DataMode"; return aModes; } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 12aa23c5fd59..0536babe0476 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -155,8 +155,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const OUString sNameProperty = OUString( "Name" ); - const OUString sAscendingProperty = OUString( "IsAscending" ); + const OUString sNameProperty = "Name"; + const OUString sAscendingProperty = "IsAscending"; Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 4b4a5bbab3a0..d728f25b39d1 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -892,7 +892,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_bCreatePrimaryKeyColumn = sal_True; m_aKeyName = pPage->GetKeyName(); if ( m_aKeyName.isEmpty() ) - m_aKeyName = OUString( "ID" ); + m_aKeyName = "ID"; m_aKeyName = createUniqueName( m_aKeyName ); sal_Int32 nBreakPos2 = 0; CheckColumns(nBreakPos2); diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index efcd1f5bbc15..56220db3f8dc 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -138,7 +138,7 @@ namespace dbaui switch ( _eOpenMode ) { case E_OPEN_NORMAL: - sOpenMode = OUString( "open" ); + sOpenMode = "open"; break; case E_OPEN_FOR_MAIL: @@ -146,7 +146,7 @@ namespace dbaui // fall through case E_OPEN_DESIGN: - sOpenMode = OUString( "openDesign" ); + sOpenMode = "openDesign"; break; default: @@ -301,7 +301,7 @@ namespace dbaui aCommandArgs.put( "OpenMode", aOpenModeArg ); Command aCommand; - aCommand.Name = OUString( "openDesign" ); + aCommand.Name = "openDesign"; aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index e70b23b2d93c..92cd40c0c81c 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -208,7 +208,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con ++crit, ++c ) { - aCriteria[c].Name = OUString( "Criterion_" ) + OUString::number( c ); + aCriteria[c].Name = "Criterion_" + OUString::number( c ); aCriteria[c].Value <<= *crit; } diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 63724e5a4d31..a21f771998fd 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -59,7 +59,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt ) { nHandled = LimitBox::Notify( rNEvt ); uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "DBLimit.Value" ); + aArgs[0].Name = "DBLimit.Value"; aArgs[0].Value = uno::makeAny( GetValue() ); m_pControl->dispatchCommand( aArgs ); break; @@ -225,7 +225,7 @@ void LimitBoxController::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = OUString( ".uno:DBLimit" ); + aURL.Complete = ".uno:DBLimit"; xURLTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 065bb3d0caab..1d6c9f562d18 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -274,7 +274,7 @@ void Desktop::CreateTemporaryDirectory() if ( aResId.GetResMgr()->IsAvailable( aResId )) aMsg = OUString( aResId ); else - aMsg = OUString( "The path manager is not available.\n" ); + aMsg = "The path manager is not available.\n"; e.Message = aMsg + e.Message; throw; } diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index c291ac7318e3..b2131fd7c63b 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -67,7 +67,7 @@ namespace migration if ( !pNames ) { static Sequence< OUString > aNames(1); - aNames.getArray()[0] = OUString( "com.sun.star.migration.Wordbooks" ); + aNames.getArray()[0] = "com.sun.star.migration.Wordbooks"; pNames = &aNames; } } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index e9ed1579218b..43522d7071ed 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -616,10 +616,10 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( if ( rCC.getLanguageTag().getLanguage() == "fr" ) { bool bFrCA = (rCC.getLanguageTag().getCountry() == "CA"); - OUString allChars = OUString( ":;?!%" ); + OUString allChars = ":;?!%"; OUString chars( allChars ); if ( bFrCA ) - chars = OUString( ":" ); + chars = ":"; sal_Unicode cChar = rTxt[ nEndPos ]; bool bHasSpace = chars.indexOf( cChar ) != -1; diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 4e161a886756..b3e920884fba 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -106,7 +106,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans: if ( !bAsTemplateSet ) { aResult.realloc( nLength + 1 ); - aResult[nLength].Name = OUString( "AsTemplate" ); + aResult[nLength].Name = "AsTemplate"; aResult[nLength].Value <<= sal_True; } @@ -221,7 +221,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c if ( xDocument.is() ) { uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = OUString( "SetEmbedded" ); + aSeq[0].Name = "SetEmbedded"; aSeq[0].Value <<= sal_True; xDocument->attachResource( OUString(), aSeq ); @@ -377,14 +377,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() sal_Int32 nLen = 2; uno::Sequence< beans::PropertyValue > aArgs( nLen ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= m_aLinkURL; - aArgs[1].Name = OUString( "FilterName" ); + aArgs[1].Name = "FilterName"; aArgs[1].Value <<= m_aLinkFilterName; if ( m_bLinkHasPassword ) { aArgs.realloc( ++nLen ); - aArgs[nLen-1].Name = OUString( "Password" ); + aArgs[nLen-1].Name = "Password"; aArgs[nLen-1].Value <<= m_aLinkPassword; } @@ -590,13 +590,13 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 4 ); - aArgs[0].Name = OUString( "FilterName" ); + aArgs[0].Name = "FilterName"; aArgs[0].Value <<= aFilterName; - aArgs[1].Name = OUString( "OutputStream" ); + aArgs[1].Name = "OutputStream"; aArgs[1].Value <<= xTempOut; - aArgs[2].Name = OUString( "DocumentBaseURL" ); + aArgs[2].Name = "DocumentBaseURL"; aArgs[2].Value <<= aBaseURL; - aArgs[3].Name = OUString( "HierarchicalDocumentName" ); + aArgs[3].Name = "HierarchicalDocumentName"; aArgs[3].Value <<= aHierarchName; xStorable->storeToURL( OUString( "private:stream" ), aArgs ); @@ -751,11 +751,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = OUString( "FilterName" ); + aArgs[0].Name = "FilterName"; aArgs[0].Value <<= aFilterName; - aArgs[2].Name = OUString( "DocumentBaseURL" ); + aArgs[2].Name = "DocumentBaseURL"; aArgs[2].Value <<= aBaseURL; - aArgs[1].Name = OUString( "HierarchicalDocumentName" ); + aArgs[1].Name = "HierarchicalDocumentName"; aArgs[1].Value <<= aHierarchName; xDoc->storeToStorage( xStorage, aArgs ); @@ -866,21 +866,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ SAL_WARN_IF( aTempFileURL.isEmpty(), "embeddedobj.common", "Couldn't retrieve temporary file URL!" ); - aTempMediaDescr[0].Name = OUString( "URL" ); + aTempMediaDescr[0].Name = "URL"; aTempMediaDescr[0].Value <<= aTempFileURL; - aTempMediaDescr[1].Name = OUString( "InputStream" ); + aTempMediaDescr[1].Name = "InputStream"; aTempMediaDescr[1].Value <<= xTempStream; - aTempMediaDescr[2].Name = OUString( "FilterName" ); + aTempMediaDescr[2].Name = "FilterName"; aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat ); - aTempMediaDescr[3].Name = OUString( "AsTemplate" ); + aTempMediaDescr[3].Name = "AsTemplate"; aTempMediaDescr[3].Value <<= sal_True; } else { aTempMediaDescr.realloc( 2 ); - aTempMediaDescr[0].Name = OUString( "URL" ); + aTempMediaDescr[0].Name = "URL"; aTempMediaDescr[0].Value <<= m_aLinkURL; - aTempMediaDescr[1].Name = OUString( "FilterName" ); + aTempMediaDescr[1].Name = "FilterName"; aTempMediaDescr[1].Value <<= m_aLinkFilterName; } @@ -1692,7 +1692,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( else { uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= m_aLinkURL; m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False ); } diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index e054f7a95005..9883c490cb16 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf, { uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext())); uno::Sequence< beans::PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = OUString( "InputStream" ); + aMediaProperties[0].Name = "InputStream"; aMediaProperties[0].Value <<= xIn; uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); if( xGraphic.is() ) @@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf, SvMemoryStream aNewStream( 65535, 65535 ); uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream ); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 ); - aOutMediaProperties[0].Name = OUString( "OutputStream" ); + aOutMediaProperties[0].Name = "OutputStream"; aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = OUString( "MimeType" ); + aOutMediaProperties[1].Name = "MimeType"; aOutMediaProperties[1].Value <<= aMimeType; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index d2da4840fca5..b0c8abc0f88a 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -207,9 +207,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ ) { - OUString aName = OUString::number( nInd ); - aName += OUString( "TMPSTOR" ); - aName += m_aEntryName; + OUString aName = OUString::number( nInd ) + "TMPSTOR" + m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { xResult = m_xParentStorage->openStorageElement( aName, embed::ElementModes::READWRITE ); @@ -232,9 +230,7 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream() OUString aResult; for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ ) { - OUString aName = OUString::number( nInd ); - aName += OUString( "TMPSTREAM" ); - aName += m_aEntryName; + OUString aName = OUString::number( nInd ) + "TMPSTREAM" + m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { m_xParentStorage->renameElement( m_aEntryName, aName ); @@ -300,21 +296,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // let the model behave as embedded one uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = OUString( "SetEmbedded" ); + aSeq[0].Name = "SetEmbedded"; aSeq[0].Value <<= sal_True; xModel->attachResource( OUString(), aSeq ); // load the model from the stream uno::Sequence< beans::PropertyValue > aArgs( 5 ); - aArgs[0].Name = OUString( "HierarchicalDocumentName" ); + aArgs[0].Name = "HierarchicalDocumentName"; aArgs[0].Value <<= m_aEntryName; - aArgs[1].Name = OUString( "ReadOnly" ); + aArgs[1].Name = "ReadOnly"; aArgs[1].Value <<= sal_True; - aArgs[2].Name = OUString( "FilterName" ); + aArgs[2].Name = "FilterName"; aArgs[2].Value <<= aFilterName; - aArgs[3].Name = OUString( "URL" ); + aArgs[3].Name = "URL"; aArgs[3].Value <<= OUString( "private:stream" ); - aArgs[4].Name = OUString( "InputStream" ); + aArgs[4].Name = "InputStream"; aArgs[4].Value <<= m_xObjectStream->getInputStream(); xSeekable->seek( 0 ); diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index e020de2e1c2f..528d0fc5bdfa 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -500,7 +500,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea throw io::IOException(); // TODO: // insert the result file as replacement image - OUString aCacheName = OUString( "\002OlePres000" ); + OUString aCacheName = "\002OlePres000"; if ( xNameContainer->hasByName( aCacheName ) ) xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) ); else @@ -535,8 +535,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - OUString aStreamName( "\002OlePres00" ); - aStreamName += OUString::number( nInd ); + OUString aStreamName = "\002OlePres00" + OUString::number( nInd ); if ( xNameContainer->hasByName( aStreamName ) ) xNameContainer->removeByName( aStreamName ); } @@ -603,8 +602,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() { for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ ) { - OUString aStreamName( "\002OlePres00" ); - aStreamName += OUString::number( nInd ); + OUString aStreamName = "\002OlePres00" + OUString::number( nInd ); try { bExists = xNameContainer->hasByName( aStreamName ); @@ -653,8 +651,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - OUString aStreamName( "\002OlePres00" ); - aStreamName += OUString::number( nInd ); + OUString aStreamName = "\002OlePres00" + OUString::number( nInd ); uno::Reference< io::XStream > xCachedCopyStream; try { @@ -671,7 +668,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres if ( nInd == 0 ) { // to be compatible with the old versions Ole10Native is checked after OlePress000 - aStreamName = OUString( "\001Ole10Native" ); + aStreamName = "\001Ole10Native"; try { if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() ) diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 5478d054b063..90814fb3dd46 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -120,22 +120,22 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL ) uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= aFileURL; - aArgs[1].Name = OUString( "ReadOnly" ); + aArgs[1].Name = "ReadOnly"; aArgs[1].Value <<= sal_True; - aArgs[2].Name = OUString( "InteractionHandler" ); + aArgs[2].Name = "InteractionHandler"; aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >( static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY ); - aArgs[3].Name = OUString( "DontEdit" ); + aArgs[3].Name = "DontEdit"; aArgs[3].Value <<= sal_True; if ( !m_aFilterName.isEmpty() ) { - aArgs[4].Name = OUString( "FilterName" ); + aArgs[4].Name = "FilterName"; aArgs[4].Value <<= m_aFilterName; } @@ -215,13 +215,13 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( } uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= OUString( "private:stream" ); - aArgs[1].Name = OUString( "InputStream" ); + aArgs[1].Name = "InputStream"; aArgs[1].Value <<= xInputStream; if ( !aTypeName.isEmpty() ) { - aArgs[2].Name = OUString( "TypeName" ); + aArgs[2].Name = "TypeName"; aArgs[2].Value <<= aTypeName; } @@ -425,7 +425,7 @@ void OwnView_Impl::CreateNative() aArgs ), uno::UNO_QUERY_THROW ); - OUString aSubStreamName = OUString( "\1Ole10Native" ); + OUString aSubStreamName = "\1Ole10Native"; uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW ); uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID(); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 7114c857937a..885ba91989d4 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -718,7 +718,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s { // set the document mode to embedded uno::Sequence< beans::PropertyValue > aSeq(1); - aSeq[0].Name = OUString( "SetEmbedded" ); + aSeq[0].Name = "SetEmbedded"; aSeq[0].Value <<= sal_True; m_xDocument->attachResource(OUString(),aSeq); } diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 6c941e057565..bbaa567f9a5c 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -204,19 +204,19 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp uno::Sequence< beans::PropertyValue > aArgs( 3 ); sal_Int32 nInd = 0; // must not be bigger than the preset size - aArgs[nInd].Name = OUString( "FilterName" ); + aArgs[nInd].Name = "FilterName"; aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[nInd].Name = OUString( "InputStream" ); + aArgs[nInd].Name = "InputStream"; aArgs[nInd++].Value <<= xStream; - aArgs[nInd].Name = OUString( "URL" ); + aArgs[nInd].Name = "URL"; aArgs[nInd++].Value <<= OUString( "private:stream" ); } else { - aArgs[nInd].Name = OUString( "URL" ); + aArgs[nInd].Name = "URL"; OUString sDocUrl; if ( pFilePath ) @@ -235,7 +235,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp aArgs.realloc( nInd ); - // aArgs[].Name = OUString( "ReadOnly" ); + // aArgs[].Name = "ReadOnly"; // aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False ); return aArgs; @@ -245,12 +245,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp { uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 ); - aArgs[0].Name = OUString( "FilterName" ); + aArgs[0].Name = "FilterName"; aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[1].Name = OUString( "OutputStream" ); + aArgs[1].Name = "OutputStream"; aArgs[1].Value <<= xStream; } diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index 4f9b53f9f9e6..85b9c4bcc11a 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -52,7 +52,7 @@ OUString SAL_CALL EmbedServer_getImplementationName() throw() uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw() { uno::Sequence< OUString > aServiceNames( 1 ); - aServiceNames[0] = OUString( "com.sun.star.document.OleEmbeddedServerRegistration" ); + aServiceNames[0] = "com.sun.star.document.OleEmbeddedServerRegistration"; return aServiceNames; } diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 95a9a51e4bd3..637a3a2a2f92 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -296,7 +296,7 @@ namespace logging Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "com.sun.star.logging.ConsoleHandler" ); + aServiceNames[0] = "com.sun.star.logging.ConsoleHandler"; return aServiceNames; } diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 15f4e3592178..e600315d6321 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -398,7 +398,7 @@ namespace logging Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "com.sun.star.logging.FileHandler" ); + aServiceNames[0] = "com.sun.star.logging.FileHandler"; return aServiceNames; } diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index bf678f3a59e9..7145f72d2e07 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -293,7 +293,7 @@ namespace logging Sequence< OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "com.sun.star.logging.Logger" ); + aServiceNames[0] = "com.sun.star.logging.Logger"; return aServiceNames; } diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index bf9bff1d26f3..2f4e0a6eb381 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -178,7 +178,7 @@ namespace logging Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "com.sun.star.logging.PlainTextFormatter" ); + aServiceNames[0] = "com.sun.star.logging.PlainTextFormatter"; return aServiceNames; } diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 3e9d0311dda7..f75694b8c2c8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -408,7 +408,7 @@ namespace pcr Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); Sequence< PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = OUString( "URL" ); + aMediaProperties[0].Name = "URL"; aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index b0bfc6237ec9..4f7446bcde69 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -72,7 +72,7 @@ namespace pcr Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); + aSupported[0] = "com.sun.star.form.inspection.ButtonNavigationHandler"; return aSupported; } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 3106efcd4e18..5aa52a448578 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -70,7 +70,7 @@ namespace pcr Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.CellBindingPropertyHandler"; return aSupported; } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index bca96ac2dc3a..7e00aac66e20 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -73,7 +73,7 @@ namespace pcr Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.EditPropertyHandler"; return aSupported; } diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 28332e210695..8d1417fa0b8a 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -81,7 +81,7 @@ namespace pcr Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.XMLFormsPropertyHandler"; return aSupported; } @@ -468,7 +468,7 @@ namespace pcr } aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = OUString( "Data" ); + aDescriptor.Category = "Data"; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 56e63367b02a..58253b1faa7e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -169,7 +169,7 @@ namespace pcr Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.FormComponentPropertyHandler"; return aSupported; } diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 2d46ae622ccf..3995229df83c 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -323,7 +323,7 @@ namespace pcr Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); + aSupported[0] = "com.sun.star.form.inspection.FormGeometryHandler"; return aSupported; } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 117b6ac6814c..49eb6fa22667 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -99,8 +99,8 @@ namespace pcr ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(2); - aSupported.getArray()[0] = OUString( "com.sun.star.form.ui.TabOrderDialog" ); - aSupported.getArray()[1] = OUString( "com.sun.star.form.TabOrderDialog" ); + aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog"; + aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog"; return aSupported; } diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 78359d4659cc..c25028e18dbc 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -219,9 +219,9 @@ namespace pcr aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) - aDescriptor.Category = OUString( "Data" ); + aDescriptor.Category = "Data"; else - aDescriptor.Category = OUString( "General" ); + aDescriptor.Category = "General"; return aDescriptor; } @@ -379,28 +379,28 @@ namespace pcr OUString sConfigurationProperty; if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) ) { // writer - sConfigurationLocation = OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); - sConfigurationProperty = OUString( "MeasureUnit" ); + sConfigurationLocation = "/org.openoffice.Office.WriterWeb/Layout/Other"; + sConfigurationProperty = "MeasureUnit"; } else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) ) { // writer - sConfigurationLocation = OUString( "/org.openoffice.Office.Writer/Layout/Other" ); - sConfigurationProperty = OUString( "MeasureUnit" ); + sConfigurationLocation = "/org.openoffice.Office.Writer/Layout/Other"; + sConfigurationProperty = "MeasureUnit"; } else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) ) { // calc - sConfigurationLocation = OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); - sConfigurationProperty = OUString( "Metric" ); + sConfigurationLocation = "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit"; + sConfigurationProperty = "Metric"; } else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) ) { - sConfigurationLocation = OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); - sConfigurationProperty = OUString( "Metric" ); + sConfigurationLocation = "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit"; + sConfigurationProperty = "Metric"; } else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) ) { - sConfigurationLocation = OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); - sConfigurationProperty = OUString( "Metric" ); + sConfigurationLocation = "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit"; + sConfigurationProperty = "Metric"; } // read the measurement unit from the configuration diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 67522ddb29de..4672ac6ff147 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -243,7 +243,7 @@ namespace pcr aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING; aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing(); - aArgs[4].Name = OUString( "GraphicalDesign" ); + aArgs[4].Name = "GraphicalDesign"; aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 495db591461d..c2d20037bd4f 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -113,7 +113,7 @@ namespace pcr Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.SubmissionPropertyHandler"; return aSupported; } @@ -312,7 +312,7 @@ namespace pcr LineDescriptor aDescriptor; aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = OUString( "General" ); + aDescriptor.Category = "General"; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 2594e02ee1e7..54ce977fd3d1 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -95,7 +95,7 @@ namespace pcr Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); - aSupported[0] = OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); + aSupported[0] = "com.sun.star.form.inspection.XSDValidationPropertyHandler"; return aSupported; } @@ -323,8 +323,8 @@ namespace pcr aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); aDescriptor.SecondaryButtonId = OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; - aDescriptor.PrimaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); - aDescriptor.SecondaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); + aDescriptor.PrimaryButtonImageURL = "private:graphicrepository/extensions/res/buttonplus.png"; + aDescriptor.SecondaryButtonImageURL = "private:graphicrepository/extensions/res/buttonminus.png"; break; case PROPERTY_ID_XSD_WHITESPACES: @@ -419,7 +419,7 @@ namespace pcr break; } - aDescriptor.Category = OUString( "Data" ); + aDescriptor.Category = "Data"; aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index ec2f088594ec..671968d9c748 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -88,7 +88,7 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw () { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.scanner.ScannerManager" ); + aSNS.getArray()[0] = "com.sun.star.scanner.ScannerManager"; return aSNS; } diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 12f8fcbd1dfa..319445f178d5 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -866,7 +866,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() osl::MutexGuard aGuard( maProtector ); uno::Sequence< ScannerContext > aRet( 1 ); - aRet.getArray()[0].ScannerName = OUString( "TWAIN" ); + aRet.getArray()[0].ScannerName = "TWAIN" ; aRet.getArray()[0].InternalData = 0; return aRet; @@ -878,7 +878,7 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" ) throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext ); ReleaseData(); @@ -892,7 +892,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" ) throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext ); ReleaseData(); @@ -905,7 +905,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + if( rContext.InternalData != 0 || rContext.ScannerName != "TWAIN" ) throw ScannerException("Scanner does not exist", xThis, ScanError_InvalidContext ); return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone ); diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 07559b1cbad0..de9872b74402 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -259,37 +259,37 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.text.TextDocument" ); + sDocumentService = "com.sun.star.text.TextDocument"; } else if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.text.WebDocument" ); + sDocumentService = "com.sun.star.text.WebDocument"; } else if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.text.GlobalDocument" ); + sDocumentService = "com.sun.star.text.GlobalDocument"; } else if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + sDocumentService = "com.sun.star.sheet.SpreadsheetDocument"; } else if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.drawing.DrawingDocument" ); + sDocumentService = "com.sun.star.drawing.DrawingDocument"; } else if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.presentation.PresentationDocument" ); + sDocumentService = "com.sun.star.presentation.PresentationDocument"; } else if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = OUString( "com.sun.star.formula.FormulaProperties" ); + sDocumentService = "com.sun.star.formula.FormulaProperties"; } #endif @@ -582,7 +582,7 @@ OUString FilterFactory::impl_getImplementationName() css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames(1); - lServiceNames[0] = OUString( "com.sun.star.document.FilterFactory" ); + lServiceNames[0] = "com.sun.star.document.FilterFactory"; return lServiceNames; } diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index c6258e6cb227..d0bd8cf50c19 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -1232,7 +1232,7 @@ OUString TypeDetection::impl_getImplementationName() css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames(1); - lServiceNames[0] = OUString( "com.sun.star.document.TypeDetection" ); + lServiceNames[0] = "com.sun.star.document.TypeDetection"; return lServiceNames; } diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index d26339420811..7ad8f339878d 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -70,7 +70,7 @@ Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( Runtime maMediaDescriptor.realloc( nCount ); } - maMediaDescriptor[ i ].Name = OUString( "FilterData" ); + maMediaDescriptor[ i ].Name = "FilterData"; maMediaDescriptor[ i ].Value <<= maFilterDataSequence; return maMediaDescriptor; } @@ -128,15 +128,15 @@ void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocum { if ( xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument") ) { - aConfigPath = OUString( "Office.Impress/Layout/Other/MeasureUnit" ); + aConfigPath = "Office.Impress/Layout/Other/MeasureUnit"; } else if ( xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument") ) { - aConfigPath = OUString( "Office.Draw/Layout/Other/MeasureUnit" ); + aConfigPath = "Office.Draw/Layout/Other/MeasureUnit"; } else if ( xServiceInfo->supportsService("com.sun.star.text.TextDocument") ) { - aConfigPath = OUString( "Office.Writer/Layout/Other/MeasureUnit" ); + aConfigPath = "Office.Writer/Layout/Other/MeasureUnit"; } if ( !aConfigPath.isEmpty() ) { @@ -146,11 +146,11 @@ void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocum if ( aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum() == MEASURE_METRIC ) { - aPropertyName = OUString( "Metric" ); + aPropertyName = "Metric"; } else { - aPropertyName = OUString( "NonMetric" ); + aPropertyName = "NonMetric"; } meFieldUnit = (FieldUnit) aConfigItem.ReadInt32( aPropertyName, FUNIT_CM ); } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 06575d09b1d7..7318de19195d 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4308,10 +4308,10 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin aGIFStream.Seek( STREAM_SEEK_TO_BEGIN ); aGIFStream.Read( pSeq, nGIFSreamLen ); com::sun::star::beans::PropertyValue aChunkProp, aFilterProp; - aChunkProp.Name = OUString( "msOG" ); + aChunkProp.Name = "msOG"; aChunkProp.Value <<= aGIFSeq; aAdditionalChunkSequence[ 0 ] = aChunkProp; - aFilterProp.Name = OUString( "AdditionalChunks" ); + aFilterProp.Name = "AdditionalChunks"; aFilterProp.Value <<= aAdditionalChunkSequence; aFilterData[ 0 ] = aFilterProp; nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aStream, diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 71b0456a754c..27ca4a9813b8 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6881,15 +6881,15 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS aFilterName = GetFilterNameFromClassID_Impl( aStgNm ); uno::Sequence < beans::PropertyValue > aMedium( aFilterName.isEmpty() ? 2 : 3); - aMedium[0].Name = OUString( "InputStream" ); + aMedium[0].Name = "InputStream"; uno::Reference < io::XInputStream > xStream = new ::utl::OSeekableInputStreamWrapper( *xMemStream ); aMedium[0].Value <<= xStream; - aMedium[1].Name = OUString( "URL" ); + aMedium[1].Name = "URL"; aMedium[1].Value <<= OUString( "private:stream" ); if ( !aFilterName.isEmpty() ) { - aMedium[2].Name = OUString( "FilterName" ); + aMedium[2].Name = "FilterName"; aMedium[2].Value <<= aFilterName; } diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 82cb589e719f..541c0097bce3 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -191,10 +191,10 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto //TODO/LATER: a "StoreTo" method at embedded object would be nice uno::Sequence < beans::PropertyValue > aSeq(2); SvStream* pStream = new SvMemoryStream; - aSeq[0].Name = OUString( "OutputStream" ); + aSeq[0].Name = "OutputStream"; ::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *pStream ); aSeq[0].Value <<= xOut; - aSeq[1].Name = OUString( "FilterName" ); + aSeq[1].Name = "FilterName"; aSeq[1].Value <<= OUString( pExpFilter->GetName() ); uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY ); try @@ -291,7 +291,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto //TODO/LATER: is stream instead of outputstream a better choice?! //TODO/LATER: a "StoreTo" method at embedded object would be nice uno::Sequence < beans::PropertyValue > aSeq(1); - aSeq[0].Name = OUString( "OutputStream" ); + aSeq[0].Name = "OutputStream"; ::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *xEmbStm ); aSeq[0].Value <<= xOut; uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY ); diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 13de4875affb..a45aaade3b0f 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -190,8 +190,8 @@ OUString OdfFlatXml::impl_getImplementationName() Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames() { Sequence< OUString > lServiceNames(2); - lServiceNames[0] = OUString( "com.sun.star.document.ImportFilter" ); - lServiceNames[1] = OUString( "com.sun.star.document.ExportFilter" ); + lServiceNames[0] = "com.sun.star.document.ImportFilter"; + lServiceNames[1] = "com.sun.star.document.ExportFilter"; return lServiceNames; } diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index e665f9d738b9..60681d2d4343 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -106,7 +106,7 @@ bool isXMLStream(const OString& aHeaderStrm) OUString supportedByType( const OUString clipBoardFormat , const OString resultString, const OUString checkType) { OUString sTypeName; - if ( clipBoardFormat.match(OUString("doctype:")) ) + if ( clipBoardFormat.match("doctype:") ) { OString tryStr = OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); if (resultString.indexOf(tryStr) >= 0) @@ -207,7 +207,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun: if (location == aArguments.getLength()) { aArguments.realloc(nLength+1); - aArguments[location].Name = OUString( "TypeName" ); + aArguments[location].Name = "TypeName"; } aArguments[location].Value <<=sTypeName; } diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 6aa7ace9f884..4fe62c9339a5 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -198,7 +198,7 @@ OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeExcepti Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() throw ( RuntimeException ) { Sequence< OUString > aSupported(1); - aSupported[0] = OUString( "com.sun.star.ui.dialogs.XSLTFilterDialog" ); + aSupported[0] = "com.sun.star.ui.dialogs.XSLTFilterDialog"; return aSupported; } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index edb18f7d4047..fb916b035a31 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -152,7 +152,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = OUString( "StorageFormat" ); + aArg.Name = "StorageFormat"; aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; @@ -251,7 +251,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = OUString( "StorageFormat" ); + aArg.Name = "StorageFormat"; aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index dca58231f665..bfd172dd7906 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1507,9 +1507,9 @@ OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const { OUString aEntryStr( pInfo->maFilterName + "\t"); if ( !pInfo->maExportService.isEmpty() ) - aEntryStr += OUString( getApplicationUIName( pInfo->maExportService ) ); + aEntryStr += getApplicationUIName( pInfo->maExportService ); else - aEntryStr += OUString( getApplicationUIName( pInfo->maImportService ) ); + aEntryStr += getApplicationUIName( pInfo->maImportService ); aEntryStr += " - "; if( pInfo->maFlags & 1 ) @@ -1604,7 +1604,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const { Sequence< OUString > aUserData(8); - aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" ); + aUserData[0] = "com.sun.star.documentconversion.XSLTFilter"; aUserData[1] = OUString::boolean( mbNeedsXSLT2 ); aUserData[2] = maImportService; aUserData[3] = maExportService; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 140713fa0635..ff9aca316e62 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -319,13 +319,13 @@ namespace XSLT Sequence<Any> args(3); NamedValue nv; - nv.Name = OUString( "StylesheetURL" ); + nv.Name = "StylesheetURL"; nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv; - nv.Name = OUString( "SourceURL" ); + nv.Name = "SourceURL"; nv.Value <<= aURL; args[1] <<= nv; - nv.Name = OUString( "SourceBaseURL" ); + nv.Name = "SourceBaseURL"; nv.Value <<= OUString(INetURLObject(aURL).getBase()); args[2] <<= nv; @@ -461,16 +461,16 @@ namespace XSLT // create transformer Sequence<Any> args(4); NamedValue nv; - nv.Name = OUString( "StylesheetURL" ); + nv.Name = "StylesheetURL"; nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv; - nv.Name = OUString( "TargetURL" ); + nv.Name = "TargetURL"; nv.Value <<= sURL; args[1] <<= nv; - nv.Name = OUString( "DoctypePublic" ); + nv.Name = "DoctypePublic"; nv.Value <<= aDoctypePublic; args[2] <<= nv; - nv.Name = OUString( "TargetBaseURL" ); + nv.Name = "TargetBaseURL"; INetURLObject ineturl(sURL); ineturl.removeSegment(); m_aExportBaseUrl = ineturl.GetMainURL(INetURLObject::NO_DECODE); @@ -581,9 +581,7 @@ extern "C" if (rtl_str_compare(pImplName, FILTER_IMPL_NAME) == 0) { Sequence<OUString> serviceNames(1); - serviceNames.getArray()[0] - = OUString( - FILTER_SERVICE_NAME ); + serviceNames.getArray()[0] = FILTER_SERVICE_NAME; css::uno::Reference<XSingleServiceFactory> xFactory( @@ -603,9 +601,7 @@ extern "C" else if (rtl_str_compare(pImplName, TRANSFORMER_IMPL_NAME) == 0) { Sequence<OUString> serviceNames(1); - serviceNames.getArray()[0] - = OUString( - TRANSFORMER_SERVICE_NAME ); + serviceNames.getArray()[0] = TRANSFORMER_SERVICE_NAME; css::uno::Reference<XSingleServiceFactory> xFactory( createSingleFactory( diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 05bc70cc02f5..1064ea051712 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -70,16 +70,16 @@ const StringSequence& getColumnTypes() if (aColumnTypes.getConstArray()[0].isEmpty()) { OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = OUString( "CheckBox" ); - pNames[TYPE_COMBOBOX] = OUString( "ComboBox" ); - pNames[TYPE_CURRENCYFIELD] = OUString( "CurrencyField" ); - pNames[TYPE_DATEFIELD] = OUString( "DateField" ); - pNames[TYPE_FORMATTEDFIELD] = OUString( "FormattedField" ); - pNames[TYPE_LISTBOX] = OUString( "ListBox" ); - pNames[TYPE_NUMERICFIELD] = OUString( "NumericField" ); - pNames[TYPE_PATTERNFIELD] = OUString( "PatternField" ); - pNames[TYPE_TEXTFIELD] = OUString( "TextField" ); - pNames[TYPE_TIMEFIELD] = OUString( "TimeField" ); + pNames[TYPE_CHECKBOX] = "CheckBox"; + pNames[TYPE_COMBOBOX] = "ComboBox"; + pNames[TYPE_CURRENCYFIELD] = "CurrencyField"; + pNames[TYPE_DATEFIELD] = "DateField"; + pNames[TYPE_FORMATTEDFIELD] = "FormattedField"; + pNames[TYPE_LISTBOX] = "ListBox"; + pNames[TYPE_NUMERICFIELD] = "NumericField"; + pNames[TYPE_PATTERNFIELD] = "PatternField"; + pNames[TYPE_TEXTFIELD] = "TextField"; + pNames[TYPE_TIMEFIELD] = "TimeField"; } return aColumnTypes; } diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8cfdb4967550..4e37fc229a66 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -295,7 +295,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con OUString sNewImageURL; if ( m_xGraphicObject.is() ) { - sNewImageURL = OUString( "vnd.sun.star.GraphicObject:" ); + sNewImageURL = "vnd.sun.star.GraphicObject:"; sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); } m_sImageURL = sNewImageURL; diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index d7979c74ff0a..9baeea7ff3c8 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -184,7 +184,7 @@ namespace frm aSupported.realloc( aSupported.getLength() + 2 ); OUString* pArray = aSupported.getArray(); - pArray[ aSupported.getLength() - 2 ] = OUString( "com.sun.star.awt.UnoControlModel" ); + pArray[ aSupported.getLength() - 2 ] = "com.sun.star.awt.UnoControlModel"; pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR; return aSupported; } diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 7f299b855ca1..61881550647f 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -44,13 +44,13 @@ namespace frm switch ( _eFunc ) { case OClipboardDispatcher::eCut: - aURL.Complete = OUString( ".uno:Cut" ); + aURL.Complete = ".uno:Cut"; break; case OClipboardDispatcher::eCopy: - aURL.Complete = OUString( ".uno:Copy" ); + aURL.Complete = ".uno:Copy"; break; case OClipboardDispatcher::ePaste: - aURL.Complete = OUString( ".uno:Paste" ); + aURL.Complete = ".uno:Paste"; break; } return aURL; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 942253209681..468676200413 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -273,8 +273,8 @@ namespace frm Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = OUString( "com.sun.star.awt.UnoControlEdit" ); + aServices[ 0 ] = "com.sun.star.awt.UnoControl"; + aServices[ 1 ] = "com.sun.star.awt.UnoControlEdit"; aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL; return aServices; } diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index c8109ed06c6f..083844e7f215 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -152,7 +152,7 @@ namespace frm Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aNames(1); - aNames[0] = OUString( "com.sun.star.form.runtime.FormOperations" ); + aNames[0] = "com.sun.star.form.runtime.FormOperations"; return aNames; } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 58c0c44e6b20..71eb891c5234 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -201,8 +201,8 @@ namespace frm Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = OUString( "com.sun.star.form.control.NavigationToolBar" ); + aServices[ 0 ] = "com.sun.star.awt.UnoControl"; + aServices[ 1 ] = "com.sun.star.form.control.NavigationToolBar"; return aServices; } diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 0c24ace5525b..5b4811865a49 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -286,7 +286,7 @@ namespace xforms RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) { - _rErrorMessage = OUString( "This is no valid pattern." ); + _rErrorMessage = "This is no valid pattern."; return false; } } @@ -544,7 +544,7 @@ namespace xforms sal_Int32 nValue( 0 ); OSL_VERIFY( _rNewValue >>= nValue ); if ( nValue <= 0 ) - _rErrorMessage = OUString( "Length limits must denote positive integer values." ); + _rErrorMessage = "Length limits must denote positive integer values."; // TODO/eforms: localize the error message } break; diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 4439834ee453..39f522bd872c 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -98,7 +98,7 @@ uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNa uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq[0] = OUString( "com.sun.star.sheet.FormulaOpCodeMapper" ); + aSeq[0] = "com.sun.star.sheet.FormulaOpCodeMapper"; return aSeq; } diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 3ec8b9fc655f..7eba162c8720 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -606,7 +606,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException Sequence< OUString > aPath( nTotal ); if ( nCount == 1 ) - aPath[0] = OUString(aPathList[0]); + aPath[0] = aPathList[0]; else if ( nCount > 1 ) { INetURLObject aObj(aPathList[0]); @@ -1132,7 +1132,7 @@ Sequence< OUString > SvtFilePicker::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames( 1 ); OUString* pArray = seqServiceNames.getArray(); - pArray[0] = OUString( "com.sun.star.ui.dialogs.OfficeFilePicker" ); + pArray[0] = "com.sun.star.ui.dialogs.OfficeFilePicker"; return seqServiceNames ; } diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 8a00b202fb65..37274d831e4b 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -175,7 +175,7 @@ Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( Sequence< OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames(1); - seqServiceNames[0] = OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker" ); + seqServiceNames[0] = "com.sun.star.ui.dialogs.OfficeFolderPicker"; return seqServiceNames ; } diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 27cc7efb075c..afd374ba5ca0 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -326,7 +326,7 @@ namespace svt ucbhelper::Content aCreated; Sequence< OUString > aNames( 1 ); OUString* pNames = aNames.getArray(); - pNames[0] = OUString( "Title" ); + pNames[0] = "Title"; Sequence< Any > aValues( 1 ); Any* pValues = aValues.getArray(); pValues[0] = makeAny( _rTitle ); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ffa611175ddb..009b61d7fcb0 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2025,8 +2025,8 @@ short SvtFileDialog::PrepareExecute() Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Sequence< OUString > aProps(2); - aProps[0] = OUString( "IsVolume" ); - aProps[1] = OUString( "IsRemoveable" ); + aProps[0] = "IsVolume"; + aProps[1] = "IsRemoveable"; Reference< XResultSet > xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY ); @@ -2117,7 +2117,7 @@ short SvtFileDialog::PrepareExecute() nPos = nFilterCount; while ( nPos-- ) { - if ( aAll != OUString( GetFilterName( nPos ) ) ) + if ( aAll != GetFilterName( nPos ) ) break; } } diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 1817d355412e..d1a9b00b8f99 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -323,7 +323,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* { OUString sName = _pFilterDesc->GetName(); if ( _pFilterDesc->isGroupSeparator() ) - sName = OUString( "------------------------------------------" ); + sName = "------------------------------------------"; else sName = _pFilterDesc->GetName(); diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 486651540234..13f2aec7ddac 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -162,9 +162,7 @@ MenuManager::MenuManager( pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); // Set item command for popup menu to enable it for GetImageFromURL - const static OUString aSlotString( "slot:" ); - aItemCommand = aSlotString; - aItemCommand += OUString::number( ITEMID_ADDONLIST ); + aItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST ); pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand ); AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); @@ -559,7 +557,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) if ( i <= 9 ) { if ( i == 9 ) - aMenuShortCut = OUString( "1~0: " ); + aMenuShortCut = "1~0: "; else { menuShortCut[1] = (char)( '1' + i ); @@ -688,11 +686,11 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, Any a; aArgsList.realloc( NUM_OF_PICKLIST_ARGS ); - aArgsList[0].Name = OUString( "FileName" ); + aArgsList[0].Name = "FileName"; a <<= pMenuItemHandler->aMenuItemURL; aArgsList[0].Value = a; - aArgsList[1].Name = OUString( "Referer" ); + aArgsList[1].Name = "Referer"; a <<= OUString( "private:user" ); aArgsList[1].Value = a; @@ -706,7 +704,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, if ( nPos < ( aFilter.getLength() - 1 ) ) aFilterOptions = aFilter.copy( nPos+1 ); - aArgsList[2].Name = OUString( "FilterOptions" ); + aArgsList[2].Name = "FilterOptions"; a <<= aFilterOptions; aArgsList[2].Value = a; @@ -714,7 +712,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS ); } - aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = OUString( "FilterName" ); + aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName"; a <<= aFilter; aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a; } @@ -792,9 +790,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); if ( aItemCommand.isEmpty() ) { - const static OUString aSlotString( "slot:" ); - aItemCommand = aSlotString; - aItemCommand += OUString::number( pMenuItemHandler->nItemId ); + aItemCommand = "slot:" + OUString::number( pMenuItemHandler->nItemId ); pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand ); } @@ -893,7 +889,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { // bookmark menu item selected aArgs.realloc( 1 ); - aArgs[0].Name = OUString( "Referer" ); + aArgs[0].Name = "Referer"; aArgs[0].Value <<= OUString( "private:user" ); } @@ -942,9 +938,7 @@ sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sa _rItemCommand = _pMenu->GetItemCommand( nItemId ); if ( _rItemCommand.isEmpty() ) { - const static OUString aSlotString( "slot:" ); - _rItemCommand = aSlotString; - _rItemCommand += OUString::number( nItemId ); + _rItemCommand = "slot:" + OUString::number( nItemId ); _pMenu->SetItemCommand( nItemId, _rItemCommand ); } return nItemId; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index bebbd953a8b6..c0d5ff0c9ee2 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -467,7 +467,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() // Enable notification mechanism of ouer baseclass. // We need it to get information about changes outside these class on ouer used configuration keys! Sequence< OUString > aNotifySeq( 1 ); - aNotifySeq[0] = OUString( "AddonUI" ); + aNotifySeq[0] = "AddonUI"; EnableNotification( aNotifySeq ); } @@ -1056,7 +1056,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr // extend the node names to have full path strings for ( sal_uInt32 i = 0; i < (sal_uInt32)aSubMenuNodeNames.getLength(); i++ ) - aSubMenuNodeNames[i] = OUString( aMergeMenuBaseNode + aSubMenuNodeNames[i] ); + aSubMenuNodeNames[i] = aMergeMenuBaseNode + aSubMenuNodeNames[i]; return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu ); } @@ -1321,7 +1321,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen Sequence< Sequence< PropertyValue > > aSubMenuSeq; OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter ); for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ ) - aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] ); + aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n]; ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq ); aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= aSubMenuSeq; bResult = sal_True; @@ -1389,7 +1389,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< Sequence< PropertyValue > > aSubMenuSeq; OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter ); for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ ) - aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] ); + aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n]; ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq ); aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aSubMenuSeq; bResult = sal_True; @@ -1677,12 +1677,12 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin Sequence< OUString > lResult( PROPERTYCOUNT_MENUITEM ); // Create property names dependent from the root node name - lResult[OFFSET_MENUITEM_URL] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[OFFSET_MENUITEM_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] ); - lResult[OFFSET_MENUITEM_TARGET] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[OFFSET_MENUITEM_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_MENUITEM_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_MENUITEM_URL] = aPropertyRootNode + m_aPropNames[ INDEX_URL ] ; + lResult[OFFSET_MENUITEM_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ]; + lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ]; + lResult[OFFSET_MENUITEM_TARGET] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ]; + lResult[OFFSET_MENUITEM_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ]; + lResult[OFFSET_MENUITEM_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ]; return lResult; } @@ -1696,9 +1696,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri Sequence< OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 ); // Create property names dependent from the root node name - lResult[OFFSET_POPUPMENU_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[OFFSET_POPUPMENU_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_POPUPMENU_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_POPUPMENU_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ]; + lResult[OFFSET_POPUPMENU_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ]; + lResult[OFFSET_POPUPMENU_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ]; return lResult; } @@ -1711,13 +1711,13 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM ); // Create property names dependent from the root node name - lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] ); - lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] ); - lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); + lResult[0] = aPropertyRootNode + m_aPropNames[ INDEX_URL ]; + lResult[1] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ]; + lResult[2] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + lResult[3] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ]; + lResult[4] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ]; + lResult[5] = aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ]; + lResult[6] = aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ]; return lResult; } @@ -1746,14 +1746,14 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES ); // Create property names dependent from the root node name - lResult[0] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] ); - lResult[1] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] ); - lResult[2] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] ); - lResult[3] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] ); - lResult[4] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] ); - lResult[5] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] ); - lResult[6] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] ); - lResult[7] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] ); + lResult[0] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ]; + lResult[1] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ]; + lResult[2] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ]; + lResult[3] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ]; + lResult[4] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ]; + lResult[5] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ]; + lResult[6] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL]; + lResult[7] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ]; return lResult; } diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 36f0cf679187..6ccd422bfeeb 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -266,8 +266,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p if ( aCommandURL.isEmpty() ) { - aCommandURL = OUString( "slot:" ); - aCommandURL += OUString::number( nItemId ); + aCommandURL = "slot:" + OUString::number( nItemId ); } a <<= aCommandURL; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index ede067e2f05c..e52f4ed4c4b3 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -711,9 +711,9 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa ReadGuard aReadLock( m_aLock ); Sequence< PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = OUString( "Frame" ); + aPropSeq[0].Name = "Frame"; aPropSeq[0].Value <<= m_xFrame; - aPropSeq[1].Name = OUString( "Persistent" ); + aPropSeq[1].Name = "Persistent"; aPropSeq[1].Value <<= sal_True; try diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 97cfa764c72b..4ffab50fa625 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -996,9 +996,9 @@ void ToolbarLayoutManager::implts_createAddonsToolBars() OUString aElementType( "toolbar" ); uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = OUString( "Frame" ); + aPropSeq[0].Name = "Frame"; aPropSeq[0].Value <<= xFrame; - aPropSeq[1].Name = OUString( "ConfigurationData" ); + aPropSeq[1].Name = "ConfigurationData"; for ( sal_uInt32 i = 0; i < nCount; i++ ) { OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) ); @@ -1399,9 +1399,9 @@ uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( con ReadGuard aReadLock( m_aLock ); uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = OUString( "Frame" ); + aPropSeq[0].Name = "Frame"; aPropSeq[0].Value <<= m_xFrame; - aPropSeq[1].Name = OUString( "Persistent" ); + aPropSeq[1].Name = "Persistent"; aPropSeq[1].Value <<= true; uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager ); aReadLock.unlock(); @@ -1614,28 +1614,28 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen { uno::Sequence< beans::PropertyValue > aWindowState( 9 ); - aWindowState[0].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED ); + aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED; aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating )); - aWindowState[1].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE ); + aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE; aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible )); - aWindowState[2].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA ); + aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA; aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); awt::Point aPos = rElementData.m_aDockedData.m_aPos; - aWindowState[3].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS ); + aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS; aWindowState[3].Value <<= aPos; aPos = rElementData.m_aFloatingData.m_aPos; - aWindowState[4].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS ); + aWindowState[4].Name = WINDOWSTATE_PROPERTY_POS; aWindowState[4].Value <<= aPos; - aWindowState[5].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE ); + aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE; aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize; - aWindowState[6].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME ); + aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME; aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName ); - aWindowState[7].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED ); + aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED; aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked ); - aWindowState[8].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_STYLE ); + aWindowState[8].Name = WINDOWSTATE_PROPERTY_STYLE; aWindowState[8].Value = uno::makeAny( rElementData.m_nStyle ); OUString aName = rElementData.m_aName; diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 8e9014f07992..e81b25dd6e83 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -209,7 +209,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai if (bTopWindow) { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = OUString("window"); + aDescriptor.WindowServiceName = "window"; aDescriptor.ParentIndex = -1 ; aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = aPosSize ; @@ -222,7 +222,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = OUString("dockingwindow"); + aDescriptor.WindowServiceName = "dockingwindow"; aDescriptor.ParentIndex = 1 ; aDescriptor.Parent = xParentWindowPeer ; aDescriptor.Bounds = aPosSize ; diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 79c6aa732ca7..b75b7fd66451 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -241,10 +241,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider = css::configuration::theDefaultProvider::get( m_xContext ); - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS )); aArgs[0] = css::uno::makeAny( aPropValue ); - aPropValue.Name = OUString( "lazywrite" ); + aPropValue.Name = "lazywrite"; aPropValue.Value = css::uno::makeAny( sal_True ); aArgs[1] = css::uno::makeAny( aPropValue ); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 7b2d0fa39591..f67b5c459453 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1316,13 +1316,13 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() Sequence< Any > aPropSeq( 3 ); PropertyValue aPropValue; - aPropValue.Name = OUString( "UserConfigStorage" ); + aPropValue.Name = "UserConfigStorage"; aPropValue.Value = makeAny( m_xUserConfigStorage ); aPropSeq[0] = makeAny( aPropValue ); - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); - aPropValue.Name = OUString( "UserRootCommit" ); + aPropValue.Name = "UserRootCommit"; aPropValue.Value = makeAny( m_xUserRootCommit ); aPropSeq[2] = makeAny( aPropValue ); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 51b87846c2b0..d93cfe2c28b0 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -144,7 +144,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& { // Create configuration hierachical access name m_aConfigCategoryAccess += aModuleName; - m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ); + m_aConfigCategoryAccess += CONFIGURATION_CATEGORY_ELEMENT_ACCESS; m_xConfigProvider = theDefaultProvider::get( rxContext ); } @@ -341,7 +341,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() try { - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value <<= m_aConfigCategoryAccess; aArgs[0] <<= aPropValue; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index bbfc28288bd8..82dfc41fc3bf 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1028,10 +1028,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw Sequence< Any > aPropSeq( 2 ); PropertyValue aPropValue; - aPropValue.Name = OUString( "UserConfigStorage" ); + aPropValue.Name = "UserConfigStorage"; aPropValue.Value = makeAny( m_xDocConfigStorage ); aPropSeq[0] = makeAny( aPropValue ); - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index cad090bd4748..baca1f567f93 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -256,7 +256,7 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString { // Create configuration hierachical access name m_aConfigWindowAccess += aModuleName; - m_aConfigWindowAccess += OUString( CONFIGURATION_WINDOWSTATE_ACCESS ); + m_aConfigWindowAccess += CONFIGURATION_WINDOWSTATE_ACCESS; m_xConfigProvider = theDefaultProvider::get( rxContext ); // Initialize access array with property names. @@ -1261,10 +1261,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() try { - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value <<= m_aConfigWindowAccess; aArgs[0] <<= aPropValue; - aPropValue.Name = OUString( "lazywrite" ); + aPropValue.Name = "lazywrite"; aPropValue.Value <<= sal_True; aArgs[1] <<= aPropValue; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 24e002ee2841..f7299658b692 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -282,19 +282,19 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Sequence< Any > aArgs(5); PropertyValue aPropValue; - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= m_aModuleIdentifier; aArgs[0] <<= aPropValue; - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aArgs[1] <<= aPropValue; - aPropValue.Name = OUString( "ServiceManager" ); + aPropValue.Name = "ServiceManager"; aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW); aArgs[2] <<= aPropValue; - aPropValue.Name = OUString( "ParentWindow" ); + aPropValue.Name = "ParentWindow"; aPropValue.Value <<= xToolbarWindow; aArgs[3] <<= aPropValue; - aPropValue.Name = OUString( "ItemId" ); + aPropValue.Name = "ItemId"; aPropValue.Value = makeAny( sal_Int32( nId )); aArgs[4] <<= aPropValue; @@ -325,13 +325,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue { PropertyValue aPropValue; Sequence< Any > aArgs( 3 ); - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aArgs[0] <<= aPropValue; - aPropValue.Name = OUString( "CommandURL" ); + aPropValue.Name = "CommandURL"; aPropValue.Value <<= aURL; aArgs[1] <<= aPropValue; - aPropValue.Name = OUString( "ServiceManager" ); + aPropValue.Name = "ServiceManager"; aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW); aArgs[2] <<= aPropValue; try diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 0b8ffb186c7c..09a70da6b292 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -252,7 +252,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence<PropertyValue> aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index cf3d22834272..54bc4c2b088d 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -187,9 +187,9 @@ Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyM OUString aSelectedText = m_pComboBox->GetText(); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = OUString( "Text" ); + aArgs[1].Name = "Text"; aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -294,7 +294,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "List" ); + aInfo[0].Name = "List"; aInfo[0].Value <<= aList; addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 589bfd8a4107..1a987d984ee0 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -92,7 +92,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo Sequence<PropertyValue> aArgs( 1 ); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; return aArgs; } @@ -273,7 +273,7 @@ void ComplexToolbarController::addNotifyInfo( sal_Int32 nCount = rInfo.getLength(); uno::Sequence< beans::NamedValue > aInfoSeq( rInfo ); aInfoSeq.realloc( nCount+1 ); - aInfoSeq[nCount].Name = OUString( "Source" ); + aInfoSeq[nCount].Name = "Source"; aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() ); pNotifyInfo->aInfoSeq = aInfoSeq; @@ -343,7 +343,7 @@ void ComplexToolbarController::notifyTextChanged( const OUString& aText ) { // send text changed notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "Text" ); + aInfo[0].Name = "Text"; aInfo[0].Value <<= aText; addNotifyInfo( OUString( "TextChanged" ), getDispatchFromCommand( m_aCommandURL ), diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index fc9ff2f094b6..b87987b8d1eb 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -171,9 +171,9 @@ Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyM OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = OUString( "Text" ); + aArgs[1].Name = "Text"; aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -231,7 +231,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "List" ); + aInfo[0].Name = "List"; aInfo[0].Value <<= aList; addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index a0ead9aaaae0..d4bb63311f63 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -168,9 +168,9 @@ Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModif OUString aSelectedText = m_pEditControl->GetText(); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = OUString( "Text" ); + aArgs[1].Name = "Text"; aArgs[1].Value <<= aSelectedText; return aArgs; } diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index fd5186c42047..3881275f8a55 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -201,7 +201,7 @@ void FontMenuController::impl_setPopupMenu() com::sun::star::util::URL aTargetURL; // Register for font list updates to get the current font list from the controller - aTargetURL.Complete = OUString( ".uno:FontNameList" ); + aTargetURL.Complete = ".uno:FontNameList"; m_xURLTransformer->parseStrict( aTargetURL ); m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } @@ -213,7 +213,7 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XDispatch > xDispatch( m_xFontListDispatch ); com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = OUString( ".uno:FontNameList" ); + aTargetURL.Complete = ".uno:FontNameList"; m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index bbdab8158f80..72f5c7e73627 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -298,7 +298,7 @@ void FontSizeMenuController::impl_setPopupMenu() Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); com::sun::star::util::URL aTargetURL; // Register for font name updates which gives us info about the current font! - aTargetURL.Complete = OUString( ".uno:CharFontName" ); + aTargetURL.Complete = ".uno:CharFontName"; m_xURLTransformer->parseStrict( aTargetURL ); m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } @@ -311,7 +311,7 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star Reference< XDispatch > xDispatch( m_xCurrentFontDispatch ); com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = OUString( ".uno:CharFontName" ); + aTargetURL.Complete = ".uno:CharFontName"; m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 5b9af9d44c52..c8df613f4da0 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -162,7 +162,7 @@ throw ( RuntimeException ) Sequence<PropertyValue> aArgs( 1 ); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; aTargetURL.Complete = aCommandURL; @@ -228,7 +228,7 @@ throw ( RuntimeException ) if ( aStrValue.matchAsciiL( "($1)", 4 )) { OUString aTmp(FwkResId(STR_UPDATEDOC)); - aTmp += OUString( " " ); + aTmp += " "; aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 1eb35521b17f..cb37064d5612 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -95,8 +95,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra OUString aHeaderFooterIsOnStr( "HeaderIsOn" ); if ( m_bFooter ) { - aCmd = OUString( ".uno:InsertPageFooter" ); - aHeaderFooterIsOnStr = OUString( "FooterIsOn" ); + aCmd = ".uno:InsertPageFooter"; + aHeaderFooterIsOnStr = "FooterIsOn"; } const OUString aIsPhysicalStr( "IsPhysical" ); const OUString aDisplayNameStr( "DisplayName" ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 533d96f2d529..0abd71760c19 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -156,7 +156,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "URL" ); + aInfo[0].Name = "URL"; aInfo[0].Value <<= aURL; addNotifyInfo( OUString( "ImageChanged" ), getDispatchFromCommand( m_aCommandURL ), diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 3c38e1945467..be0a75d6e0dd 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -242,7 +242,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { const OUString & rStr( *it ); - if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&& + if (rStr != aLanguageTable.GetString( LANGUAGE_NONE ) && rStr != sAsterix && rStr != sEmpty) { @@ -324,10 +324,10 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any > if ( m_bInitialized ) { - m_aLangStatusCommandURL = OUString( ".uno:LanguageStatus" ); + m_aLangStatusCommandURL = ".uno:LanguageStatus"; m_aMenuCommandURL_Lang = m_aLangStatusCommandURL; - m_aMenuCommandURL_Font = OUString( ".uno:FontDialog" ); - m_aMenuCommandURL_CharDlgForParagraph = OUString( ".uno:FontDialogForParagraph" ); + m_aMenuCommandURL_Font = ".uno:FontDialog"; + m_aMenuCommandURL_CharDlgForParagraph = ".uno:FontDialogForParagraph"; } } } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index a344d3b3b6c2..866ea133a4bf 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -499,7 +499,7 @@ throw ( RuntimeException ) if ( aItemText.matchAsciiL( "($1)", 4 )) { OUString aTmp(FWK_RESSTR(STR_UPDATEDOC)); - aTmp += OUString( " " ); + aTmp += " "; aTmp += aItemText.copy( 4 ); aItemText = aTmp; } @@ -899,8 +899,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); if ( aItemCommand.isEmpty() ) { - aItemCommand = OUString( "slot:" ); - aItemCommand += OUString::number( pMenuItemHandler->nItemId ); + aItemCommand = "slot:" + OUString::number( pMenuItemHandler->nItemId ); pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand ); } @@ -1072,7 +1071,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { // bookmark menu item selected aArgs.realloc( 1 ); - aArgs[0].Name = OUString( "Referer" ); + aArgs[0].Name = "Referer"; aArgs[0].Value <<= OUString( "private:user" ); } @@ -1158,10 +1157,10 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= m_aModuleIdentifier; aSeq[0] <<= aPropValue; - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; @@ -1333,9 +1332,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); // Set item command for popup menu to enable it for GetImageFromURL - const OUString aSlotString( "slot:" ); - OUString aNewItemCommand( aSlotString ); - aNewItemCommand += OUString::number( ITEMID_ADDONLIST ); + OUString aNewItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST ); pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand ); } else @@ -1950,9 +1947,7 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu _rItemCommand = _pMenu->GetItemCommand( nItemId ); if ( _rItemCommand.isEmpty() ) { - const static OUString aSlotString( "slot:" ); - _rItemCommand = aSlotString; - _rItemCommand += OUString::number( nItemId ); + _rItemCommand = "slot:" + OUString::number( nItemId ); _pMenu->SetItemCommand( nItemId, _rItemCommand ); } return nItemId; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 7028a8098fb7..63c4976c4b0d 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -417,7 +417,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent xURLTransformer->parseStrict( aTargetURL ); - aArgsList[0].Name = OUString( "Referer" ); + aArgsList[0].Name = "Referer"; aArgsList[0].Value = makeAny( OUString( "private:user" )); OUString aTargetFrame( m_aTargetFrame ); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 39c0cef03baf..26480d1d7768 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -229,9 +229,9 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key OUString aSpinfieldText = m_pSpinfieldControl->GetText(); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = OUString( "Value" ); + aArgs[1].Name = "Value"; if ( m_bFloat ) aArgs[1].Value <<= aSpinfieldText.toDouble(); else diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index da44a22d4e8c..587c85d0eca2 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -336,29 +336,29 @@ void StatusBarManager::CreateControllers() aPropValue.Value <<= aCommandURL; aPropVector.push_back( uno::makeAny( aPropValue ) ); - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= m_aModuleIdentifier; aPropVector.push_back( uno::makeAny( aPropValue ) ); - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aPropVector.push_back( uno::makeAny( aPropValue ) ); // TODO remove this - aPropValue.Name = OUString( "ServiceManager" ); + aPropValue.Name = "ServiceManager"; aPropValue.Value = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) ); aPropVector.push_back( uno::makeAny( aPropValue ) ); - aPropValue.Name = OUString( "ParentWindow" ); + aPropValue.Name = "ParentWindow"; aPropValue.Value <<= xStatusbarWindow; aPropVector.push_back( uno::makeAny( aPropValue ) ); // TODO still needing with the css::ui::XStatusbarItem? - aPropValue.Name = OUString( "Identifier" ); + aPropValue.Name = "Identifier"; aPropValue.Value <<= nId; aPropVector.push_back( uno::makeAny( aPropValue ) ); - aPropValue.Name = OUString( "StatusbarItem" ); + aPropValue.Name = "StatusbarItem"; aPropValue.Value <<= xStatusbarItem; aPropVector.push_back( uno::makeAny( aPropValue ) ); diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index dde27445fa09..b015338148d2 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -93,9 +93,9 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 Sequence<PropertyValue> aArgs( 2 ); // Add key modifier to argument list - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = OUString( "Text" ); + aArgs[1].Name = "Text"; aArgs[1].Value <<= m_aCurrentSelection; return aArgs; } @@ -157,7 +157,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "List" ); + aInfo[0].Name = "List"; aInfo[0].Value <<= aList; addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), @@ -184,7 +184,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = OUString( "ItemChecked" ); + aInfo[0].Name = "ItemChecked"; aInfo[0].Value <<= nPos; addNotifyInfo( OUString( "Pos" ), getDispatchFromCommand( m_aCommandURL ), diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 4cff1966bdce..3a2617b6dd64 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -892,17 +892,17 @@ void ToolBarManager::CreateControllers() PropertyValue aPropValue; std::vector< Any > aPropertyVector; - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "ServiceManager" ); + aPropValue.Name = "ServiceManager"; Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW); aPropValue.Value <<= xMSF; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "ParentWindow" ); + aPropValue.Name = "ParentWindow"; aPropValue.Value <<= xToolbarWindow; aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = "Identifier"; @@ -911,7 +911,7 @@ void ToolBarManager::CreateControllers() if ( nWidth > 0 ) { - aPropValue.Name = OUString( "Width" ); + aPropValue.Name = "Width"; aPropValue.Value <<= nWidth; aPropertyVector.push_back( makeAny( aPropValue )); } @@ -1005,20 +1005,20 @@ void ToolBarManager::CreateControllers() PropertyValue aPropValue; std::vector< Any > aPropertyVector; - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= m_xFrame; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "CommandURL" ); + aPropValue.Name = "CommandURL"; aPropValue.Value <<= aCommandURL; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "ServiceManager" ); + aPropValue.Name = "ServiceManager"; Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW); aPropValue.Value <<= xMSF; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "ParentWindow" ); + aPropValue.Name = "ParentWindow"; aPropValue.Value <<= xToolbarWindow; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = OUString( "ModuleIdentifier" ); + aPropValue.Name = "ModuleIdentifier"; aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = "Identifier"; @@ -1027,7 +1027,7 @@ void ToolBarManager::CreateControllers() if ( nWidth > 0 ) { - aPropValue.Name = OUString( "Width" ); + aPropValue.Name = "Width"; aPropValue.Value <<= nWidth; aPropertyVector.push_back( makeAny( aPropValue )); } @@ -1297,9 +1297,9 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine OUString sShortCut; if( RetrieveShortcut( aCommandURL, sShortCut ) ) { - sQuickHelp += OUString( " (" ); + sQuickHelp += " ("; sQuickHelp += sShortCut; - sQuickHelp += OUString( ")" ); + sQuickHelp += ")"; } m_pToolBar->SetQuickHelpText( nId, sQuickHelp ); @@ -1680,7 +1680,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); - aURL.Complete = OUString( ".uno:ConfigureDialog" ); + aURL.Complete = ".uno:ConfigureDialog"; m_xURLTransformer->parseStrict( aURL ); if ( xProv.is() ) xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); @@ -1840,7 +1840,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); - aURL.Complete = OUString( ".uno:ConfigureDialog" ); + aURL.Complete = ".uno:ConfigureDialog"; m_xURLTransformer->parseStrict( aURL ); if ( xProv.is() ) xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index d930bc58cfd6..fb39ab5f4200 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -206,12 +206,12 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aM { // Create configuration hierachical access name m_aConfigCmdAccess += aModuleName; - m_aConfigCmdAccess += OUString( CONFIGURATION_CMD_ELEMENT_ACCESS ); + m_aConfigCmdAccess += CONFIGURATION_CMD_ELEMENT_ACCESS; m_xConfigProvider = theDefaultProvider::get( rxContext ); m_aConfigPopupAccess += aModuleName; - m_aConfigPopupAccess += OUString( CONFIGURATION_POP_ELEMENT_ACCESS ); + m_aConfigPopupAccess += CONFIGURATION_POP_ELEMENT_ACCESS; } ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() @@ -524,7 +524,7 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() try { - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value <<= m_aConfigCmdAccess; aArgs[0] <<= aPropValue; diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 990f32d06d62..1a7822b58364 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -175,13 +175,13 @@ throw ( ::com::sun::star::container::NoSuchElementException, { PropertyValue aPropValue; Sequence< Any > aPropSeq( 3 ); - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= xFrame; aPropSeq[0] <<= aPropValue; - aPropValue.Name = OUString( "ConfigurationData" ); + aPropValue.Name = "ConfigurationData"; aPropValue.Value <<= aConfigData; aPropSeq[1] <<= aPropValue; - aPropValue.Name = OUString( "ResourceURL" ); + aPropValue.Name = "ResourceURL"; aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 4dddf510e7c5..dd61fa55ef7b 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -211,7 +211,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index be4ec8943223..cbda3ce4d6fc 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -159,16 +159,16 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL PropertyValue aPropValue; Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4); - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value <<= xFrame; aPropSeq[0] <<= aPropValue; - aPropValue.Name = OUString( "ConfigurationSource" ); + aPropValue.Name = "ConfigurationSource"; aPropValue.Value <<= xCfgMgr; aPropSeq[1] <<= aPropValue; - aPropValue.Name = OUString( "ResourceURL" ); + aPropValue.Name = "ResourceURL"; aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - aPropValue.Name = OUString( "Persistent" ); + aPropValue.Name = "Persistent"; aPropValue.Value <<= bPersistent; aPropSeq[3] <<= aPropValue; if ( _pExtraMode ) diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 0eedfa73f40d..2303bebf89e4 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -120,7 +120,7 @@ throw (Exception, RuntimeException) // Append the command URL to the Arguments sequence so that one controller can be // used for more than one command URL. - aPropValue.Name = OUString( "CommandURL" ); + aPropValue.Name = "CommandURL"; aPropValue.Value <<= ServiceSpecifier; aNewArgs[nAppendIndex] <<= aPropValue; diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 1c203db3bcaf..d1dd274e3501 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -282,7 +282,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - aPropValue.Name = OUString( "nodepath" ); + aPropValue.Name = "nodepath"; aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 56b105c638b9..7e99614d2f49 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -792,8 +792,8 @@ void TestBreakIterator::testAsian() void TestBreakIterator::testLao() { lang::Locale aLocale; - aLocale.Language = OUString("lo"); - aLocale.Country = OUString("LA"); + aLocale.Language = "lo"; + aLocale.Country = "LA"; //ຍິນດີຕ້ອນຮັບ const sal_Unicode LAO[] = { 0x0e8d, 0x0eb4, 0x0e99, 0x0e94, 0x0eb5, 0x0e95, 0x0ec9, 0x0ead, 0x0e99, 0x0eae, 0x0eb1, 0x0e9a }; OUString aTest(LAO, SAL_N_ELEMENTS(LAO)); diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index aa91a2aeb0b4..5bbf84dcc8a6 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -177,12 +177,11 @@ int SAL_CALL main( int argc, char * argv[] ) xMgr->createInstance("com.sun.star.registry.ImplementationRegistration"), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); - OUString aLibName = - OUString( "connector.uno" SAL_DLLEXTENSION ); + OUString aLibName = "connector.uno" SAL_DLLEXTENSION; xImplReg->registerImplementation( OUString("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); - aLibName = OUString( "acceptor.uno" SAL_DLLEXTENSION ); + aLibName = "acceptor.uno" SAL_DLLEXTENSION; xImplReg->registerImplementation( OUString("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index d9160ff253bc..3d595858080a 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -66,8 +66,8 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() { OSL_TRACE("OResultSet::getSupportedServiceNames"); Sequence< OUString > aSupported(2); - aSupported[0] = OUString( "com.sun.star.sdbc.ResultSet" ); - aSupported[1] = OUString( "com.sun.star.sdbcx.ResultSet" ); + aSupported[0] = "com.sun.star.sdbc.ResultSet"; + aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return (aSupported); } /* }}} */ diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx index c9bd218046ba..7ad15d7bbf13 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx @@ -66,7 +66,7 @@ static void ShowMessageBox( const Reference< XToolkit >& rToolkit, const Referen // describe window properties. WindowDescriptor aDescriptor; aDescriptor.Type = WindowClass_MODALTOP; - aDescriptor.WindowServiceName = OUString( "infobox" ); + aDescriptor.WindowServiceName = "infobox"; aDescriptor.ParentIndex = -1; aDescriptor.Parent = Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ); aDescriptor.Bounds = Rectangle(0,0,300,200); diff --git a/odk/examples/cpp/custompanel/ctp_factory.cxx b/odk/examples/cpp/custompanel/ctp_factory.cxx index e2829029f168..2915c85737ee 100644 --- a/odk/examples/cpp/custompanel/ctp_factory.cxx +++ b/odk/examples/cpp/custompanel/ctp_factory.cxx @@ -123,7 +123,7 @@ namespace sd { namespace colortoolpanel Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) { Sequence< OUString > aServiceNames(1); - aServiceNames[0] = OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); + aServiceNames[0] = "org.openoffice.example.colorpanel.ToolPanelFactory"; return aServiceNames; } diff --git a/odk/examples/cpp/custompanel/ctp_panel.cxx b/odk/examples/cpp/custompanel/ctp_panel.cxx index 6848f3557359..c84c13c77a09 100644 --- a/odk/examples/cpp/custompanel/ctp_panel.cxx +++ b/odk/examples/cpp/custompanel/ctp_panel.cxx @@ -84,7 +84,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = OUString( "window" ); + aWindow.WindowServiceName = "window"; aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 036849b4878d..9f7f0630ecfe 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -126,9 +126,9 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent, const OUString sNotesSlide( "notesSlide" ); const OUString aSlideType( sHref.copy( 0, nIndex2 ) ); if ( aSlideType.match( sSlide ) ) - sURL = OUString( "#Slide " ).concat( OUString::number( nPageNumber ) ); + sURL = "#Slide " + OUString::number( nPageNumber ); else if ( aSlideType.match( sNotesSlide ) ) - sURL = OUString( "#Notes " ).concat( OUString::number( nPageNumber ) ); + sURL = "#Notes " + OUString::number( nPageNumber ); // else: todo for other types such as notesMaster or slideMaster as they can't be referenced easily } } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0638cac4fe3c..54db7bb73fb8 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -665,7 +665,7 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase ) if ( !xSetInfo.is() ) return; - const OUString& aGrabBagPropName = OUString( UNO_NAME_MISC_OBJ_INTEROPGRABBAG ); + const OUString aGrabBagPropName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; if( !xSetInfo->hasPropertyByName( aGrabBagPropName ) ) return; @@ -727,27 +727,27 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) static_cast < sal_Int32 > ( ( fPixelsPer100thmm * aActualSize.Height ) + 0.5 ) ); Sequence< PropertyValue > aFilterData( 7 ); - aFilterData[ 0 ].Name = OUString( "Compression" ); + aFilterData[ 0 ].Name = "Compression"; aFilterData[ 0 ].Value <<= static_cast < sal_Int32 > ( 9 ); - aFilterData[ 1 ].Name = OUString( "Interlaced" ); + aFilterData[ 1 ].Name = "Interlaced"; aFilterData[ 1 ].Value <<= static_cast < sal_Int32 > ( 1 ); - aFilterData[ 2 ].Name = OUString( "Translucent" ); + aFilterData[ 2 ].Name = "Translucent"; aFilterData[ 2 ].Value <<= static_cast < sal_Int32 > ( 1 ); - aFilterData[ 3 ].Name = OUString( "PixelWidth" ); + aFilterData[ 3 ].Name = "PixelWidth"; aFilterData[ 3 ].Value <<= aSize.Width; - aFilterData[ 4 ].Name = OUString( "PixelHeight" ); + aFilterData[ 4 ].Name = "PixelHeight"; aFilterData[ 4 ].Value <<= aSize.Height; - aFilterData[ 5 ].Name = OUString( "LogicalWidth" ); + aFilterData[ 5 ].Name = "LogicalWidth"; aFilterData[ 5 ].Value <<= aActualSize.Width; - aFilterData[ 6 ].Name = OUString( "LogicalHeight" ); + aFilterData[ 6 ].Name = "LogicalHeight"; aFilterData[ 6 ].Value <<= aActualSize.Height; Sequence < PropertyValue > aDescriptor( 3 ); - aDescriptor[ 0 ].Name = OUString( "OutputStream" ); + aDescriptor[ 0 ].Name = "OutputStream"; aDescriptor[ 0 ].Value <<= xOutputStream; - aDescriptor[ 1 ].Name = OUString( "FilterName" ); + aDescriptor[ 1 ].Name = "FilterName"; aDescriptor[ 1 ].Value <<= sFormat; - aDescriptor[ 2 ].Name = OUString( "FilterData" ); + aDescriptor[ 2 ].Name = "FilterData"; aDescriptor[ 2 ].Value <<= aFilterData; Reference < lang::XComponent > xSourceDoc( mxShape, UNO_QUERY_THROW ); diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 76fbd6ff0f44..9a787822d851 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -492,7 +492,7 @@ void OStorage_Impl::OpenOwnPackage() { // let the package support OFOPXML media type handling beans::NamedValue aNamedValue; - aNamedValue.Name = OUString( "StorageFormat" ); + aNamedValue.Name = "StorageFormat"; aNamedValue.Value <<= OUString( "OFOPXMLFormat" ); aArguments.realloc( ++nArgNum ); aArguments[nArgNum-1] <<= aNamedValue; diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 0bfcd04f8545..36329fe71a33 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -861,7 +861,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const xNumericControl->setDecimalDigits( 2 ); xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH ); uno::Reference< drawing::XShapeDescriptor> xShapeDesc(m_xReportComponent,uno::UNO_QUERY); - bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString("com.sun.star.drawing.CustomShape"); + bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != "com.sun.star.drawing.CustomShape"; if ( bSetMin ) xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0)); if ( nDisplayUnit != -1 ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 9820d40153b5..1bdf015e4ef6 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3248,13 +3248,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); if ( bDate ) { - sFunction = OUString ("TODAY()"); + sFunction = "TODAY()"; createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); if ( bTime ) { - sFunction = OUString ("TIMEVALUE(NOW())"); + sFunction = "TIMEVALUE(NOW())"; aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0)); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx index 151b03a33cb1..a7eee9a9bfc0 100644 --- a/sal/test/testbootstrap.cxx +++ b/sal/test/testbootstrap.cxx @@ -105,12 +105,12 @@ int main( int argc, char *argv[] ) fprintf(stderr, "bootstrap parameter couldn't be found\n"); // test the default case - name = OUString( "no_one_has_set_this_name" ); + name = "no_one_has_set_this_name"; OSL_ASSERT( ! bootstrap.getFrom( name, value ) ); result = result && !bootstrap.getFrom( name, value ); - myDefault = OUString( "1" ); - OUString myDefault2 = OUString( "2" ); + myDefault = "1"; + OUString myDefault2 = "2"; bootstrap.getFrom( name, value, myDefault ); OSL_ASSERT( value == myDefault ); diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 34338731aa41..12e4674863c1 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -1081,13 +1081,13 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL if( ! m_bDocStarted ) { SAXException except; - except.Message = OUString( "startElement called before startDocument" ); + except.Message = "startElement called before startDocument"; throw except; } if( m_bIsCDATA ) { SAXException except; - except.Message = OUString( "startElement call not allowed with CDATA sections" ); + except.Message = "startElement call not allowed with CDATA sections"; throw except; } @@ -1133,13 +1133,13 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL if (eRet == SAX_WARNING) { SAXInvalidCharacterException except; - except.Message = OUString( "Invalid character during XML-Export in a attribute value" ); + except.Message = "Invalid character during XML-Export in a attribute value"; throw except; } else if (eRet == SAX_ERROR) { SAXException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } @@ -1183,7 +1183,7 @@ void SAXWriter::endElement(const OUString& aName) throw (SAXException, Runtime if (!bRet) { SAXException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } @@ -1193,7 +1193,7 @@ void SAXWriter::characters(const OUString& aChars) throw(SAXException, RuntimeE if( ! m_bDocStarted ) { SAXException except; - except.Message = OUString( "characters method called before startDocument" ); + except.Message = "characters method called before startDocument"; throw except; } @@ -1235,7 +1235,7 @@ void SAXWriter::characters(const OUString& aChars) throw(SAXException, RuntimeE if (bThrowException) { SAXInvalidCharacterException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } @@ -1280,7 +1280,7 @@ void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& a if (!mp_SaxWriterHelper->processingInstruction(aTarget, aData)) { SAXException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } @@ -1314,7 +1314,7 @@ void SAXWriter::endCDATA(void) throw (RuntimeException) if( ! m_bDocStarted || ! m_bIsCDATA) { SAXException except; - except.Message = OUString( "endCDATA was called without startCDATA" ); + except.Message = "endCDATA was called without startCDATA"; throw except; } @@ -1352,7 +1352,7 @@ void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeExc if (!mp_SaxWriterHelper->comment(sComment)) { SAXException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } @@ -1393,7 +1393,7 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc if (!mp_SaxWriterHelper->writeString( sString, sal_False, sal_False)) { SAXException except; - except.Message = OUString( "Invalid character during XML-Export" ); + except.Message = "Invalid character during XML-Export"; throw except; } } diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index 815e7fccee02..fff579fc4e0c 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -454,7 +454,7 @@ void OSaxParserTest::testSimple( const Reference < XParser > &rParser ) Reference< XInputStream > rInStream; OUString sInput; rInStream = createStreamFromSequence( seqBytes , m_rFactory ); - sInput = OUString( OUString( "internal") ); + sInput = "internal"; if( rParser.is() ) { InputSource source; @@ -519,7 +519,7 @@ void OSaxParserTest::testNamespaces( const Reference < XParser > &rParser ) OUString sInput; rInStream = createStreamFromSequence( seqBytes , m_rFactory ); - sInput = OUString( "internal" ); + sInput = "internal"; if( rParser.is() ) { InputSource source; @@ -572,7 +572,7 @@ void OSaxParserTest::testEncoding( const Reference < XParser > &rParser ) OUString sInput; rInStream = createStreamFromSequence( seqBytes , m_rFactory ); - sInput = OUString( "internal" ); + sInput = "internal"; if( rParser.is() ) { InputSource source; @@ -606,7 +606,7 @@ void OSaxParserTest::testFile( const Reference < XParser > & rParser ) { Reference< XInputStream > rInStream = createStreamFromFile( "testsax.xml" , m_rFactory ); - OUString sInput = OUString( "testsax.xml" ); + OUString sInput = "testsax.xml"; if( rParser.is() && rInStream.is() ) { InputSource source; @@ -664,7 +664,7 @@ void OSaxParserTest::testPerformance( const Reference < XParser > & rParser ) { Reference < XInputStream > rInStream = createStreamFromFile( "testPerformance.xml" , m_rFactory ); - OUString sInput = OUString( "testperformance.xml" ); + OUString sInput = "testperformance.xml"; if( rParser.is() && rInStream.is() ) { InputSource source; diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index f8ef724e063d..0413af256c85 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -89,7 +89,7 @@ int main (int argc, char **argv) #ifdef SAL_W32 OUString aDllName = OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US ); #else - OUString aDllName = OUString( "lib"); + OUString aDllName = "lib"; aDllName += OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US ); aDllName += ".so"; #endif @@ -117,7 +117,7 @@ int main (int argc, char **argv) #ifdef SAL_W32 OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); #else - OUString aDllName = OUString( "lib"); + OUString aDllName = "lib"; aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); aDllName += ".so"; #endif diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 99d1c8eb6f44..05c43c3da09f 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -92,7 +92,7 @@ bool SplitString( const OUString &sWhole, i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem(); // Get prefix element - OUString sEmpty, sUser = OUString( "-" ); + OUString sEmpty, sUser = "-"; ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken( KParseType::IDENTNAME, sWhole, 0, KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser ); @@ -928,7 +928,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) // wenn sortiert, ist "leer" eine eigene Gruppe // sonst sind leere Zellen unten erlaubt bChanged = ( ( !aString.isEmpty() || rParam.bDoSort ) && - aString != OUString(*pCompString[i]) ); + aString != *pCompString[i] ); } if ( bChanged && bTestPrevSub ) { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 74abab2b14db..92612eed480c 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -273,7 +273,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames() // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) - pNames[SCLAYOUTOPT_MEASURE] = OUString( "Other/MeasureUnit/Metric" ); + pNames[SCLAYOUTOPT_MEASURE] = "Other/MeasureUnit/Metric"; return aNames; } diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 2f8c9f751cd1..26bf5a8c7715 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -434,7 +434,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd aChangeRanges.Append( aRange ); uno::Sequence< beans::PropertyValue > aProperties( 1 ); - aProperties[ 0 ].Name = OUString( "Name" ); + aProperties[ 0 ].Name = "Name"; aProperties[ 0 ].Value <<= aChartName; pModelObj->NotifyChanges( OUString( "insert-chart" ), aChangeRanges, aProperties ); diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 190e4688c62a..ca3bbd93b8ac 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -196,7 +196,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames() // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) - pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString( "TabStop/Metric" ); + pNames[SCDOCLAYOUTOPT_TABSTOP] = "TabStop/Metric"; return aNames; } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index e4dc903acfd5..5d3877ebbfbc 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -340,10 +340,10 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames() // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) { - pNames[SCGRIDOPT_RESOLU_X] = OUString( "Resolution/XAxis/Metric" ); - pNames[SCGRIDOPT_RESOLU_Y] = OUString( "Resolution/YAxis/Metric" ); - pNames[SCGRIDOPT_OPTION_X] = OUString( "Option/XAxis/Metric" ); - pNames[SCGRIDOPT_OPTION_Y] = OUString( "Option/YAxis/Metric" ); + pNames[SCGRIDOPT_RESOLU_X] = "Resolution/XAxis/Metric"; + pNames[SCGRIDOPT_RESOLU_Y] = "Resolution/YAxis/Metric"; + pNames[SCGRIDOPT_OPTION_X] = "Option/XAxis/Metric"; + pNames[SCGRIDOPT_OPTION_Y] = "Option/YAxis/Metric"; } return aNames; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index d22ae6652a91..a739409f5136 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1526,7 +1526,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = OUString( "TextRotateAngle" ); + aTextRotateAngle.Name = "TextRotateAngle"; aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 7a29bd4a2e89..2a9fceafe010 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -298,7 +298,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - OUString aContentType = OUString( "text/html; charset=" ); + OUString aContentType = "text/html; charset="; aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; @@ -2949,7 +2949,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - OUString aContentType = OUString( "text/html; charset=" ); + OUString aContentType = "text/html; charset="; aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 551b21e8c95e..8fec336fde17 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -157,7 +157,7 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = OUString( "Default" ); + sCellStyleName = "Default"; GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 62552c29fa4b..7ad70b24d60d 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,7 +311,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ScalingFactor" ); + aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); @@ -351,7 +351,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ScalingFactor" ); + aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index b7b7621b30f4..c0295e4bfc5e 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2894,16 +2894,16 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName genModuleName = sModuleName; else { - genModuleName = OUString( "Sheet1" ); + genModuleName = "Sheet1"; nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = OUString( "Sheet") + OUString::number( ++nNum ); + genModuleName = "Sheet" + OUString::number( ++nNum ); uno::Any aSourceAny; OUString sTmpSource = sSource; if ( sTmpSource.isEmpty() ) - sTmpSource = OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); + sTmpSource = "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n"; aSourceAny <<= sTmpSource; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() ) diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 2df6c366875b..c0d66c7fade2 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -140,9 +140,9 @@ namespace } uno::Sequence<beans::PropertyValue> aProps(2); - aProps[0].Name = OUString(SC_DBPROP_EXTENSION); + aProps[0].Name = SC_DBPROP_EXTENSION; aProps[0].Value <<= OUString( aExtension ); - aProps[1].Name = OUString(SC_DBPROP_CHARSET); + aProps[1].Name = SC_DBPROP_CHARSET; aProps[1].Value <<= aCharSetStr; _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps ); @@ -175,7 +175,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - OUString aTransferName = OUString( "transfer" ); + OUString aTransferName = "transfer"; if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 6578da838f05..468d48709da5 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -196,8 +196,8 @@ namespace calc Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = OUString( "com.sun.star.table.CellRangeListSource" ); - aServices[ 1 ] = OUString( "com.sun.star.form.binding.ListEntrySource" ); + aServices[ 0 ] = "com.sun.star.table.CellRangeListSource"; + aServices[ 1 ] = "com.sun.star.form.binding.ListEntrySource"; return aServices; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 0a2ff0debffc..3aeb54715f7d 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -458,7 +458,7 @@ namespace calc { OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += OUString( ") is not supported by this binding." ); + sMessage += ") is not supported by this binding."; // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); @@ -495,10 +495,10 @@ namespace calc DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = OUString( "com.sun.star.table.CellValueBinding" ); - aServices[ 1 ] = OUString( "com.sun.star.form.binding.ValueBinding" ); + aServices[ 0 ] = "com.sun.star.table.CellValueBinding"; + aServices[ 1 ] = "com.sun.star.form.binding.ValueBinding"; if ( m_bListPos ) - aServices[ 2 ] = OUString( "com.sun.star.table.ListPositionCellBinding" ); + aServices[ 2 ] = "com.sun.star.table.ListPositionCellBinding"; return aServices; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 1a3afd167d36..88ac86500c06 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2477,9 +2477,9 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // BM: don't use names of named ranges but the UI range strings // String aStr; // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); -// m_aIdentifier = OUString( aStr ); +// m_aIdentifier = aStr; -// m_aIdentifier = OUString( "ID_"); +// m_aIdentifier = "ID_"; // static sal_Int32 nID = 0; // m_aIdentifier += OUString::valueOf( ++nID); } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 9019cf048377..f477cf91e008 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -374,7 +374,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - OUString aPrefix = OUString( "private:factory/" ); + OUString aPrefix = "private:factory/"; if( aURL.startsWith( aPrefix ) ) { OUString aPattern = aPrefix + "scalc"; diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 898f2a3d4a53..2b71b12f1be5 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1544,12 +1544,12 @@ uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) thro aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.Shape" ); + aSupported[ aSupported.getLength() - 1 ] = "com.sun.star.sheet.Shape"; if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.CellAnnotationShape" ); + aSupported[ aSupported.getLength() - 1 ] = "com.sun.star.sheet.CellAnnotationShape"; } return aSupported; diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 378177ae2e8d..a2cc0d72cbb7 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -38,7 +38,7 @@ OUString SAL_CALL ScDocument_getImplementationName() throw() uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { uno::Sequence< OUString > aSeq( 1 ); - aSeq[0] = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + aSeq[0] = "com.sun.star.sheet.SpreadsheetDocument"; return aSeq; } diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 3c3d44859750..903949a58263 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -238,7 +238,7 @@ ScVbaName::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Name" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Name"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index f0b801e31c4a..a73551223613 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -666,7 +666,7 @@ ScVbaPageSetup::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.PageSetup" ); + aServiceNames[ 0 ] = "ooo.vba.excel.PageSetup"; } return aServiceNames; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 443c6e1556f6..1b9f6e8b8b4f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -5630,7 +5630,7 @@ ScVbaRange::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Range" ); + aServiceNames[ 0 ] = "ooo.vba.excel.Range"; } return aServiceNames; } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 91584fd1f50c..7217b9a3a2fc 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -668,7 +668,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, sal_Bo //TODO/LATER: what about "bLink"? uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = OUString( "URL" ); + aMedium[0].Name = "URL"; aMedium[0].Value <<= OUString( aStrURL ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index fc482c45f55e..89d7df8a1e3e 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -93,10 +93,10 @@ namespace basprov if ( !pNames ) { static Sequence< OUString > aNames(4); - aNames.getArray()[0] = OUString( "com.sun.star.script.provider.ScriptProviderForBasic" ); - aNames.getArray()[1] = OUString( "com.sun.star.script.provider.LanguageScriptProvider" ); - aNames.getArray()[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); - aNames.getArray()[3] = OUString( "com.sun.star.script.browse.BrowseNode" ); + aNames.getArray()[0] = "com.sun.star.script.provider.ScriptProviderForBasic"; + aNames.getArray()[1] = "com.sun.star.script.provider.LanguageScriptProvider"; + aNames.getArray()[2] = "com.sun.star.script.provider.ScriptProvider"; + aNames.getArray()[3] = "com.sun.star.script.browse.BrowseNode"; pNames = &aNames; } } diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 391a97baa896..a613d9787f7d 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -230,7 +230,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( { aException = ::cppu::getCaughtException(); - OUString reason = OUString( "ScriptProtocolHandler::dispatch: caught " ); + OUString reason = "ScriptProtocolHandler::dispatch: caught "; invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index f93aca5e3387..e5c540b35bf1 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -820,9 +820,9 @@ throw( RuntimeException ) { OUString names[3]; - names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = "com.sun.star.script.provider.MasterScriptProvider"; + names[1] = "com.sun.star.script.browse.BrowseNode"; + names[2] = "com.sun.star.script.provider.ScriptProvider"; return Sequence< OUString >( names, 3 ); } @@ -852,9 +852,9 @@ Sequence< OUString > sp_getSupportedServiceNames( ) { OUString names[3]; - names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = "com.sun.star.script.provider.MasterScriptProvider"; + names[1] = "com.sun.star.script.browse.BrowseNode"; + names[2] = "com.sun.star.script.provider.ScriptProvider"; return Sequence< OUString >( names, 3 ); } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 0763901957c3..4d5a7a54a9a3 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -101,7 +101,7 @@ throw ( uno::Exception, uno::RuntimeException ) uno::Reference< uno::XInterface >() ); } - SCRIPTS_PART = OUString("/Scripts/"); + SCRIPTS_PART = "/Scripts/"; SCRIPTS_PART = SCRIPTS_PART.concat( m_sLanguage.toAsciiLowerCase() ); if ( !initBaseURI() ) @@ -120,31 +120,30 @@ ScriptingFrameworkURIHelper::initBaseURI() if ( m_sLocation.equalsAscii(USER)) { - test = OUString(USER); - uri = OUString(USER_URI); + test = USER; + uri = USER_URI; bAppendScriptsPart = true; } else if ( m_sLocation.equalsAscii(USER_UNO_PACKAGES)) { - test = OUString("uno_packages"); - uri = OUString(USER_URI); - uri = uri.concat(OUString(USER_UNO_PACKAGES_DIR)); + test = "uno_packages"; + uri = OUString( USER_URI ) + USER_UNO_PACKAGES_DIR; } else if (m_sLocation.equalsAscii(SHARE)) { - test = OUString(SHARE); - uri = OUString(SHARE_URI); + test = SHARE; + uri = SHARE_URI; bAppendScriptsPart = true; } else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES)) { - test = OUString("uno_packages"); - uri = OUString(SHARE_UNO_PACKAGES_URI); + test = "uno_packages"; + uri = SHARE_UNO_PACKAGES_URI; } else if (m_sLocation.startsWith(TDOC_SCHEME)) { m_sBaseURI = m_sLocation.concat( SCRIPTS_PART ); - m_sLocation = OUString(DOCUMENT ); + m_sLocation = DOCUMENT; return true; } else diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 69971f8b8efc..bbc3ab39b769 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -356,7 +356,7 @@ eventMethodToDescriptor( const OUString& rEventMethod, ScriptEventDescriptor& ev // set this it VBAInterop, ensures that it doesn't // get persisted or shown in property editors - evtDesc.ScriptType = OUString( "VBAInterop" ); + evtDesc.ScriptType = "VBAInterop"; return true; } return false; diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 9c102dac7503..e061407df004 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -891,7 +891,7 @@ sal_Bool SdXMLFilter::Export() if( !aName.isEmpty() ) { - sPropName = OUString( "StreamRelPath" ); + sPropName = "StreamRelPath"; xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); } } @@ -986,7 +986,8 @@ sal_Bool SdXMLFilter::Export() if( !xDocOut.is() || !xProps.is() ) return sal_False; - uno::Any aAny; aAny <<= OUString( "text/xml"); + uno::Any aAny; + aAny <<= OUString( "text/xml"); xProps->setPropertyValue( "MediaType" , aAny); // encrypt all streams diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index ab855a1564e1..6941e33ab45b 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -86,7 +86,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = OUString( "window" ); + aWindow.WindowServiceName = "window"; aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 2925053d7efe..da35da518dbd 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -316,7 +316,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& OUString aDestMimeType( "image/png" ); if ( rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha && !bAnimated ) { - aDestMimeType = OUString( "image/jpeg" ); + aDestMimeType = "image/jpeg"; // if( aSourceMimeType != aDestMimeType ) bNeedsOptimizing = sal_True; } @@ -516,8 +516,8 @@ void ImpOptimizer::DispatchStatus() if ( mxStatusDispatcher.is() ) { URL aURL; - aURL.Protocol = OUString( "vnd.com.sun.star.comp.PresentationMinimizer:" ); - aURL.Path = OUString( "statusupdate" ); + aURL.Protocol = "vnd.com.sun.star.comp.PresentationMinimizer:"; + aURL.Path = "statusupdate"; mxStatusDispatcher->dispatch( aURL, GetStatusSequence() ); } } diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 47605277b12f..4a28738cad9a 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -597,8 +597,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.GetFrame())); URL aURL; - aURL.Protocol = OUString( "vnd.com.sun.star.comp.PPPOptimizer:" ); - aURL.Path = OUString( "optimize" ); + aURL.Protocol = "vnd.com.sun.star.comp.PPPOptimizer:"; + aURL.Path = "optimize"; Sequence< PropertyValue > lArguments( 3 ); lArguments[ 0 ].Name = "Settings"; diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 344845b76534..b1419af68639 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -169,7 +169,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert { nPwPos = aFilterData.getLength(); aFilterData.realloc( nPwPos+1 ); - aFilterData[nPwPos].Name = OUString( "Password" ); + aFilterData[nPwPos].Name = "Password"; } aFilterData[nPwPos].Value <<= aPwd; bRet = xSubFilter->filter( aFilterData ); diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index c02cd9a3cb4b..03eb94518508 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -653,7 +653,7 @@ void Parser::readFont() if( aResult.familyName.isEmpty() ) { // last fallback - aResult.familyName = OUString( "Arial" ); + aResult.familyName = "Arial"; aResult.isUnderline = false; } diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index d0c3f8c48d5d..7b59f9e95a6e 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -97,7 +97,7 @@ Image SAL_CALL GetImage( if ( pSlot ) { - aCommandURL = OUString( ".uno:" ); + aCommandURL = ".uno:"; aCommandURL += OUString::createFromAscii( pSlot->GetUnoName() ); } else diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 28c22a1042a4..a64d124d9831 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -325,13 +325,13 @@ OUString SfxHelp::GetHelpModuleName_Impl() { // Map some module identifiers to their "real" help module string. if ( aFactoryShortName == "chart2" ) - aFactoryShortName = OUString( "schart" ); + aFactoryShortName = "schart" ; else if ( aFactoryShortName == "BasicIDE" ) - aFactoryShortName = OUString( "sbasic" ); + aFactoryShortName = "sbasic"; else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swxform")) ) - aFactoryShortName = OUString( "swriter" ); + aFactoryShortName = "swriter" ; else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbquery")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbrelation")) @@ -341,7 +341,7 @@ OUString SfxHelp::GetHelpModuleName_Impl() || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swreport")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swform")) ) - aFactoryShortName = OUString( "sdatabase" ); + aFactoryShortName = "sdatabase"; else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbibliography")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StartModule")) ) aFactoryShortName = sDefaultModule; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 388d08864705..2eb6bed0e3d9 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -145,10 +145,10 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< frame::XFrame > xFrame( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs(2); beans::PropertyValue aPropValue; - aPropValue.Name = OUString( "Frame" ); + aPropValue.Name = "Frame"; aPropValue.Value = uno::makeAny( xFrame ); aArgs[0] <<= aPropValue; - aPropValue.Name = OUString( "ResourceURL" ); + aPropValue.Name = "ResourceURL"; // create a resource URL from the nId provided by the sfx2 OUString aResourceURL( aDockWindowResourceURL ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index bc1f0e1e951c..26a5345a3573 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1037,7 +1037,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( makeAny( nTemplateDescription ) ); - OUString sStandardDirTemp = OUString( sStandardDir ); + OUString sStandardDirTemp = sStandardDir; aInitArguments[1] <<= NamedValue( OUString( "StandardDir" ), @@ -2307,9 +2307,9 @@ FileDialogHelper::FileDialogHelper( if ( aExtName.indexOf( (sal_Unicode)'*' ) != 0 ) { if ( !aExtName.isEmpty() && aExtName.indexOf( (sal_Unicode)'.' ) != 0 ) - aWildcard = OUString( "*." ); + aWildcard = "*."; else - aWildcard = OUString( "*" ); + aWildcard = "*"; } aWildcard += aExtName; @@ -2472,7 +2472,7 @@ Sequence< OUString > FileDialogHelper::GetSelectedFiles() const else aPath.setName( lFiles[i] ); - aResultSeq[i-1] = OUString(aPath.GetMainURL( INetURLObject::NO_DECODE )); + aResultSeq[i-1] = aPath.GetMainURL( INetURLObject::NO_DECODE ); } } else diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 99b4c7240c7e..f457753f574b 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -206,11 +206,11 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( //string for the ok button //used in filter/source/pdf/impdialog.cxx uno::Sequence< beans::PropertyValue > aFilterDataValue(1); - aFilterDataValue[0].Name = OUString( "_OkButtonString" ); + aFilterDataValue[0].Name = "_OkButtonString"; aFilterDataValue[0].Value = css::uno::makeAny(SfxResId(STR_PDF_EXPORT_SEND ).toString()); //add to the filterdata property, the only one the PDF export filter dialog will care for - aPropsForDialog[0].Name = OUString( "FilterData" ); + aPropsForDialog[0].Name = "FilterData"; aPropsForDialog[0].Value = css::uno::makeAny( aFilterDataValue ); //when executing the dialog will merge the persistent FilterData properties @@ -360,9 +360,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( bSendAsPDF ? 3 : 2 ); - aQuery[0].Name = OUString( "Type" ); + aQuery[0].Name = "Type"; aQuery[0].Value = css::uno::makeAny( aTypeName ); - aQuery[1].Name = OUString( "DocumentService" ); + aQuery[1].Name = "DocumentService"; aQuery[1].Value = css::uno::makeAny( aModule ); if( bSendAsPDF ) { @@ -371,7 +371,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // exact flag value as detailed in the filter configuration to get it // this seems to be a bug // without flags we get an import filter here, which is also unwanted - aQuery[2].Name = OUString( "Flags" ); + aQuery[2].Name = "Flags"; aQuery[2].Value = css::uno::makeAny( sal_Int32(0x80042) ); // EXPORT ALIEN 3RDPARTY } @@ -451,7 +451,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( bHasLocation && !bStoreTo ) { INetURLObject aFileObj( xStorable->getLocation() ); - aExtension = (OUString)aFileObj.getExtension(); + aExtension = aFileObj.getExtension(); } else { @@ -518,7 +518,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( sal_Int32 nNumArgs(0); const OUString aPasswordPropName( "Password" ); css::uno::Sequence< css::beans::PropertyValue > aArgs( ++nNumArgs ); - aArgs[nNumArgs-1].Name = OUString( "FilterName" ); + aArgs[nNumArgs-1].Name = "FilterName"; aArgs[nNumArgs-1].Value = css::uno::makeAny( aFilterName ); ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); @@ -543,7 +543,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // check if the document needs to be prepared for sending as mail (embedding of links, removal of invisible content) - aPrepareURL.Complete = OUString( ".uno:PrepareMailExport" ); + aPrepareURL.Complete = ".uno:PrepareMailExport"; xURLTransformer->parseStrict( aPrepareURL ); if ( xDispatchProvider.is() ) @@ -612,7 +612,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { css::util::URL aURL; // #i30432# notify that export is finished - the Writer may want to restore removed content - aURL.Complete = OUString( ".uno:MailExportFinished" ); + aURL.Complete = ".uno:MailExportFinished"; xURLTransformer->parseStrict( aURL ); if ( xDispatchProvider.is() ) @@ -659,7 +659,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // We need 1:1 copy of the document to preserve an added signature. aArgs.realloc( ++nNumArgs ); - aArgs[nNumArgs-1].Name = OUString( "CopyStreamIfPossible" ); + aArgs[nNumArgs-1].Name = "CopyStreamIfPossible"; aArgs[nNumArgs-1].Value = css::uno::makeAny( (sal_Bool)sal_True ); try diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index f528701535cd..d895492cb972 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - OUString aStringID = OUString( "groupuinames.xml" ); + OUString aStringID = "groupuinames.xml"; return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8751f42fe57a..4285fafe8f2a 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -2061,17 +2061,17 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { - OUString aFileURL = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); + OUString aFileURL = ( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); ::rtl::Bootstrap::expandMacros( aFileURL ); - OUString aBuildID = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("setup") ":buildid}" ); + OUString aBuildID = ( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("setup") ":buildid}" ); ::rtl::Bootstrap::expandMacros( aBuildID ); if ( !aFileURL.isEmpty() ) { - aFileURL += OUString( "/user/temp/document_io_logring.txt" ); + aFileURL += "/user/temp/document_io_logring.txt"; try { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index df8fcd138aee..125edca36a7f 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -373,9 +373,9 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion(); uno::Sequence< beans::NamedValue > aEncryptionAlgs( 3 ); - aEncryptionAlgs[0].Name = OUString( "StartKeyGenerationAlgorithm" ); - aEncryptionAlgs[1].Name = OUString( "EncryptionAlgorithm" ); - aEncryptionAlgs[2].Name = OUString( "ChecksumAlgorithm" ); + aEncryptionAlgs[0].Name = "StartKeyGenerationAlgorithm"; + aEncryptionAlgs[1].Name = "EncryptionAlgorithm"; + aEncryptionAlgs[2].Name = "ChecksumAlgorithm"; // the default values, that should be used for ODF1.1 and older formats aEncryptionAlgs[0].Value <<= xml::crypto::DigestID::SHA1; aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8; @@ -2238,13 +2238,13 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" ); + aArgs[nEnd-1].Name = "DocumentBaseURL"; aArgs[nEnd-1].Value <<= rMedium.GetBaseURL(); } if ( bInsert ) { aArgs.realloc( ++nEnd ); - aArgs[nEnd-1].Name = OUString( "InsertMode" ); + aArgs[nEnd-1].Name = "InsertMode"; aArgs[nEnd-1].Value <<= (sal_Bool) sal_True; } @@ -2382,7 +2382,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) 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/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 8f23e4ba3153..5694db17df18 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -802,11 +802,11 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar } Sequence< PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = OUString( "Frame" ); + aPropSeq[0].Name = "Frame"; aPropSeq[0].Value <<= xFrame; - aPropSeq[1].Name = OUString( "Persistent" ); + aPropSeq[1].Name = "Persistent"; aPropSeq[1].Value <<= sal_False; - aPropSeq[2].Name = OUString( "PopupMode" ); + aPropSeq[2].Name = "PopupMode"; aPropSeq[2].Value <<= sal_True; try diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index ee8718098c22..25d6a958714f 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -672,8 +672,8 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() th Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames( 2 ); - seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" ); - seqServiceNames.getArray() [1] = OUString( "com.sun.star.frame.OfficeFrameLoader" ); + seqServiceNames.getArray() [0] = "com.sun.star.frame.SynchronousFrameLoader"; + seqServiceNames.getArray() [1] = "com.sun.star.frame.OfficeFrameLoader"; return seqServiceNames ; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index cd9672d6d383..c4d9eb47e1e7 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -311,9 +311,9 @@ static OUString impl_retrieveFilterNameFromTypeAndModule( { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( 2 ); - aQuery[0].Name = OUString( "Type" ); + aQuery[0].Name = "Type"; aQuery[0].Value = css::uno::makeAny( rType ); - aQuery[1].Name = OUString( "DocumentService" ); + aQuery[1].Name = "DocumentService"; aQuery[1].Value = css::uno::makeAny( rModuleIdentifier ); css::uno::Reference< css::container::XEnumeration > xEnumeration = @@ -367,32 +367,32 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra case E_MS_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = OUString( "writer_MS_Word_97" ); + sType = "writer_MS_Word_97"; else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = OUString( "calc_MS_Excel_97" ); + sType = "calc_MS_Excel_97"; else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = OUString( "impress_MS_PowerPoint_97" ); + sType = "impress_MS_PowerPoint_97"; else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = OUString( "impress_MS_PowerPoint_97" ); + sType = "impress_MS_PowerPoint_97"; } break; case E_OOO_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = OUString( "writer8" ); + sType = "writer8"; else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = OUString( "calc8" ); + sType = "calc8"; else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = OUString( "draw8" ); + sType = "draw8"; else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = OUString( "impress8" ); + sType = "impress8"; } break; } @@ -688,7 +688,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "FilterName" ); + aArgs[0].Name = "FilterName"; aArgs[0].Value = css::uno::makeAny( aFilterName ); // Store document in the html format diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 35f43d4e2c05..02bdc97eef5c 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -321,7 +321,7 @@ OUString SAL_CALL LocaleBackend::getImplementationName(void) uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) { uno::Sequence<OUString> aServiceNameList(1); - aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.LocaleBackend") ; + aServiceNameList[0] = "com.sun.star.configuration.backend.LocaleBackend"; return aServiceNameList ; } diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 69b8f28a8e24..2feac4964849 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -377,7 +377,7 @@ OUString SAL_CALL WinInetBackend::getImplementationName(void) uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) { uno::Sequence<OUString> aServiceNameList(1); - aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.WinInetBackend") ; + aServiceNameList[0] = "com.sun.star.configuration.backend.WinInetBackend"; return aServiceNameList ; } diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index a3a91338eecc..574223d8e87c 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -101,9 +101,9 @@ namespace /* private */ { OUString senddocUrl = getAlternativeSenddocUrl(); - if (senddocUrl.getLength() == 0) + if (senddocUrl.isEmpty()) { - senddocUrl = OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe"); + senddocUrl = ( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe"); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index e061641f1844..4ed8b92171b3 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -782,7 +782,7 @@ namespace public: MainSequenceSearcher() { - maSearchKey.Name = OUString( "node-type" ); + maSearchKey.Name = "node-type"; maSearchKey.Value <<= presentation::EffectNodeType::MAIN_SEQUENCE; } diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index e5d49edb9043..684d36f4b61c 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -595,7 +595,7 @@ BaseStorage* Storage::OpenStorage( const OUString& rName, StreamMode m, bool bDi OUString aNewName = rName; if( aNewName.isEmpty() ) { - aNewName = OUString( "Temp Stg " ) + OUString::number( ++nTmpCount ); + aNewName = "Temp Stg " + OUString::number( ++nTmpCount ); bTemp = true; } p = pIo->pTOC->Create( *pEntry, aNewName, STG_STORAGE ); @@ -654,7 +654,7 @@ BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, boo OUString aNewName( rName ); if( aNewName.isEmpty() ) { - aNewName = OUString( "Temp Strm " ) + OUString::number( ++nTmpCount ); + aNewName = "Temp Strm " + OUString::number( ++nTmpCount ); bTemp = true; } p = pIo->pTOC->Create( *pEntry, aNewName, STG_STREAM ); diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 15433cca778f..83887e917395 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -71,8 +71,8 @@ static Mutex & getInitMutex(); static Sequence< OUString > loader_getSupportedServiceNames() { Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString( "com.sun.star.loader.Java"); - seqNames.getArray()[1] = OUString( "com.sun.star.loader.Java2"); + seqNames.getArray()[0] = "com.sun.star.loader.Java"; + seqNames.getArray()[1] = "com.sun.star.loader.Java2"; return seqNames; } diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index a9a680b1531d..a3727215717e 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -277,9 +277,9 @@ void test_SimpleRegistry( xKey = xRootKey->createKey(OUString( "ThirdKey" )); OUString pAscii[3]; - pAscii[0] = OUString( "Hallo" ); - pAscii[1] = OUString( "jetzt komm" ); - pAscii[2] = OUString( "ich" ); + pAscii[0] = "Hallo"; + pAscii[1] = "jetzt komm"; + pAscii[2] = "ich"; Sequence<OUString> seqAscii(pAscii, 3); xKey->setAsciiListValue(seqAscii); @@ -293,9 +293,9 @@ void test_SimpleRegistry( xKey = xRootKey->createKey(OUString( "FourthKey" )); OUString pUnicode[3]; - pUnicode[0] = OUString( "Hallo" ); - pUnicode[1] = OUString( "jetzt komm" ); - pUnicode[2] = OUString( "ich als unicode" ); + pUnicode[0] = "Hallo"; + pUnicode[1] = "jetzt komm"; + pUnicode[2] = "ich als unicode"; Sequence<OUString> seqUnicode(pUnicode, 3); xKey->setStringListValue(seqUnicode); diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index fe0bc311d251..4165b9f62d88 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -2286,7 +2286,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) case NF_KEY_GGG : // GGG case NF_KEY_R : // R case NF_KEY_RR : // RR - sStrArray[i] = OUString(sKeyword[nTypeArray[i]]); // tTtT -> TTTT + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].getLength(); i++; break; diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index b727cc4cfd19..dbb420532b8f 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -30,7 +30,7 @@ SysCredentialsConfigItem::SysCredentialsConfigItem( m_pOwner( pOwner ) { uno::Sequence< OUString > aNode( 1 ); - aNode[ 0 ] = OUString( "Office.Common/Passwords/AuthenticateUsingSystemCredentials" ); + aNode[ 0 ] = "Office.Common/Passwords/AuthenticateUsingSystemCredentials"; EnableNotification( aNode ); } @@ -60,7 +60,7 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() { // read config item uno::Sequence< OUString > aPropNames( 1 ); - aPropNames[ 0 ] = OUString( "AuthenticateUsingSystemCredentials" ); + aPropNames[ 0 ] = "AuthenticateUsingSystemCredentials"; uno::Sequence< uno::Any > aAnyValues( utl::ConfigItem::GetProperties( aPropNames ) ); @@ -88,7 +88,7 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( // write config item. uno::Sequence< OUString > aPropNames( 1 ); uno::Sequence< uno::Any > aPropValues( 1 ); - aPropNames[ 0 ] = OUString( "AuthenticateUsingSystemCredentials" ); + aPropNames[ 0 ] = "AuthenticateUsingSystemCredentials"; aPropValues[ 0 ] <<= seqURLList; utl::ConfigItem::SetModified(); diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 2b251a5d0a1e..064a4b818908 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -214,19 +214,19 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e switch( eObjType ) { case ::svt::BBTYPE_BROWSEBOX: - aRetText = OUString( "BrowseBox" ); + aRetText = "BrowseBox"; break; case ::svt::BBTYPE_TABLE: - aRetText = OUString( "Table" ); + aRetText = "Table"; break; case ::svt::BBTYPE_ROWHEADERBAR: - aRetText = OUString( "RowHeaderBar" ); + aRetText = "RowHeaderBar"; break; case ::svt::BBTYPE_COLUMNHEADERBAR: - aRetText = OUString( "ColumnHeaderBar" ); + aRetText = "ColumnHeaderBar"; break; case ::svt::BBTYPE_TABLECELL: - aRetText = OUString( "TableCell" ); + aRetText = "TableCell"; #if OSL_DEBUG_LEVEL > 1 aRetText += " ["; aRetText += OUString::number(sal_Int32(GetCurRow())); @@ -236,7 +236,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e #endif break; case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = OUString( "RowHeaderCell" ); + aRetText = "RowHeaderCell"; #if OSL_DEBUG_LEVEL > 1 aRetText += " ["; aRetText += OUString::number(sal_Int32(GetCurRow())); @@ -246,7 +246,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e #endif break; case ::svt::BBTYPE_COLUMNHEADERCELL: - aRetText = OUString( "ColumnHeaderCell" ); + aRetText = "ColumnHeaderCell"; #if OSL_DEBUG_LEVEL > 1 aRetText += " ["; aRetText += OUString::number(sal_Int32(GetCurRow())); @@ -268,25 +268,25 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb switch( eObjType ) { case ::svt::BBTYPE_BROWSEBOX: - aRetText = OUString( "BrowseBox description" ); + aRetText = "BrowseBox description"; break; case ::svt::BBTYPE_TABLE: - // aRetText = OUString( "TABLE description" ); + // aRetText = "TABLE description"; break; case ::svt::BBTYPE_ROWHEADERBAR: - // aRetText = OUString( "ROWHEADERBAR description" ); + // aRetText = "ROWHEADERBAR description"; break; case ::svt::BBTYPE_COLUMNHEADERBAR: - // aRetText = OUString( "COLUMNHEADERBAR description" ); + // aRetText = "COLUMNHEADERBAR description"; break; case ::svt::BBTYPE_TABLECELL: - // aRetText = OUString( "TABLECELL description" ); + // aRetText = "TABLECELL description"; break; case ::svt::BBTYPE_ROWHEADERCELL: - // aRetText = OUString( "ROWHEADERCELL description" ); + // aRetText = "ROWHEADERCELL description"; break; case ::svt::BBTYPE_COLUMNHEADERCELL: - // aRetText = OUString( "COLUMNHEADERCELL description" ); + // aRetText = "COLUMNHEADERCELL description"; break; case ::svt::BBTYPE_CHECKBOXCELL: break; diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 3429f760a62c..c07f55921f0e 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -152,18 +152,18 @@ namespace svt Reference< XResultSet > xResultSet; Sequence< OUString > aProps(12); - aProps[0] = OUString( "Title" ); - aProps[1] = OUString( "Size" ); - aProps[2] = OUString( "DateModified" ); - aProps[3] = OUString( "DateCreated" ); - aProps[4] = OUString( "IsFolder" ); - aProps[5] = OUString( "TargetURL" ); - aProps[6] = OUString( "IsHidden" ); - aProps[7] = OUString( "IsVolume" ); - aProps[8] = OUString( "IsRemote" ); - aProps[9] = OUString( "IsRemoveable" ); - aProps[10] = OUString( "IsFloppy" ); - aProps[11] = OUString( "IsCompactDisc" ); + aProps[0] = "Title"; + aProps[1] = "Size"; + aProps[2] = "DateModified"; + aProps[3] = "DateCreated"; + aProps[4] = "IsFolder"; + aProps[5] = "TargetURL"; + aProps[6] = "IsHidden"; + aProps[7] = "IsVolume"; + aProps[8] = "IsRemote"; + aProps[9] = "IsRemoveable"; + aProps[10] = "IsFloppy"; + aProps[11] = "IsCompactDisc"; Reference< XCommandEnvironment > xEnvironment; try diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 5317426f13b4..7a091e699ece 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -1051,7 +1051,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox case ::svt::BBTYPE_ROWHEADERBAR: case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = OUString( "error" ); + aRetText = "error"; break; default: diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 362394c590dd..4cbe2a68395e 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -364,8 +364,8 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(2); OUString* pProps = aProps.getArray(); - pProps[0] = OUString( "Title" ); - pProps[1] = OUString( "IsFolder" ); + pProps[0] = "Title"; + pProps[1] = "IsFolder"; try { diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 6582b1c137f3..7a4b9fdf1cf1 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -95,9 +95,9 @@ void HostDetailsContainer::show( bool bShow ) INetURLObject HostDetailsContainer::getUrl( ) { - OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); + OUString sHost = m_pEDHost->GetText().trim( ); sal_Int64 nPort = m_pEDPort->GetValue(); - OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); + OUString sPath = m_pEDPath->GetText().trim( ); OUString sUrl; if ( !sHost.isEmpty( ) ) @@ -204,9 +204,9 @@ SmbDetailsContainer::SmbDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject SmbDetailsContainer::getUrl( ) { - OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); - OUString sShare = OUString( m_pEDShare->GetText() ).trim( ); - OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); + OUString sHost = m_pEDHost->GetText().trim( ); + OUString sShare = m_pEDShare->GetText().trim( ); + OUString sPath = m_pEDPath->GetText().trim( ); OUString sUrl; if ( !sHost.isEmpty( ) ) @@ -287,7 +287,7 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && aTypesNamesList.getLength( ); ++i ) { OUString sUrl = aTypesUrlsList[i]; - if ( !( sUrl == OUString( GDRIVE_BASE_URL ) && bSkipGDrive ) ) + if ( !( sUrl == GDRIVE_BASE_URL && bSkipGDrive ) ) { m_pLBServerType->InsertEntry( aTypesNamesList[i] ); m_aServerTypesURLs.push_back( sUrl ); @@ -297,8 +297,8 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject CmisDetailsContainer::getUrl( ) { - OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); - OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); + OUString sBindingUrl = m_pEDBinding->GetText().trim( ); + OUString sPath = m_pEDPath->GetText().trim( ); OUString sUrl; if ( !sBindingUrl.isEmpty( ) && !m_sRepoId.isEmpty() ) @@ -337,7 +337,7 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) void CmisDetailsContainer::setUsername( const OUString& rUsername ) { - m_sUsername = OUString( rUsername ); + m_sUsername = rUsername; } void CmisDetailsContainer::selectRepository( ) @@ -359,7 +359,7 @@ IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG ) IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) { - OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); + OUString sBindingUrl = m_pEDBinding->GetText().trim( ); // Clean the listbox m_pLBRepository->Clear( ); @@ -380,7 +380,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) // Get the Content ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() ); Sequence< OUString > aProps( 1 ); - aProps[0] = OUString( "Title" ); + aProps[0] = "Title"; try { diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 21a70661dd11..2cc7f72734e1 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -86,7 +86,7 @@ short SvColorDialog::Execute() Sequence< PropertyValue > props( 2 ); props[0].Name = sColor; props[0].Value <<= (sal_Int32) maColor.GetColor(); - props[1].Name = OUString( "Mode" ); + props[1].Name = "Mode"; props[1].Value <<= (sal_Int16) meMode; xPropertyAccess->setPropertyValues( props ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 67e0e1a89dd3..a9e441a6b319 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -108,7 +108,7 @@ void SvObjectServerList::FillInsertObjects() OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = OUString( "nodepath" ); + aPathProp.Name = "nodepath"; aPathProp.Value <<= OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); aArguments[0] <<= aPathProp; diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 16f3e507ff24..47588d84b36e 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -186,7 +186,7 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicDescriptor" ); + aSeq.getArray()[ 0 ] = "com.sun.star.graphic.GraphicDescriptor"; return aSeq; } @@ -380,7 +380,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) - aMimeType = OUString(MIMETYPE_VCLGRAPHIC ); + aMimeType = MIMETYPE_VCLGRAPHIC; } else aMimeType = maMimeType; diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index bec4e4f1724b..da0a9deaca39 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -130,7 +130,7 @@ uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.Graphic" ); + aSeq.getArray()[ 0 ] = "com.sun.star.graphic.Graphic"; return aSeq; } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 8c0be63be0d3..cf5113b5c93f 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -81,7 +81,7 @@ uno::Sequence< OUString > GraphicProvider::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicProvider" ); + aSeq.getArray()[ 0 ] = "com.sun.star.graphic.GraphicProvider"; return aSeq; } diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 7d687ef96dce..ef397f413053 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -78,7 +78,7 @@ uno::Sequence< OUString > GraphicRendererVCL::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicRendererVCL" ); + aSeq.getArray()[ 0 ] = "com.sun.star.graphic.GraphicRendererVCL"; return aSeq; } diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 7071fd408016..b0f6fd0d02bf 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -32,8 +32,8 @@ using namespace ::com::sun::star; uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); - aRet[0] = OUString( "com.sun.star.embed.HatchWindowFactory" ); - aRet[1] = OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); + aRet[0] = "com.sun.star.embed.HatchWindowFactory"; + aRet[1] = "com.sun.star.comp.embed.HatchWindowFactory"; return aRet; } diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index fe6e4740222e..2490da8ffd7a 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -148,7 +148,7 @@ namespace svt // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = OUString( "URL" ); + aMediaProperties[0].Name = "URL"; aMediaProperties[0].Value <<= _rImageResourceURL; Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) ); OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" ); @@ -163,9 +163,9 @@ namespace svt ); aMediaProperties.realloc( 2 ); - aMediaProperties[0].Name = OUString( "OutputStream" ); + aMediaProperties[0].Name = "OutputStream"; aMediaProperties[0].Value <<= xBufferAccess; - aMediaProperties[1].Name = OUString( "MimeType" ); + aMediaProperties[1].Name = "MimeType"; aMediaProperties[1].Value <<= OUString( "image/png" ); xProvider->storeGraphic( xGraphic, aMediaProperties ); diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 3523383ccfa5..da0c90c0a86c 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -406,7 +406,7 @@ OUString makeShortRepresentativeTextForScript(UScriptCode eScript) break; } case USCRIPT_LATIN: - sSampleText = OUString("Lorem ipsum"); + sSampleText = "Lorem ipsum"; break; default: break; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 447b3b52d905..f7e64fe1aa81 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -609,10 +609,10 @@ namespace svt // create a content for the current folder root Reference< XResultSet > xResultSet; Sequence< OUString > aContentProperties( 4); - aContentProperties[0] = OUString( "Title" ); - aContentProperties[1] = OUString( "DateModified" ); - aContentProperties[2] = OUString( "DateCreated" ); - aContentProperties[3] = OUString( "IsFolder" ); + aContentProperties[0] = "Title"; + aContentProperties[1] = "DateModified"; + aContentProperties[2] = "DateCreated"; + aContentProperties[3] = "IsFolder"; // get the set of sub contents in the folder try diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 6f86f92264c5..22264ca20331 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -295,16 +295,16 @@ namespace svt { namespace table switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = OUString( "Grid control" ); + aRetText = "Grid control"; break; case TCTYPE_TABLE: - aRetText = OUString( "Grid conrol" ); + aRetText = "Grid conrol"; break; case TCTYPE_ROWHEADERBAR: - aRetText = OUString( "RowHeaderBar" ); + aRetText = "RowHeaderBar"; break; case TCTYPE_COLUMNHEADERBAR: - aRetText = OUString( "ColumnHeaderBar" ); + aRetText = "ColumnHeaderBar"; break; case TCTYPE_TABLECELL: //the name of the cell constists of column name and row name if defined @@ -338,16 +338,16 @@ namespace svt { namespace table switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = OUString( "Grid control description" ); + aRetText = "Grid control description"; break; case TCTYPE_TABLE: - aRetText = OUString( "TABLE description" ); + aRetText = "TABLE description"; break; case TCTYPE_ROWHEADERBAR: - aRetText = OUString( "ROWHEADERBAR description" ); + aRetText = "ROWHEADERBAR description"; break; case TCTYPE_COLUMNHEADERBAR: - aRetText = OUString( "COLUMNHEADERBAR description" ); + aRetText = "COLUMNHEADERBAR description"; break; case TCTYPE_TABLECELL: // the description of the cell consists of column name and row name if defined @@ -362,10 +362,10 @@ namespace svt { namespace table } break; case TCTYPE_ROWHEADERCELL: - aRetText = OUString( "ROWHEADERCELL description" ); + aRetText = "ROWHEADERCELL description"; break; case TCTYPE_COLUMNHEADERCELL: - aRetText = OUString( "COLUMNHEADERCELL description" ); + aRetText = "COLUMNHEADERCELL description"; break; } return aRetText; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 7ae18f496459..1bea46d4ce3c 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -140,7 +140,7 @@ namespace svt ::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = OUString( "com.sun.star.ui.AddressBookSourceDialog" ); + aSupported.getArray()[0] = "com.sun.star.ui.AddressBookSourceDialog"; return aSupported; } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 465a38e044ee..3722c4d4111c 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -359,7 +359,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence<PropertyValue> aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = OUString( "KeyModifier" ); + aArgs[0].Name = "KeyModifier"; aArgs[0].Value = makeAny( KeyModifier ); aTargetURL.Complete = aCommandURL; diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 9a6d60c173eb..16b260b623c0 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1457,7 +1457,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) if( mxGraphicProvider.is() ) try { ::com::sun::star::beans::PropertyValues aProps( 1 ); - aProps[0].Name = OUString( "URL" ); + aProps[0].Name = "URL"; aProps[0].Value <<= rURL; Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic( aProps ) ); diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 9497710fca03..024d55596be7 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -245,7 +245,7 @@ namespace svt { namespace uno Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) { Sequence< OUString > aServices(1); - aServices[0] = OUString( "com.sun.star.ui.dialogs.Wizard" ); + aServices[0] = "com.sun.star.ui.dialogs.Wizard"; return aServices; } diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index fd913e6f1403..c6e4794d4de3 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -567,9 +567,9 @@ Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) { Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "Accessible" ); - pArray[1] = OUString( "AccessibleContext" ); - pArray[2] = OUString( "AccessibleComponent" ); + pArray[0] = "Accessible"; + pArray[1] = "AccessibleContext"; + pArray[2] = "AccessibleComponent"; return aRet; } diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 92e8775868fb..50266e8c069c 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -194,7 +194,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = OUString( "*.odb" ); + m_aFilterExtensions[0] = "*.odb"; } } diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index dc930f295173..1a2a3b8fe449 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -101,20 +101,20 @@ namespace svxform || xDocumentSI->supportsService("com.sun.star.text.WebDocument") ) { - _rFamilyName = OUString( "ParagraphStyles" ); - _rStyleName = OUString( "Standard" ); + _rFamilyName = "ParagraphStyles"; + _rStyleName = "Standard"; } else if ( xDocumentSI->supportsService("com.sun.star.sheet.SpreadsheetDocument") ) { - _rFamilyName = OUString( "CellStyles" ); - _rStyleName = OUString( "Default" ); + _rFamilyName = "CellStyles"; + _rStyleName = "Default"; } else if ( xDocumentSI->supportsService("com.sun.star.drawing.DrawingDocument") || xDocumentSI->supportsService("com.sun.star.presentation.PresentationDocument") ) { - _rFamilyName = OUString( "graphics" ); - _rStyleName = OUString( "standard" ); + _rFamilyName = "graphics"; + _rStyleName = "standard"; } else bSuccess = false; @@ -163,7 +163,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = OUString( "CharLocale" ); + sCharLocalePropertyName = "CharLocale"; if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -282,7 +282,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - OUString sConfigName = OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); + OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/"; sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 070cdb8dd60e..3e4374f25ee6 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -986,9 +986,9 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = OUString( "application" ); + sMacroLocation = "application"; else - sMacroLocation = OUString( "document" ); + sMacroLocation = "document"; } OUStringBuffer aScriptURI; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 5d251b67fb4a..a2e2530ef745 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -455,7 +455,7 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = OUString( ".uno:" ); + sSlotUnoName = ".uno:"; sSlotUnoName += OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 @@ -533,7 +533,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - OUString sRichTextPropertyName = OUString( "RichText" ); + OUString sRichTextPropertyName = "RichText"; if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -596,7 +596,7 @@ namespace svx if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = OUString( "<unknown>" ); + sUnoSlotName = "<unknown>"; OString sUnoSlotNameAscii( "\"" ); sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; @@ -731,7 +731,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = OUString( "Enable" ); + aArgs[ 0 ].Name = "Enable"; aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index ab79fe9575de..bc6eab52b840 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,7 +85,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "Position" ); + aArgs[0].Name = "Position"; aPositionParam.QueryValue( a ); aArgs[0].Value = a; m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ), @@ -191,8 +191,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { // set a new image, matching to this slot - OUString aSlotURL( "slot:" ); - aSlotURL += OUString::number( nSlot); + OUString aSlotURL = "slot:" + OUString::number( nSlot); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index c16e67ed5d14..b5456c487e7f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -53,7 +53,7 @@ namespace svxform Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { ::comphelper::StringSequence aSupported( 1 ); - aSupported.getArray()[0] = OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); + aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition"; return aSupported; } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 59a0a4a196d4..a8dafac8533d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -376,17 +376,17 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu ) OUString aFilterName( mpBrowser->GetFilterName() ); css::uno::Sequence< css::beans::PropertyValue > aArgs( 6 ); - aArgs[0].Name = OUString( "Background.Transparent" ); + aArgs[0].Name = "Background.Transparent"; aArgs[0].Value <<= sal_Int32( 0 ); // 0 - 100 - aArgs[1].Name = OUString( "Background.BackColor" ); + aArgs[1].Name = "Background.BackColor"; aArgs[1].Value <<= sal_Int32( - 1 ); - aArgs[2].Name = OUString( "Background.URL" ); + aArgs[2].Name = "Background.URL"; aArgs[2].Value <<= aURL; - aArgs[3].Name = OUString( "Background.Filtername" ); // FIXME should be FilterName + aArgs[3].Name = "Background.Filtername"; // FIXME should be FilterName aArgs[3].Value <<= aFilterName; - aArgs[4].Name = OUString( "Background.Position" ); + aArgs[4].Name = "Background.Position"; aArgs[4].Value <<= css::style::GraphicLocation_TILED; - aArgs[5].Name = OUString( "Position" ); + aArgs[5].Name = "Position"; aArgs[5].Value <<= nPos; const CommandInfoMap::const_iterator it = m_aCommandInfo.find( SID_GALLERY_BG_BRUSH ); @@ -1101,7 +1101,7 @@ void GalleryBrowser2::Dispatch( if ( !xDispatchProvider.is() || !m_xTransformer.is() ) return; - aURL.Complete = OUString( CMD_SID_GALLERY_FORMATS ); + aURL.Complete = CMD_SID_GALLERY_FORMATS; m_xTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, @@ -1146,19 +1146,19 @@ void GalleryBrowser2::Dispatch( css::uno::Sequence< css::beans::PropertyValue > aSeq( SVXGALLERYITEM_PARAMS ); - aSeq[0].Name = OUString( SVXGALLERYITEM_TYPE ); + aSeq[0].Name = SVXGALLERYITEM_TYPE; aSeq[0].Value <<= nType; - aSeq[1].Name = OUString( SVXGALLERYITEM_URL ); + aSeq[1].Name = SVXGALLERYITEM_URL; aSeq[1].Value <<= aFileURL; - aSeq[2].Name = OUString( SVXGALLERYITEM_FILTER ); + aSeq[2].Name = SVXGALLERYITEM_FILTER; aSeq[2].Value <<= aFilterName; - aSeq[3].Name = OUString( SVXGALLERYITEM_DRAWING ); + aSeq[3].Name = SVXGALLERYITEM_DRAWING; aSeq[3].Value <<= xDrawing; - aSeq[4].Name = OUString( SVXGALLERYITEM_GRAPHIC ); + aSeq[4].Name = SVXGALLERYITEM_GRAPHIC; aSeq[4].Value <<= xGraphic; css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( SVXGALLERYITEM_ARGNAME ); + aArgs[0].Name = SVXGALLERYITEM_ARGNAME; aArgs[0].Value <<= aSeq; DispatchInfo *pInfo = new DispatchInfo; diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index b3f9d057406c..b1019314a073 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -95,7 +95,7 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "SelectedFormat" ); + aArgs[0].Name = "SelectedFormat"; aItem.QueryValue( a ); aArgs[0].Value = a; Dispatch( OUString( ".uno:ClipboardFormatItems" ), diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index ccf81f154a1c..7139d6879e41 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -80,7 +80,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "InsertMode" ); + aArgs[0].Name = "InsertMode"; aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 8330399e1851..ad9c22b99286 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -324,7 +324,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "StatusBarFunc" ); + aArgs[0].Name = "StatusBarFunc"; aItem.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 64d46bed51a2..fc72cb621f8c 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ZoomSlider" ); + aArgs[0].Name = "ZoomSlider"; aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ZoomSlider" ); + aArgs[0].Name = "ZoomSlider"; aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9a96952f7c3d..ff644a5f0276 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -126,7 +126,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = OUString( "CreateNativeLink" ); + aFilterData[ 0 ].Name = "CreateNativeLink"; aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } @@ -673,9 +673,9 @@ void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const OUString& rRefe void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); - aFileName = OUString(); + aFileName = ""; aReferer = ""; - aFilterName = OUString(); + aFilterName = ""; } bool SdrGrafObj::IsLinkedGraphic() const diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 0c30e7ac9039..292925213f61 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -917,7 +917,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() // TODO/LATER: there should be possible to get current mediadescriptor settings from the object uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= OUString( aNewLinkURL ); xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 0ab0bd5f24ce..d4f199bf07e6 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -896,8 +896,8 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE Sequence< OUString > aSeq( SvxUnoTextBase::getSupportedServiceNames() ); sal_Int32 nIndex = aSeq.getLength(); aSeq.realloc( nIndex + 2 ); - aSeq[nIndex++] = OUString( "com.sun.star.table.cell" ); - aSeq[nIndex++] = OUString( "com.sun.star.drawing.cell" ); + aSeq[nIndex++] = "com.sun.star.table.cell"; + aSeq[nIndex++] = "com.sun.star.drawing.cell"; return aSeq; } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index ca3212ceeb8a..5ab1030a7e96 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -253,32 +253,32 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( "Width" ); + aProperties[0].Name = "Width"; aProperties[0].Handle = Property_Width; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( "OptimalWidth" ); + aProperties[1].Name = "OptimalWidth"; aProperties[1].Handle = Property_OptimalWidth; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( "IsVisible" ); + aProperties[2].Name = "IsVisible"; aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( "IsStartOfNewPage" ); + aProperties[3].Name = "IsStartOfNewPage"; aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( "Size" ); + aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Width; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( "OptimalSize" ); + aProperties[5].Name = "OptimalSize"; aProperties[5].Handle = Property_OptimalWidth; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 936c9ca05237..ab77a38b8997 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -327,32 +327,32 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( "Height" ); + aProperties[0].Name = "Height"; aProperties[0].Handle = Property_Height; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( "OptimalHeight" ); + aProperties[1].Name = "OptimalHeight"; aProperties[1].Handle = Property_OptimalHeight; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( "IsVisible" ); + aProperties[2].Name = "IsVisible"; aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( "IsStartOfNewPage" ); + aProperties[3].Name = "IsStartOfNewPage"; aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( "Size" ); + aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Height; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( "OptimalSize" ); + aProperties[5].Name = "OptimalSize"; aProperties[5].Handle = Property_OptimalHeight; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 8f4e8e855259..9a98163f0879 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -267,7 +267,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -462,9 +462,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) const OUString aCommand( ".uno:ExtrusionDepthDialog" ); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Depth" ); + aArgs[0].Name = "Depth"; aArgs[0].Value <<= mfDepth; - aArgs[1].Name = OUString( "Metric" ); + aArgs[1].Name = "Metric"; aArgs[1].Value <<= static_cast<sal_Int32>( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -532,7 +532,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -793,7 +793,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -938,7 +938,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index f6beef210d03..fd370d9423a7 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -656,7 +656,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = OUString( "FillStyle" ); + aArgs[0].Name = "FillStyle"; aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( @@ -701,7 +701,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = OUString( "FillGradient" ); + aArgs[0].Name = "FillGradient"; aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillGradient" ), @@ -724,7 +724,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = OUString( "FillHatch" ); + aArgs[0].Name = "FillHatch"; aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillHatch" ), @@ -748,7 +748,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = OUString( "FillBitmap" ); + aArgs[0].Name = "FillBitmap"; aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch(OUString(".uno:FillBitmap"), aArgs); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 9101a5e55af5..db5131b4b0e8 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -465,7 +465,7 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName() Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -701,7 +701,7 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 63eb13c4de40..ff4c35e5c103 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,7 +61,7 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "PersistentCopy" ); + aArgs[0].Name = "PersistentCopy"; aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) ); Dispatch( OUString( ".uno:FormatPaintbrush" ) , aArgs ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 38d2ec8ddb54..4eea7bddce37 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -354,7 +354,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "GrafMode" ); + aArgs[0].Name = "GrafMode"; aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 3d10cb337d33..5cc75f622055 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -129,7 +129,7 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "LineDash" ); + aArgs[0].Name = "LineDash"; aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), @@ -143,7 +143,7 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "XLineStyle" ); + aArgs[0].Name = "XLineStyle"; aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), @@ -504,7 +504,7 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "LineWidth" ); + aArgs[0].Name = "LineWidth"; aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 71b723605381..f004fe310e1d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -325,9 +325,9 @@ void TableWindow::PopupModeEnd() if ( !IsPopupModeCanceled() && nCol && nLine ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Columns" ); + aArgs[0].Name = "Columns"; aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( "Rows" ); + aArgs[1].Name = "Rows"; aArgs[1].Value = makeAny( sal_Int16( nLine )); TableDialog( aArgs ); @@ -685,9 +685,9 @@ void ColumnsWindow::PopupModeEnd() pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Columns" ); + aArgs[0].Name = "Columns"; aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( "Modifier" ); + aArgs[1].Name = "Modifier"; aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 )); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 4db2dbce6a52..a1f112f4cddb 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = OUString( "LineStart" ); + aArgs[0].Name = "LineStart"; pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = OUString( "LineEnd" ); + aArgs[0].Name = "LineEnd"; pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index e3401615d00a..36e257e5d876 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -121,7 +121,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "FontHeight.Height" ); + aArgs[0].Name = "FontHeight.Height"; aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -297,7 +297,7 @@ uno::Sequence< OUString > FontHeightToolBoxControl::getSupportedServiceNames_Sta throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -396,7 +396,7 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = OUString( ".uno:FontHeight" ); + aURL.Complete = ".uno:FontHeight"; xURLTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 21a55605d270..71d013cfb035 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -190,7 +190,7 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.drawing.GraphicExportFilter" ); + aSupportedServiceNames[0] = "com.sun.star.drawing.GraphicExportFilter"; return aSupportedServiceNames; } @@ -561,12 +561,12 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnWidth; - pDataValues->Name = OUString( "PixelWidth" ); + pDataValues->Name = "PixelWidth"; } else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Height" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnHeight; - pDataValues->Name = OUString( "PixelHeight" ); + pDataValues->Name = "PixelHeight"; } else if ( pDataValues->Name == "ExportOnlyBackground" ) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index af77a5269b1f..f1bf74f0f262 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -82,7 +82,7 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.xml.NamespaceMap" ); + aSupportedServiceNames[0] = "com.sun.star.xml.NamespaceMap"; return aSupportedServiceNames; } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 620ee9fcfdd6..8398d75204d6 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -139,7 +139,7 @@ uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryItem" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryItem"; return aSeq; } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index eb03c477f361..692305232dbc 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -84,7 +84,7 @@ uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryTheme" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryTheme"; return aSeq; } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index af3a15ea8268..e5ad2d89002a 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -90,7 +90,7 @@ SVX_DLLPUBLIC uno::Sequence< OUString > GalleryThemeProvider::getSupportedServic { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryThemeProvider" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryThemeProvider"; return aSeq; } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index b26c811b7e15..b325dc016d31 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -786,7 +786,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& r sal_Int32 nUser = rURL.indexOf( '?', 0 ); if ( nUser >= 0 ) { - aURL = OUString( rURL.copy( 0, nUser ) ); + aURL = rURL.copy( 0, nUser ); nUser++; aUserData = rURL.copy( nUser, rURL.getLength() - nUser ); } @@ -875,7 +875,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOut if( !aId.isEmpty() ) { - aRet = OUString( XML_GRAPHICOBJECT_URL_BASE ); + aRet = XML_GRAPHICOBJECT_URL_BASE; aRet += aId; } } @@ -1049,8 +1049,8 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames( { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); + aSupportedServiceNames[0] = "com.sun.star.document.GraphicObjectResolver"; + aSupportedServiceNames[1] = "com.sun.star.document.BinaryStreamResolver"; return aSupportedServiceNames; } @@ -1070,8 +1070,8 @@ Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames( { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); + aSupportedServiceNames[0] = "com.sun.star.document.GraphicObjectResolver"; + aSupportedServiceNames[1] = "com.sun.star.document.BinaryStreamResolver"; return aSupportedServiceNames; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index acb51e8ecedf..23fd6de0beb0 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -792,9 +792,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "LineDash" ); + aPropSeq[1].Name = "LineDash"; aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -2712,9 +2712,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "FillGradient" ); + aPropSeq[1].Name = "FillGradient"; aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3197,9 +3197,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "FillHatch" ); + aPropSeq[1].Name = "FillHatch"; aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index e98c4d5bbbea..f8c53d795217 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -430,8 +430,7 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = OUString( - UNO_NAME_GRAPHOBJ_URLPREFIX); + aURL = UNO_NAME_GRAPHOBJ_URLPREFIX; aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); @@ -454,11 +453,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = OUString( "FillBitmapURL" ); + aPropSeq[1].Name = "FillBitmapURL"; aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = OUString( "Bitmap" ); + aPropSeq[2].Name = "Bitmap"; aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index e182ed64e5d1..c88ec428ed65 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -516,7 +516,7 @@ OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) } else { - aValue = OUString( "<empty!?>" ); + aValue = "<empty!?>"; } aRet += aValue; diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index fb0800612afb..c6275c3221b9 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -28,7 +28,7 @@ OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw( uno::RuntimeEx uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSeq( 1 ); - aSeq[0] = OUString( "com.sun.star.document.ExportFilter" ); + aSeq[0] = "com.sun.star.document.ExportFilter"; return aSeq; } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 2d9086121986..8ba76e410507 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2438,7 +2438,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( if (bExcept ) { uno::RuntimeException aExcept; - aExcept.Message = OUString( "No default value for: " ) + pNames[nProp]; + aExcept.Message = "No default value for: " + pNames[nProp]; throw aExcept; } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index e51fdf9a2fac..ea8ea42a0634 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -248,7 +248,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyVLinkSet |= bColorSet; } - OUString sTmp = OUString( OOO_STRING_SVTOOLS_HTML_anchor ) + ":" + "link"; + OUString sTmp = OOO_STRING_SVTOOLS_HTML_anchor ":link"; pStyleEntry = GetTag( sTmp ); if( pStyleEntry ) @@ -262,7 +262,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyLinkSet |= bColorSet; } - sTmp = OUString( OOO_STRING_SVTOOLS_HTML_anchor ) + ":" + "visited"; + sTmp = OOO_STRING_SVTOOLS_HTML_anchor ":visited"; pStyleEntry = GetTag( sTmp ); if( pStyleEntry ) @@ -1542,7 +1542,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, { do { - aName = OUString( "first-letter" ) + " " + OUString::number( (sal_Int32)(++nDropCapCnt) ); + aName = "first-letter " + OUString::number( (sal_Int32)(++nDropCapCnt) ); } while( pDoc->FindCharFmtByName(aName) ); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 1a1e200546f6..a971029b61a8 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -360,7 +360,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) sal_Int32 nIndex = 0; Reference < XIndexContainer > xBox = IndexedPropertyValues::create( comphelper::getProcessComponentContext() ); - pValue[nIndex].Name = OUString( "Views"); + pValue[nIndex].Name = "Views"; pValue[nIndex++].Value <<= xBox; SwDoc *pDoc = getDoc(); @@ -370,16 +370,16 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" ); - pValue[nIndex].Name = OUString( "ViewAreaTop"); + pValue[nIndex].Name = "ViewAreaTop"; pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Top() ) : rRect.Top(); - pValue[nIndex].Name = OUString( "ViewAreaLeft"); + pValue[nIndex].Name = "ViewAreaLeft"; pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Left() ) : rRect.Left(); - pValue[nIndex].Name = OUString( "ViewAreaWidth"); + pValue[nIndex].Name = "ViewAreaWidth"; pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetWidth() ) : rRect.GetWidth(); - pValue[nIndex].Name = OUString( "ViewAreaHeight"); + pValue[nIndex].Name = "ViewAreaHeight"; pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetHeight() ) : rRect.GetHeight(); // "show redline mode" cannot simply be read from the document @@ -397,11 +397,11 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) } } - pValue[nIndex].Name = OUString( "ShowRedlineChanges"); + pValue[nIndex].Name = "ShowRedlineChanges"; pValue[nIndex++].Value.setValue( &bShowRedlineChanges, ::getBooleanCppuType() ); sal_Bool bInBrowse = pDoc->get(IDocumentSettingAccess::BROWSE_MODE); - pValue[nIndex].Name = OUString( "InBrowseMode"); + pValue[nIndex].Name = "InBrowseMode"; pValue[nIndex++].Value.setValue( &bInBrowse, ::getBooleanCppuType() ); if ( nIndex < NUM_EXPORTED_VIEW_SETTINGS ) diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 948d5c776a36..5dd71951ecb7 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -77,8 +77,7 @@ SwTbxInsertCtrl::~SwTbxInsertCtrl() void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException) { ToolBox& rTbx = GetToolBox(); - OUString aSlotURL( "slot:" ); - aSlotURL += OUString::number( nLastSlotId); + OUString aSlotURL = "slot:" + OUString::number( nLastSlotId); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rTbx.SetItemImage(GetId(), aImage); @@ -103,8 +102,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/, if( nLastSlotId ) nId = nLastSlotId; - OUString aSlotURL( "slot:" ); - aSlotURL += OUString::number( nId); + OUString aSlotURL = "slot:" + OUString::number( nId); ToolBox& rBox = GetToolBox(); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rBox.SetItemImage(GetId(), aImage); @@ -564,7 +562,7 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) SfxBoolItem aNext(FN_SCROLL_NEXT_PREV, NID_NEXT == nSet); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ScrollNextPrev" ); + aArgs[0].Name = "ScrollNextPrev"; aNext.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), @@ -739,7 +737,7 @@ void SwZoomBox_Impl::Select() { Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "PreviewZoom" ); + aArgs[0].Name = "PreviewZoom"; aItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index c7930b8c1291..701ea542c54b 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1477,56 +1477,56 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe beans::PropertyValue *pValue = rSequence.getArray(); sal_uInt16 nViewID( GetViewFrame()->GetCurViewId()); - pValue->Name = OUString( "ViewId" ); + pValue->Name = "ViewId"; OUStringBuffer sBuffer ( OUString( "view" ) ); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pValue->Value <<= sBuffer.makeStringAndClear(); pValue++;nIndex++; - pValue->Name = OUString( "ViewLeft" ); + pValue->Name = "ViewLeft"; pValue->Value <<= TWIP_TO_MM100 ( rRect.Left() ); pValue++;nIndex++; - pValue->Name = OUString( "ViewTop" ); + pValue->Name = "ViewTop"; pValue->Value <<= TWIP_TO_MM100 ( rRect.Top() ); pValue++;nIndex++; - pValue->Name = OUString( "VisibleLeft" ); + pValue->Name = "VisibleLeft"; pValue->Value <<= TWIP_TO_MM100 ( rVis.Left() ); pValue++;nIndex++; - pValue->Name = OUString( "VisibleTop" ); + pValue->Name = "VisibleTop"; pValue->Value <<= TWIP_TO_MM100 ( rVis.Top() ); pValue++;nIndex++; - pValue->Name = OUString( "VisibleRight" ); + pValue->Name = "VisibleRight"; pValue->Value <<= TWIP_TO_MM100 ( bBrowse ? LONG_MIN : rVis.Right() ); pValue++;nIndex++; - pValue->Name = OUString( "VisibleBottom" ); + pValue->Name = "VisibleBottom"; pValue->Value <<= TWIP_TO_MM100 ( bBrowse ? LONG_MIN : rVis.Bottom() ); pValue++;nIndex++; - pValue->Name = OUString( "ZoomType" ); + pValue->Name = "ZoomType"; const sal_Int16 nZoomType = static_cast< sal_Int16 >(m_pWrtShell->GetViewOptions()->GetZoomType()); pValue->Value <<= nZoomType; pValue++;nIndex++; - pValue->Name = OUString( "ViewLayoutColumns" ); + pValue->Name = "ViewLayoutColumns"; const sal_Int16 nViewLayoutColumns = static_cast< sal_Int16 >(m_pWrtShell->GetViewOptions()->GetViewLayoutColumns()); pValue->Value <<= nViewLayoutColumns; pValue++;nIndex++; - pValue->Name = OUString( "ViewLayoutBookMode" ); + pValue->Name = "ViewLayoutBookMode"; const sal_Bool bIsViewLayoutBookMode = m_pWrtShell->GetViewOptions()->IsViewLayoutBookMode(); pValue->Value.setValue( &bIsViewLayoutBookMode, ::getBooleanCppuType() ); pValue++;nIndex++; - pValue->Name = OUString( "ZoomFactor" ); + pValue->Name = "ZoomFactor"; pValue->Value <<= static_cast < sal_Int16 > (m_pWrtShell->GetViewOptions()->GetZoom()); pValue++;nIndex++; - pValue->Name = OUString( "IsSelectedFrame" ); + pValue->Name = "IsSelectedFrame"; const sal_Bool bIsSelected = FRMTYPE_NONE == m_pWrtShell->GetSelFrmType() ? sal_False : sal_True; pValue->Value.setValue ( &bIsSelected, ::getBooleanCppuType() ); nIndex++; diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index a190eff2f41f..60f31baaa639 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -37,7 +37,7 @@ uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() thr // resolved by rtti! uno::Sequence< OUString > aRet ( 1 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.text.TextDocument" ); + pArray[0] = "com.sun.star.text.TextDocument"; return aRet; } @@ -66,7 +66,7 @@ uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() thro // resolved by rtti! uno::Sequence< OUString > aRet ( 1 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.text.WebDocument" ); + pArray[0] = "com.sun.star.text.WebDocument"; return aRet; } @@ -93,7 +93,7 @@ uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() t { uno::Sequence< OUString > aRet ( 1 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.text.GlobalDocument" ); + pArray[0] = "com.sun.star.text.GlobalDocument"; return aRet; } diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index 87bd107c4e59..01a8985c6961 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -155,7 +155,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) aViewLayout.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ViewLayout" ); + aArgs[0].Name = "ViewLayout"; aArgs[0].Value = a; execute( aArgs ); diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx index f5d6e9c9ee29..90e6ba981572 100644 --- a/sw/source/ui/vba/vbacheckbox.cxx +++ b/sw/source/ui/vba/vbacheckbox.cxx @@ -79,7 +79,7 @@ SwVbaCheckBox::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString( "ooo.vba.word.CheckBox" ); + aServiceNames[ 0 ] = "ooo.vba.word.CheckBox"; } return aServiceNames; } diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 06b532e8862e..712f2d296c92 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -478,8 +478,8 @@ throw (::com::sun::star::uno::RuntimeException) Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); // Properties in a sequence must be sorted! - aProps[0] = OUString( "Height" ); - aProps[1] = OUString( "Width" ); + aProps[0] = "Height"; + aProps[1] = "Width"; aValues[0] <<= aAppFontSize.Height(); aValues[1] <<= aAppFontSize.Width(); @@ -504,8 +504,8 @@ throw (::com::sun::star::uno::RuntimeException) mbPosModified = true; Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = OUString( "PositionX" ); - aProps[1] = OUString( "PositionY" ); + aProps[0] = "PositionX"; + aProps[1] = "PositionY"; aValues[0] <<= aTmp.Width(); aValues[1] <<= aTmp.Height(); diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index e7c8c78807f9..c3ca4552988b 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -265,8 +265,8 @@ throw (::com::sun::star::uno::RuntimeException) Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); // Properties in a sequence must be sorted! - aProps[0] = OUString( "Height" ); - aProps[1] = OUString( "Width" ); + aProps[0] = "Height"; + aProps[1] = "Width"; aValues[0] <<= aAppFontSize.Height(); aValues[1] <<= aAppFontSize.Width(); @@ -291,8 +291,8 @@ throw (::com::sun::star::uno::RuntimeException) mbPosModified = true; Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = OUString( "PositionX" ); - aProps[1] = OUString( "PositionY" ); + aProps[0] = "PositionX"; + aProps[1] = "PositionY"; aValues[0] <<= aTmp.Width(); aValues[1] <<= aTmp.Height(); diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index 73d99a8d2973..5abe193df198 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -74,8 +74,8 @@ static gboolean timed_out( void * ) void TestTeleTubes::setUp() { g_timeout_add_seconds (10, timed_out, NULL); - maTestConfigIniURL = OUString( "file://" + - OUString::createFromAscii( getenv("SRCDIR") ) + "/tubes/qa/test-config.ini"); + maTestConfigIniURL = "file://" + + OUString::createFromAscii( getenv("SRCDIR") ) + "/tubes/qa/test-config.ini"; rtl::Bootstrap aTestConfig( maTestConfigIniURL ); TeleManager::addSuffixToNames( "TeleTest"); diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 99bb459f4144..4394ae148c62 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -387,7 +387,7 @@ void OFileAccess::createFolder( const OUString& NewFolderURL ) Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - pNames[0] = OUString( "Title" ); + pNames[0] = "Title"; Sequence< Any > aValues(1); Any* pValues = aValues.getArray(); pValues[0] = makeAny( OUString( aTitle ) ); @@ -660,8 +660,7 @@ bool OFileAccess::createNewFile( const OUString & rParentURL, Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - pNames[0] = OUString( - "Title" ); + pNames[0] = "Title"; Sequence< Any > aValues(1); Any* pValues = aValues.getArray(); pValues[0] = makeAny( OUString( rTitle ) ); @@ -769,7 +768,7 @@ Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMu Sequence< OUString > FileAccess_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString( SERVICE_NAME ); + seqNames.getArray()[0] = SERVICE_NAME; return seqNames; } diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 9809c2e5b534..771548619527 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -1543,7 +1543,7 @@ namespace cmis OUString Content::getParentURL( ) { SAL_INFO( "ucb.ucp.cmis", "Content::getParentURL()" ); - OUString parentUrl = OUString( "/" ); + OUString parentUrl = "/"; if ( m_sObjectPath == "/" ) return parentUrl; else @@ -1823,13 +1823,13 @@ namespace cmis beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); // file - seq[0].Type = OUString(CMIS_FILE_TYPE); + seq[0].Type = CMIS_FILE_TYPE; seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = OUString(CMIS_FOLDER_TYPE); + seq[1].Type = CMIS_FOLDER_TYPE; seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index c0d172ecb6a7..ad3290962a92 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -184,8 +184,8 @@ namespace ucb { namespace ucp { namespace ext Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aServiceNames(2); - aServiceNames[0] = OUString( "com.sun.star.ucb.Content" ); - aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContent" ); + aServiceNames[0] = "com.sun.star.ucb.Content"; + aServiceNames[1] = "com.sun.star.ucb.ExtensionContent"; return aServiceNames; } @@ -629,7 +629,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = OUString( "IsFolder" ); + aProps[0].Name = "IsFolder"; Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); bIsFolder = xRow->getBoolean(1); } @@ -653,7 +653,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = OUString( "ContentType" ); + aProps[0].Name = "ContentType"; Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); m_aContentType.reset( xRow->getString(1) ); } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 573ac13acdf6..a65e88966e26 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -172,7 +172,7 @@ namespace ucb { namespace ucp { namespace ext // obtain the properties which our result set is set up for from the wrapped content Sequence< OUString > aPropertyNames(1); - aPropertyNames[0] = OUString( "Title" ); + aPropertyNames[0] = "Title"; const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index df0f149a857c..66d3e4b72535 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -77,8 +77,8 @@ namespace ucb { namespace ucp { namespace ext Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aServiceNames(2); - aServiceNames[0] = OUString( "com.sun.star.ucb.ContentProvider" ); - aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContentProvider" ); + aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; + aServiceNames[1] = "com.sun.star.ucb.ExtensionContentProvider"; return aServiceNames; } diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 42f654bb6d78..298adc16a593 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -291,7 +291,7 @@ XStream_impl::closeStream( if( err != osl::FileBase::E_None ) { io::IOException ex; - ex.Message = OUString( "could not close file"); + ex.Message = "could not close file"; throw ex; } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 96b747140109..9bbba07ba555 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -260,8 +260,8 @@ XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) { uno::Sequence< OUString > aSNS( 2 ); - aSNS[ 0 ] = OUString( "com.sun.star.ucb.DefaultHierarchyDataSource" ); - aSNS[ 1 ] = OUString( "com.sun.star.ucb.HierarchyDataSource" ); + aSNS[ 0 ] = "com.sun.star.ucb.DefaultHierarchyDataSource"; + aSNS[ 1 ] = "com.sun.star.ucb.HierarchyDataSource"; return aSNS; } @@ -328,7 +328,7 @@ HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) // Create view to root node. beans::PropertyValue aProp; - aProp.Name = OUString( CFGPROPERTY_NODEPATH ); + aProp.Name = CFGPROPERTY_NODEPATH; aProp.Value <<= OUString( CONFIG_DATA_ROOT_KEY ); uno::Sequence< uno::Any > aArguments( 1 ); @@ -355,8 +355,8 @@ HierarchyDataSource::getAvailableServiceNames() throw ( uno::RuntimeException ) { uno::Sequence< OUString > aNames( 2 ); - aNames[ 0 ] = OUString( READ_SERVICE_NAME ); - aNames[ 1 ] = OUString( READWRITE_SERVICE_NAME ); + aNames[ 0 ] = READ_SERVICE_NAME; + aNames[ 1 ] = READWRITE_SERVICE_NAME; return aNames; } @@ -483,7 +483,7 @@ HierarchyDataSource::createInstanceWithArguments( aNewArgs.realloc( nLen + 1 ); beans::PropertyValue aProp; - aProp.Name = OUString( CFGPROPERTY_LAZYWRITE ); + aProp.Name = CFGPROPERTY_LAZYWRITE; aProp.Value <<= sal_True; aNewArgs[ nLen ] <<= aProp; } @@ -726,8 +726,8 @@ XSERVICEINFO_NOFACTORY_IMPL_0( OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) { uno::Sequence< OUString > aSNS( 2 ); - aSNS[ 0 ] = OUString( READ_SERVICE_NAME ); - aSNS[ 1 ] = OUString( READWRITE_SERVICE_NAME ); + aSNS[ 0 ] = READ_SERVICE_NAME; + aSNS[ 1 ] = READWRITE_SERVICE_NAME; return aSNS; } diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 9865d708aab1..721270380012 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -226,7 +226,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( "nodepath" ); + aProperty.Name = "nodepath" ; aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 62300681b218..31d3c95de95e 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -76,7 +76,7 @@ void PackageUri::init() const if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) ) { // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; return; } @@ -88,7 +88,7 @@ void PackageUri::init() const ( m_aUri[ PACKAGE_URL_SCHEME_LENGTH + 2 ] != '/' ) ) { // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; return; } @@ -127,7 +127,7 @@ void PackageUri::init() const // Only <scheme>:/// - Empty authority // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; return; } else if ( nEnd == ( aPureUri.getLength() - 1 ) ) @@ -137,7 +137,7 @@ void PackageUri::init() const // Only <scheme>://// or <scheme>://<something>// // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; return; } @@ -158,7 +158,7 @@ void PackageUri::init() const nStart, aPureUri.getLength() - nStart, aNormPackage ); m_aPackage = ::ucb_impl::urihelper::decodeSegment( aNormPackage ); - m_aPath = OUString( "/" ); + m_aPath = "/"; m_aUri = m_aUri.replaceAt( 0, ( nParam >= 0 ) ? nParam @@ -188,7 +188,7 @@ void PackageUri::init() const || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( "." ) ) ) { // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; return; } @@ -225,7 +225,7 @@ void PackageUri::init() const else { // error, but remember that we did a init(). - m_aPath = OUString( "/" ); + m_aPath = "/"; } } } diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 92b7cad3684d..c08f9cf5088a 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -76,7 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; - aDocEvent.EventName = OUString( "OfficeDocumentsListener::notifyClosing" ); + aDocEvent.EventName = "OfficeDocumentsListener::notifyClosing"; m_pManager->notifyEvent( aDocEvent ); } diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 9b6064ad167b..264e2a3c2371 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -136,7 +136,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = OUString( "DAV:" ); + aNameSpace = "DAV:"; } } diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index bcceddc1cd65..e0376ccb9bd1 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -41,7 +41,7 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c } uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, args); - OUString sMessage = OUString( "loading failed: " ) + rURL; + OUString sMessage = "loading failed: " + rURL; CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is()); return xComponent; } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index ba04027ead45..c6f32074436e 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -110,7 +110,7 @@ DefaultFontConfiguration::DefaultFontConfiguration() m_xConfigProvider = theDefaultProvider::get( xContext ); Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = OUString( "nodepath" ); + aVal.Name = "nodepath"; aVal.Value <<= OUString( "/org.openoffice.VCL/DefaultFonts" ); aArgs.getArray()[0] <<= aVal; m_xConfigAccess = @@ -375,7 +375,7 @@ FontSubstConfiguration::FontSubstConfiguration() : m_xConfigProvider = theDefaultProvider::get( xContext ); Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = OUString( "nodepath" ); + aVal.Name = "nodepath"; aVal.Value <<= OUString( "/org.openoffice.VCL/FontSubstitutions" ); aArgs.getArray()[0] <<= aVal; m_xConfigAccess = diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 6f1373a7a480..8850d920639f 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -947,7 +947,7 @@ UUIInteractionHelper::getInteractionHandlerList( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( "nodepath" ); + aProperty.Name = "nodepath"; aProperty.Value <<= aFullPath.makeStringAndClear(); aArguments[ 0 ] <<= aProperty; diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index b57ef0e8737b..3bfc5312e48c 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -274,7 +274,7 @@ void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException) uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); - OUString url = OUString( ".uno:CloseDoc"); + OUString url = ".uno:CloseDoc"; dispatchRequests(xModel,url); */ } diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index c48fa325bae4..a0613650775b 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -255,7 +255,7 @@ public: // Clobber the UI fonts #if 0 psp::FastPrintFontInfo aInfo; - aInfo.m_aFamilyName = OUString( "Roboto" ); + aInfo.m_aFamilyName = "Roboto"; aInfo.m_eItalic = ITALIC_NORMAL; aInfo.m_eWeight = WEIGHT_NORMAL; aInfo.m_eWidth = WIDTH_NORMAL; diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 6914865badbc..3cfcb3c1fe94 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -88,12 +88,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = OUString( "OK" );break; - case BUTTON_ABORT: aText = OUString( "Abort" );break; - case BUTTON_CANCEL: aText = OUString( "Cancel" );break; - case BUTTON_RETRY: aText = OUString( "Retry" );break; - case BUTTON_YES: aText = OUString( "Yes" );break; - case BUTTON_NO : aText = OUString( "No" );break; + case BUTTON_OK: aText = "OK";break; + case BUTTON_ABORT: aText = "Abort";break; + case BUTTON_CANCEL: aText = "Cancel";break; + case BUTTON_RETRY: aText = "Retry";break; + case BUTTON_YES: aText = "Yes";break; + case BUTTON_NO : aText = "No";break; } } return aText.isEmpty() ? nil : CreateNSString( aText); diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index e5187c1d1dcc..d5e4e0838b25 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -58,9 +58,9 @@ OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool b { aLibName += aDLLSuffix; } - aLibName += OUString( ".dll" ); + aLibName += ".dll"; #else - aLibName = OUString( "lib" ); + aLibName = "lib"; aLibName += OUString::createFromAscii( pModName ); if ( bSUPD ) { diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index b2da4d8ed730..217888ee1b6c 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -132,7 +132,7 @@ Reference< XInterface > openConfig(const char* sPackage) PropertyValue aParam ; // define cfg path for open - aParam.Name = OUString( "nodepath" ); + aParam.Name = "nodepath"; if (rtl_str_compareIgnoreAsciiCase(sPackage, "types") == 0) aParam.Value <<= OUString( "/org.openoffice.TypeDetection.Types/Types" ); if (rtl_str_compareIgnoreAsciiCase(sPackage, "filters") == 0) diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index f63963527666..3e7ca7f12dbc 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -59,7 +59,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co // creation arguments: nodepath PropertyValue aPathArgument; - aPathArgument.Name = OUString( "nodepath" ); + aPathArgument.Name = "nodepath"; aPathArgument.Value = aAny; Sequence< Any > aArguments( 1 ); @@ -124,14 +124,14 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) // creation arguments: nodepath PropertyValue aPathArgument; aAny <<= sTree; - aPathArgument.Name = OUString( "nodepath" ); + aPathArgument.Name = "nodepath"; aPathArgument.Value = aAny; // creation arguments: commit mode PropertyValue aModeArgument; sal_Bool bAsyncron = sal_True; aAny <<= bAsyncron; - aModeArgument.Name = OUString( "lazywrite" ); + aModeArgument.Name = "lazywrite"; aModeArgument.Value = aAny; Sequence< Any > aArguments( 2 ); diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index e6d46e7cd578..ccdb11261f11 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -390,11 +390,11 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< graphic::XGraphicProvider > xProv( graphic::GraphicProvider::create( xContext ) ); - uno::Sequence< beans::PropertyValue > aLoadProps( 1 ); - OUString aURL( "private:memorygraphic/" ); + uno::Sequence< beans::PropertyValue > aLoadProps( 1 ); + OUString aURL = "private:memorygraphic/" + OUString::number( reinterpret_cast< sal_Int64 >( this ) ); - aLoadProps[ 0 ].Name = OUString( "URL" ); - aLoadProps[ 0 ].Value <<= ( aURL += OUString::number( reinterpret_cast< sal_Int64 >( this ) ) ); + aLoadProps[ 0 ].Name = "URL"; + aLoadProps[ 0 ].Value <<= aURL; xRet = xProv->queryGraphic( aLoadProps ); } diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index ca0cc5cd556c..9ac3839b9238 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -87,7 +87,7 @@ int OldStylePrintAdaptor::getPageCount() const Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage ) const { Sequence< PropertyValue > aRet( 1 ); - aRet[0].Name = OUString( "PageSize" ); + aRet[0].Name = "PageSize"; if( i_nPage < int(mpData->maPages.size() ) ) aRet[0].Value = makeAny( mpData->maPages[i_nPage].maPageSize ); else diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index f5ce429bbd52..7b06e67f0c8a 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -151,7 +151,7 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = OUString( "nodepath" ); + aVal.Name = "nodepath"; if( i_bFile ) aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/File" ); else diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index f08bb250d8b2..ad2329c1108e 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1378,7 +1378,7 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P if( aMergeSet.find( OUString( "IsFirstPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = OUString( "IsFirstPage" ); + aVal.Name = "IsFirstPage"; aVal.Value <<= mpImplData->mbFirstPage; aResult[nCur++] = aVal; } @@ -1386,7 +1386,7 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P if( aMergeSet.find( OUString( "IsLastPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = OUString( "IsLastPage" ); + aVal.Name = "IsLastPage"; aVal.Value <<= mpImplData->mbLastPage; aResult[nCur++] = aVal; } @@ -1394,7 +1394,7 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P if( aMergeSet.find( OUString( "IsPrinter" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = OUString( "IsPrinter" ); + aVal.Name = "IsPrinter"; aVal.Value <<= sal_True; aResult[nCur++] = aVal; } @@ -1817,7 +1817,7 @@ void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyV sal_Int32 nIndex = io_rProps.getLength(); io_rProps.realloc( nIndex+1 ); PropertyValue aVal; - aVal.Name = OUString( "ExtraPrintUIOptions" ); + aVal.Name = "ExtraPrintUIOptions"; aVal.Value = makeAny( m_aUIProperties ); io_rProps[ nIndex ] = aVal; } @@ -1853,51 +1853,51 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< O sal_Int32 nUsed = 0; if( !i_rTitle.isEmpty() ) { - aCtrl[nUsed ].Name = OUString( "Text" ); + aCtrl[nUsed ].Name = "Text"; aCtrl[nUsed++].Value = makeAny( i_rTitle ); } if( i_rHelpIds.getLength() ) { - aCtrl[nUsed ].Name = OUString( "HelpId" ); + aCtrl[nUsed ].Name = "HelpId"; aCtrl[nUsed++].Value = makeAny( i_rHelpIds ); } - aCtrl[nUsed ].Name = OUString( "ControlType" ); + aCtrl[nUsed ].Name = "ControlType"; aCtrl[nUsed++].Value = makeAny( i_rType ); - aCtrl[nUsed ].Name = OUString( "ID" ); + aCtrl[nUsed ].Name = "ID"; aCtrl[nUsed++].Value = makeAny( i_rIDs ); if( i_pVal ) { - aCtrl[nUsed ].Name = OUString( "Property" ); + aCtrl[nUsed ].Name = "Property"; aCtrl[nUsed++].Value = makeAny( *i_pVal ); } if( !i_rControlOptions.maDependsOnName.isEmpty() ) { - aCtrl[nUsed ].Name = OUString( "DependsOnName" ); + aCtrl[nUsed ].Name = "DependsOnName"; aCtrl[nUsed++].Value = makeAny( i_rControlOptions.maDependsOnName ); if( i_rControlOptions.mnDependsOnEntry != -1 ) { - aCtrl[nUsed ].Name = OUString( "DependsOnEntry" ); + aCtrl[nUsed ].Name = "DependsOnEntry"; aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mnDependsOnEntry ); } if( i_rControlOptions.mbAttachToDependency ) { - aCtrl[nUsed ].Name = OUString( "AttachToDependency" ); + aCtrl[nUsed ].Name = "AttachToDependency"; aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mbAttachToDependency ); } } if( !i_rControlOptions.maGroupHint.isEmpty() ) { - aCtrl[nUsed ].Name = OUString( "GroupingHint" ); + aCtrl[nUsed ].Name = "GroupingHint"; aCtrl[nUsed++].Value <<= i_rControlOptions.maGroupHint; } if( i_rControlOptions.mbInternalOnly ) { - aCtrl[nUsed ].Name = OUString( "InternalUIOnly" ); + aCtrl[nUsed ].Name = "InternalUIOnly"; aCtrl[nUsed++].Value <<= sal_True; } if( ! i_rControlOptions.mbEnabled ) { - aCtrl[nUsed ].Name = OUString( "Enabled" ); + aCtrl[nUsed ].Name = "Enabled"; aCtrl[nUsed++].Value <<= sal_False; } @@ -1974,11 +1974,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = "Choices"; aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = "ChoicesDisabled"; aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } @@ -2000,11 +2000,11 @@ Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rID, UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = "Choices"; aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = "ChoicesDisabled"; aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } @@ -2030,9 +2030,9 @@ Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, { sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 2 ); - aOpt.maAddProps[nUsed ].Name = OUString( "MinValue" ); + aOpt.maAddProps[nUsed ].Name = "MinValue"; aOpt.maAddProps[nUsed++].Value = makeAny( i_nMinValue ); - aOpt.maAddProps[nUsed ].Name = OUString( "MaxValue" ); + aOpt.maAddProps[nUsed ].Name = "MaxValue"; aOpt.maAddProps[nUsed++].Value = makeAny( i_nMaxValue ); } diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index a068967b79ef..bb8772411dcf 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -704,7 +704,7 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) - aRet = OUString( "???" ); + aRet = "???"; else { aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym ); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index b29b8645f5fe..8a6a0a40dcdf 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -421,7 +421,7 @@ void PPDParser::scanPPDDir( const OUString& rDir ) { OUString aFileURL, aFileName; osl::FileStatus::Type eType = osl::FileStatus::Unknown; - OUString aURL = OUString(rDir + "/" + aStatus.getFileName()); + OUString aURL = rDir + "/" + aStatus.getFileName(); if(resolveLink( aURL, aFileURL, aFileName, eType ) == osl::FileBase::E_None) { @@ -1972,7 +1972,7 @@ int PPDContext::getRenderResolution() const void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set - rPaper = OUString( "A4" ); + rPaper = "A4"; rWidth = 595; rHeight = 842; if( m_pParser ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 3255f859c776..ee04b72a6c27 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2964,7 +2964,7 @@ void X11SalFrame::beginUnicodeSequence() if( !rSeq.isEmpty() ) endUnicodeSequence(); - rSeq = OUString( "u" ); + rSeq = "u"; if( ! aDeleteWatch.isDeleted() ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 184741946556..dc9c889849c7 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -932,7 +932,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno if( !bExtensionTypedIn && ( sToken != "*" ) ) { //if the filename does not already have the auto extension, stick it on - OUString sExtension = OUString( "." ) + sToken; + OUString sExtension = "." + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx ); @@ -1527,7 +1527,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += OUString( ": " ); + aLabel += ": "; aLabel += OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index ff47df9fbb83..cbbcd3a9b64c 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -159,7 +159,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes { uno::Reference<beans::XPropertySetInfo> xPropsInfo = xDocProps->getPropertySetInfo(); - const OUString& aGrabBagPropName = OUString("InteropGrabBag"); + const OUString aGrabBagPropName = "InteropGrabBag"; if( xPropsInfo.is() && xPropsInfo->hasPropertyByName( aGrabBagPropName ) ) { uno::Sequence<beans::PropertyValue> aGrabBag; diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 50dcaccd24b2..445bdeef03a6 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -136,7 +136,7 @@ uno::Sequence< OUString > WriterFilterDetection_getSupportedServiceNames( ) thr { uno::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index 44e22838cf05..5485448e20a4 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -181,8 +181,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "CDRImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index 7efdb8ad0ac3..5f8ad32bbca1 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -181,8 +181,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "CMXImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index 733d936fed2e..62beb4089119 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -177,8 +177,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "FreehandImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index ed09f0a5697b..3e41dd8062f9 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -177,8 +177,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "MSPUBImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 2c38c45b897a..b1f5266f9213 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -177,8 +177,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "VisioImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index 5636650da04b..6c2cc2152416 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -183,8 +183,8 @@ throw (RuntimeException) SAL_INFO("writerperfect", "WPGImportFilter_getSupportedServiceNames"); Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index aa0232947b57..0bf53edb495f 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -220,8 +220,8 @@ throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } #undef SERVICE_NAME2 diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index d6af1b4bb08d..e5d739996d2a 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -193,8 +193,8 @@ throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } #undef SERVICE_NAME2 diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 452f3a66054e..0336dff8200d 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -294,8 +294,8 @@ throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 589125c17b38..de22e036d10e 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -246,8 +246,8 @@ throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); - pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } @@ -378,7 +378,7 @@ throw (RuntimeException) { Sequence < OUString > aRet(1); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( "com.sun.star.ui.dialogs.FilterOptionsDialog" ); + pArray[0] = "com.sun.star.ui.dialogs.FilterOptionsDialog"; return aRet; } diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 7a844936a45c..42139af1a21d 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -140,8 +140,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] - = OUString( MYUCP_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = MYUCP_CONTENT_SERVICE_NAME ; return aSNS; } @@ -486,8 +485,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else if ( rProp.Name == "SearchScopes" ) { uno::Sequence< OUString > seq( 2 ); - seq[0] = OUString( "Heading" ); - seq[1] = OUString( "FullText" ); + seq[0] = "Heading"; + seq[1] = "FullText"; uno::Any aAny; aAny <<= seq; xRow->appendObject( rProp,aAny ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index a257d1e8da68..9cd9cf2e8ae1 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -495,12 +495,12 @@ ResultSetBase::getPropertySetInfo() throw( uno::RuntimeException) { uno::Sequence< beans::Property > seq(2); - seq[0].Name = OUString( "RowCount" ); + seq[0].Name = "RowCount"; seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[1].Name = OUString( "IsRowCountFinal" ); + seq[1].Name = "IsRowCountFinal"; seq[1].Handle = -1; seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Attributes = beans::PropertyAttribute::READONLY; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index e9b3f3e43d4a..567fe58906c0 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -314,7 +314,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte } sal_Int32 replIdx = OUString( "#HLP#" ).getLength(); - OUString replWith = OUString( "vnd.sun.star.help://" ); + OUString replWith = "vnd.sun.star.help://"; int nResultCount = aCompleteResultVector.size(); for( int r = 0 ; r < nResultCount ; ++r ) @@ -328,7 +328,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte m_aIdents.resize( m_aPath.size() ); Command aCommand; - aCommand.Name = OUString( "getPropertyValues" ); + aCommand.Name = "getPropertyValues"; aCommand.Argument <<= m_sProperty; for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow ) diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index aace7a6236a4..a9cdba8ea434 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -46,7 +46,7 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext m_aIdents.resize( m_aPath.size() ); Command aCommand; - aCommand.Name = OUString( "getPropertyValues" ); + aCommand.Name = "getPropertyValues"; aCommand.Argument <<= m_sProperty; for( sal_uInt32 i = 0; i < m_aPath.size(); ++i ) diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 1bcf74ecaefd..6f6a5cbd9e57 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -175,7 +175,7 @@ TVFactory::getAvailableServiceNames( ) throw( RuntimeException ) { Sequence< OUString > seq( 1 ); - seq[0] = OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ); + seq[0] = "com.sun.star.ucb.HierarchyDataReadAccess"; return seq; } @@ -191,8 +191,8 @@ Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames_static() { Sequence< OUString > seq( 2 ); - seq[0] = OUString( "com.sun.star.help.TreeView" ); - seq[1] = OUString( "com.sun.star.ucb.HiearchyDataSource" ); + seq[0] = "com.sun.star.help.TreeView"; + seq[1] = "com.sun.star.ucb.HiearchyDataSource"; return seq; } diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 61a287406620..29a08b648ab7 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -383,7 +383,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib && m_bStockHasVolume && mnSeriesIndex == 0 ) { - maSeriesChartTypeName = OUString( "com.sun.star.chart2.ColumnChartType" ); + maSeriesChartTypeName = "com.sun.star.chart2.ColumnChartType"; bIsCandleStick = false; } else @@ -425,7 +425,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib { OUString aMainRole("values-y"); if ( maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType" ) - aMainRole = OUString( "values-size" ); + aMainRole = "values-size"; xSeqProp->setPropertyValue("Role", uno::makeAny( aMainRole )); } xLabeledSeq->setValues( xSeq ); diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 83930ca9c0c7..b686945d6954 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -293,13 +293,13 @@ XMLTokenEnum getTokenByChartType( if( bUseOldNames ) { - aPrefix = OUString( "com.sun.star.chart."); - aPostfix = OUString( "Diagram"); + aPrefix = "com.sun.star.chart."; + aPostfix = "Diagram"; } else { - aPrefix = OUString( "com.sun.star.chart2."); - aPostfix = OUString( "ChartType"); + aPrefix = "com.sun.star.chart2."; + aPostfix = "ChartType"; } if( rChartTypeService.match( aPrefix )) diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 7a2f5570b0d2..12b8f764f736 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -296,7 +296,7 @@ void SdXMLEventContext::EndElement() OUString sAPIEventName; uno::Sequence< beans::PropertyValue > aProperties; - sAPIEventName = OUString( "OnClick" ); + sAPIEventName = "OnClick"; if( mbScript ) meClickAction = ClickAction_MACRO; @@ -359,19 +359,19 @@ void SdXMLEventContext::EndElement() msMacroName = msMacroName.copy( rDoc.getLength()+1 ); } - pProperties->Name = OUString( "EventType" ); + pProperties->Name = "EventType"; pProperties->Handle = -1; pProperties->Value <<= OUString( "StarBasic" ); pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - pProperties->Name = OUString( "MacroName" ); + pProperties->Name = "MacroName"; pProperties->Handle = -1; pProperties->Value <<= msMacroName; pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - pProperties->Name = OUString( "Library" ); + pProperties->Name = "Library"; pProperties->Handle = -1; pProperties->Value <<= sLibrary; pProperties->State = beans::PropertyState_DIRECT_VALUE; @@ -385,7 +385,7 @@ void SdXMLEventContext::EndElement() pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - pProperties->Name = OUString( "Script" ); + pProperties->Name = "Script"; pProperties->Handle = -1; pProperties->Value <<= msMacroName; pProperties->State = beans::PropertyState_DIRECT_VALUE; @@ -393,7 +393,7 @@ void SdXMLEventContext::EndElement() } else { - pProperties->Name = OUString( "EventType" ); + pProperties->Name = "EventType"; pProperties->Handle = -1; pProperties->Value <<= OUString( "Presentation" ); pProperties->State = beans::PropertyState_DIRECT_VALUE; @@ -407,7 +407,7 @@ void SdXMLEventContext::EndElement() meClickAction = ClickAction_DOCUMENT; } - pProperties->Name = OUString( "ClickAction" ); + pProperties->Name = "ClickAction"; pProperties->Handle = -1; pProperties->Value <<= meClickAction; pProperties->State = beans::PropertyState_DIRECT_VALUE; @@ -431,20 +431,20 @@ void SdXMLEventContext::EndElement() case ClickAction_DOCUMENT: case ClickAction_PROGRAM: - pProperties->Name = OUString( "Bookmark" ); + pProperties->Name = "Bookmark"; pProperties->Handle = -1; pProperties->Value <<= msBookmark; pProperties->State = beans::PropertyState_DIRECT_VALUE; break; case ClickAction_VANISH: - pProperties->Name = OUString( "Effect" ); + pProperties->Name = "Effect"; pProperties->Handle = -1; pProperties->Value <<= ImplSdXMLgetEffect( meEffect, meDirection, mnStartScale, true ); pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - pProperties->Name = OUString( "Speed" ); + pProperties->Name = "Speed"; pProperties->Handle = -1; pProperties->Value <<= meSpeed; pProperties->State = beans::PropertyState_DIRECT_VALUE; @@ -453,20 +453,20 @@ void SdXMLEventContext::EndElement() // NOTE: no break here!!! case ClickAction_SOUND: - pProperties->Name = OUString( "SoundURL" ); + pProperties->Name = "SoundURL"; pProperties->Handle = -1; pProperties->Value <<= msSoundURL; pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - pProperties->Name = OUString( "PlayFull" ); + pProperties->Name = "PlayFull"; pProperties->Handle = -1; pProperties->Value = ::cppu::bool2any(mbPlayFull); pProperties->State = beans::PropertyState_DIRECT_VALUE; break; case ClickAction_VERB: - pProperties->Name = OUString( "Verb" ); + pProperties->Name = "Verb"; pProperties->Handle = -1; pProperties->Value <<= mnVerb; pProperties->State = beans::PropertyState_DIRECT_VALUE; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 421b11f620ed..32ed660aae4b 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -208,10 +208,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement { uno::Sequence< uno::Any > aArgument( 1 ); uno::Sequence< beans::PropertyValue > aPropValues( 2 ); - aPropValues[ 0 ].Name = OUString( "CustomShape" ); + aPropValues[ 0 ].Name = "CustomShape"; aPropValues[ 0 ].Value <<= xShape; sal_Bool bForceGroupWithText = sal_True; - aPropValues[ 1 ].Name = OUString( "ForceGroupWithText" ); + aPropValues[ 1 ].Name = "ForceGroupWithText"; aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; uno::Reference< uno::XInterface > xInterface( @@ -2773,8 +2773,7 @@ void XMLShapeExport::ImpExportOLE2Shape( { if( !sPersistName.isEmpty() ) { - sURL = OUString( "vnd.sun.star.EmbeddedObject:" ); - sURL += sPersistName; + sURL = "vnd.sun.star.EmbeddedObject:" + sPersistName; } } @@ -2841,7 +2840,7 @@ void XMLShapeExport::ImpExportOLE2Shape( OUString sURLRequest( sURL ); if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURLRequest += OUString( "?oasis=false" ); + sURLRequest += "?oasis=false"; mrExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } @@ -3237,14 +3236,14 @@ void XMLShapeExport::ImpExportMediaShape( xPropSet->getPropertyValue("Zoom") >>= eZoom; switch( eZoom ) { - case( media::ZoomLevel_ZOOM_1_TO_4 ): aZoomValue = OUString( "25%" ); break; - case( media::ZoomLevel_ZOOM_1_TO_2 ): aZoomValue = OUString( "50%" ); break; - case( media::ZoomLevel_ORIGINAL ): aZoomValue = OUString( "100%" ); break; - case( media::ZoomLevel_ZOOM_2_TO_1 ): aZoomValue = OUString( "200%" ); break; - case( media::ZoomLevel_ZOOM_4_TO_1 ): aZoomValue = OUString( "400%" ); break; - case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = OUString( "fit" ); break; - case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = OUString( "fixedfit" ); break; - case( media::ZoomLevel_FULLSCREEN ): aZoomValue = OUString( "fullscreen" ); break; + case( media::ZoomLevel_ZOOM_1_TO_4 ) : aZoomValue = "25%"; break; + case( media::ZoomLevel_ZOOM_1_TO_2 ) : aZoomValue = "50%"; break; + case( media::ZoomLevel_ORIGINAL ) : aZoomValue = "100%"; break; + case( media::ZoomLevel_ZOOM_2_TO_1 ) : aZoomValue = "200%"; break; + case( media::ZoomLevel_ZOOM_4_TO_1 ) : aZoomValue = "400%"; break; + case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = "fit"; break; + case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = "fixedfit"; break; + case( media::ZoomLevel_FULLSCREEN ) : aZoomValue = "fullscreen"; break; default: break; @@ -4827,9 +4826,9 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape uno::Reference< graphic::XGraphicProvider > xProvider( graphic::GraphicProvider::create(xContext) ); uno::Sequence< beans::PropertyValue > aArgs( 2 ); - aArgs[ 0 ].Name = OUString( "MimeType" ); + aArgs[ 0 ].Name = "MimeType"; aArgs[ 0 ].Value <<= OUString( "image/x-vclgraphic" ); - aArgs[ 1 ].Name = OUString( "OutputStream" ); + aArgs[ 1 ].Name = "OutputStream"; aArgs[ 1 ].Value <<= xPictureStream->getOutputStream(); xProvider->storeGraphic( xGraphic, aArgs ); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index d8b65c9a94dd..a85527b6ec06 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -524,7 +524,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( bStarSymbol = sal_True; } if( bStarSymbol ) - aFDesc.Name = OUString( "StarSymbol" ); + aFDesc.Name = "StarSymbol" ; } // Must append 'cBullet' even if it is zero @@ -1283,13 +1283,13 @@ void SvxXMLListStyleContext::SetDefaultStyle( { // TODO: Bullet-Font awt::FontDescriptor aFDesc; - aFDesc.Name = OUString( + aFDesc.Name = #ifdef _WIN32 "StarBats" #else "starbats" #endif - ); + ; aFDesc.Family = FAMILY_DONTKNOW ; aFDesc.Pitch = PITCH_DONTKNOW ; aFDesc.CharSet = RTL_TEXTENCODING_SYMBOL ; diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 7f6289df7785..6cacdc277e54 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -153,7 +153,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( } // tab character #i21237# - pValues[nNextEntry].Name = OUString( "WithTab" ); + pValues[nNextEntry].Name = "WithTab"; pValues[nNextEntry].Value.setValue( &bWithTab, ::getBooleanCppuType()); nNextEntry++; diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 1719a9e5aeae..99cfaa55a437 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -148,7 +148,7 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) : sal_uInt16 nExportFlags = rExport.getExportFlags(); sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; if( bStylesOnly ) - sPrefix = OUString( "ML" ); + sPrefix = "ML"; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 755db3501381..f389b4d5c5f7 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1279,31 +1279,31 @@ XMLTextParagraphExport::XMLTextParagraphExport( xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT ); xTextPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); - sFamily = OUString( GetXMLToken(XML_TEXT) ); - aPrefix = OUString(static_cast<sal_Unicode>('T')); + sFamily = GetXMLToken(XML_TEXT); + aPrefix = "T"; rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_TEXT, sFamily, xTextPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_AUTO_FRAME ); xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); - sFamily = OUString( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ); - aPrefix = OUString( "fr" ); + sFamily = XML_STYLE_FAMILY_SD_GRAPHICS_NAME; + aPrefix = "fr"; rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_FRAME, sFamily, xAutoFramePropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SECTION ); xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); - sFamily = OUString( GetXMLToken( XML_SECTION ) ); - aPrefix = OUString( "Sect" ); + sFamily = GetXMLToken( XML_SECTION ); + aPrefix = "Sect" ; rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_SECTION, sFamily, xSectionPropMapper, aPrefix ); xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY ); xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper ); - sFamily = OUString( GetXMLToken( XML_RUBY ) ); - aPrefix = OUString( "Ru" ); + sFamily = GetXMLToken( XML_RUBY ); + aPrefix = "Ru"; rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_RUBY, sFamily, xRubyPropMapper, aPrefix ); @@ -1464,17 +1464,17 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { if ( 0 == i ) { - sName = OUString( "CharacterStyles" ); + sName = "CharacterStyles" ; nFamily = XML_STYLE_FAMILY_TEXT_TEXT; } else if ( 1 == i ) { - sName = OUString( "RubyStyles" ); + sName = "RubyStyles" ; nFamily = XML_STYLE_FAMILY_TEXT_RUBY; } else { - sName = OUString( "ParagraphStyles" ); + sName = "ParagraphStyles" ; nFamily = XML_STYLE_FAMILY_TEXT_PARAGRAPH; } diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 24202039ce31..487ed5b3c9f0 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -454,7 +454,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments aAny = m_xPropSet->getPropertyValue(sPropName); aAny >>= sRelPath; } - sPropName = OUString( "StreamName" ); + sPropName = "StreamName"; if( xPropSetInfo->hasPropertyByName(sPropName) ) { aAny = m_xPropSet->getPropertyValue(sPropName); @@ -462,7 +462,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments } if( !sName.isEmpty() ) { - m_aExtPathPrefix = OUString( "../" ); + m_aExtPathPrefix = "../"; // If there is a rel path within a package, then append // additional '../'. If the rel path contains an ':', then it is diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 93107f2f822c..f6f01bb3858f 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -107,11 +107,11 @@ void XFormsInstanceContext::EndElement() { Sequence<PropertyValue> aSequence( 3 ); PropertyValue* pSequence = aSequence.getArray(); - pSequence[0].Name = OUString( "Instance" ); + pSequence[0].Name = "Instance"; pSequence[0].Value <<= mxInstance; - pSequence[1].Name = OUString( "ID" ); + pSequence[1].Name = "ID"; pSequence[1].Value <<= msId; - pSequence[2].Name = OUString( "URL" ); + pSequence[2].Name = "URL"; pSequence[2].Value <<= msURL; mxModel->getInstances()->insert( makeAny( aSequence ) ); diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 9b5339908eee..c3629c029f04 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -793,7 +793,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop Reference< XPropertySet > xModelProps( _rXForms->getByName( *pModelName ), UNO_QUERY_THROW ); Sequence< PropertyValue > aModelSettings( 1 ); - aModelSettings[0].Name = OUString( "ExternalData" ); + aModelSettings[0].Name = "ExternalData"; aModelSettings[0].Value = xModelProps->getPropertyValue( aModelSettings[0].Name ); xModelSettings->insertByName( *pModelName, makeAny( aModelSettings ) ); @@ -802,7 +802,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop if ( xModelSettings->hasElements() ) { _out_rSettings.realloc( 1 ); - _out_rSettings[0].Name = OUString( "XFormModels" ); + _out_rSettings[0].Name = "XFormModels"; _out_rSettings[0].Value <<= xModelSettings; } } diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 39095604ad3f..a624db4493d0 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -486,7 +486,7 @@ Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.security.DocumentDigitalSignatures" ); + pArray[0] = "com.sun.star.security.DocumentDigitalSignatures"; return aRet; } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 52d8307866d2..a1586d539f40 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -261,8 +261,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif OUString aLBEntry; OUString aDetails; // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)" - aLBEntry = OUString( "V" ); - aLBEntry += OUString::number( xCert->getVersion() + 1 ); + aLBEntry = "V" + OUString::number( xCert->getVersion() + 1 ); InsertElement( XMLSEC_RES( STR_VERSION ), aLBEntry, aLBEntry ); Sequence< sal_Int8 > aSeq = xCert->getSerialNumber(); aLBEntry = XmlSec::GetHexString( aSeq, pHexSep ); @@ -278,12 +277,12 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif DateTime aDateTime( DateTime::EMPTY ); utl::typeConvert( xCert->getNotValidBefore(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += OUString( " " ); + aLBEntry += " "; aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( XMLSEC_RES( STR_VALIDFROM ), aLBEntry, aLBEntry ); utl::typeConvert( xCert->getNotValidAfter(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += OUString( " " ); + aLBEntry += " "; aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( XMLSEC_RES( STR_VALIDTO ), aLBEntry, aLBEntry ); diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index af584e2f1602..277222caa128 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -163,7 +163,7 @@ cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServic { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.xml.crypto.SEInitializer" ); + pArray[0] = "com.sun.star.xml.crypto.SEInitializer"; return aRet; } |