diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-04 14:00:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-11 11:21:26 +0200 |
| commit | e52779d2f8722c713f72aedbf475267440d729f0 (patch) | |
| tree | 0f2f15b2a7645e0b75f8057c96c90e05e1a6e7df | |
| parent | e9c4ee996d5a6bf895072613ac4e488346ee5b05 (diff) | |
remove unnecessary use of OUString constructor
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
68 files changed, 340 insertions, 354 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 21e7979b34ff..441ec1545c03 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -204,11 +204,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : // Ugh. Looks like configuration is borked. Fake minimal // setup. Sequence<OUString> aServices(1); - aServices[0] = OUString("com.sun.star.comp.rendering.Canvas.VCL"); + aServices[0] = "com.sun.star.comp.rendering.Canvas.VCL"; m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.Canvas"), aServices) ); - aServices[0] = OUString("com.sun.star.comp.rendering.SpriteCanvas.VCL"); + aServices[0] = "com.sun.star.comp.rendering.SpriteCanvas.VCL"; m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.SpriteCanvas"), aServices) ); } diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index b4424a6c3669..2f3309ec9378 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -44,17 +44,17 @@ OUString implGetExceptionMsg( Exception& e, const OUString& aExceptionType_ ) { OUString aExceptionType = aExceptionType_; if( aExceptionType.isEmpty() ) - aExceptionType = OUString("Unknown") ; + aExceptionType = "Unknown"; OUString aTypeLine( "\nType: " ); aTypeLine += aExceptionType; OUString aMessageLine( "\nMessage: " ); - aMessageLine += OUString( e.Message ); + aMessageLine += e.Message; OUString aMsg(aTypeLine); aMsg += aMessageLine; - return aMsg; + return aMsg; } // Exception type unknown diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 7f288da1f0e1..8f424cb81b3e 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -380,10 +380,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected { case -1: case 1: //mozilla - url=OUString("sdbc:address:mozilla://"); + url = "sdbc:address:mozilla://"; break; case 2: - url=OUString("sdbc:address:ldap://"); + url = "sdbc:address:ldap://"; char hostname[40],basedn[40]; scanf("%s %s",hostname,basedn); aValue.realloc(2); @@ -397,7 +397,7 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected break; case 5: //Default LDAP AB - url=OUString("sdbc:address:ldap://"); + url = "sdbc:address:ldap://"; aValue.realloc(2); aValue[0].Name = "HostName"; aValue[0].Value <<= OUString("sun-ds"); diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index 727926772517..d7e53d7a0e93 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -282,7 +282,7 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected switch( nIndex) { case testLDAP: - url=OUString("sdbc:address:ldap://"); + url = "sdbc:address:ldap://"; aValue.realloc(2); aValue[0].Name = "HostName"; aValue[0].Value <<= OUString("sun-ds"); @@ -290,16 +290,16 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected aValue[1].Value <<= OUString("dc=sun,dc=com"); break; case testMozilla: - url=OUString("sdbc:address:mozilla://"); + url = "sdbc:address:mozilla://"; break; case testOp: - url=OUString("sdbc:address:outlook://"); + url = "sdbc:address:outlook://"; break; case testOe: - url=OUString("sdbc:address:outlookexp://"); + url = "sdbc:address:outlookexp://"; break; default: - url=OUString("sdbc:address:mozilla://"); + url = "sdbc:address:mozilla://"; break; } pConnection = diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index f005337db8ce..aff6a5480507 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -810,9 +810,9 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() { aActivatorName = aLocation.copy( 0, nPos ); if( aActivatorName.compareToAscii( "java" ) == 0 ) - aActivatorName = OUString("com.sun.star.loader.Java"); + aActivatorName = "com.sun.star.loader.Java"; else if( aActivatorName.compareToAscii( "module" ) == 0 ) - aActivatorName = OUString("com.sun.star.loader.SharedLibrary"); + aActivatorName = "com.sun.star.loader.SharedLibrary"; aLocation = aLocation.copy( nPos + 3 ); } } diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index 30df8637ff43..0fbd0caf96aa 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.cxx @@ -61,7 +61,7 @@ SAL_IMPLEMENT_MAIN() ContextEntry_Init aEntry; aEntry.bLateInitService = false; - aEntry.name = OUString("bla, bla"); + aEntry.name = "bla, bla"; aEntry.value = makeAny( (sal_Int32)5 ); Reference< XComponentContext > xContext( createComponentContext( &aEntry, 1, xInitialContext ) ); OSL_ASSERT( xContext->getServiceManager() != xMgr ); // must be wrapped one diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index 7783e801a3bf..a20413461a5d 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -277,10 +277,10 @@ void test_PropertyArrayHelper() Sequence< OUString > aS( 4 ); sal_Int32 Handles[4]; // muss sortiert sein - aS.getArray()[0] = OUString("a"); - aS.getArray()[1] = OUString("d"); - aS.getArray()[2] = OUString("f"); - aS.getArray()[3] = OUString("t"); + aS[0] = "a"; + aS[1] = "d"; + aS[2] = "f"; + aS[3] = "t"; sal_Int32 nHitCount = a1.fillHandles( Handles, aS ); OSL_ENSURE( nHitCount == 3, "wrong number of hits " ); OSL_ENSURE( Handles[0] == getPropertyTable1()[0].Handle, "Handle not correct" ); @@ -806,9 +806,9 @@ void test_PropertySetHelper() xPS->addPropertyChangeListener( OUString("INT16"), xPS_L ); Sequence<OUString> szPN( 3 ); - szPN.getArray()[0] = OUString("BOOL"); - szPN.getArray()[1] = OUString("INT32"); - szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method + szPN[0] = "BOOL"; + szPN[1] = "INT32"; + szPN[2] = "Does not exist"; // must ne ignored by the addPropertiesChangeListener method pPS->addPropertiesChangeListener( szPN, x1 ); szPN = Sequence<OUString>(); @@ -851,8 +851,8 @@ void test_PropertySetHelper() xPS->addPropertyChangeListener( OUString("INT16"), xPS_L ); Sequence<OUString> szPN( 2 ); - szPN.getArray()[0] = OUString("BOOL"); - szPN.getArray()[1] = OUString("INT32"); + szPN[0] = "BOOL"; + szPN[1] = "INT32"; pPS->addPropertiesChangeListener( szPN, x1 ); szPN = Sequence<OUString>(); pPS->addPropertiesChangeListener( szPN, x1 ); @@ -1022,9 +1022,9 @@ void test_PropertySetHelper() OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" ); Sequence< OUString >valueNames = Sequence<OUString>( 3 ); - valueNames.getArray()[0] = OUString("BOOL"); - valueNames.getArray()[1] = OUString("INT16"); - valueNames.getArray()[2] = OUString("INT32"); + valueNames[0] = "BOOL"; + valueNames[1] = "INT16"; + valueNames[2] = "INT32"; Sequence< Any > aValues = pPS->getPropertyValues( valueNames ); b = *((sal_Bool*)aValues.getConstArray()[0].getValue()); @@ -1095,10 +1095,10 @@ void test_PropertySetHelper() pPS->addVetoableChangeListener( OUString("INT16") , x2 ); Sequence<OUString> szPN( 4 ); - szPN.getArray()[0] = OUString("BOOL"); - szPN.getArray()[1] = OUString("INT32"); - szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method - szPN.getArray()[3] = OUString("INT16"); + szPN[0] = "BOOL"; + szPN[1] = "INT32"; + szPN[2] = "Does not exist"; // must ne ignored by the addPropertiesChangeListener method + szPN[3] = "INT16"; pPS->addPropertiesChangeListener( szPN, x1 ); pPS_L->nCount = 6; @@ -1114,8 +1114,8 @@ void test_PropertySetHelper() pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value bound szPN = Sequence<OUString>( 2 ); - szPN.getArray()[0] = OUString("INT16"); - szPN.getArray()[1] = OUString("INT32"); + szPN[0] = "INT16"; + szPN[1] = "INT32"; Sequence< Any > aValues( 2 ); aValues.getArray()[0] <<= (sal_Int16) 22; aValues.getArray()[1] <<= (sal_Int16) 44; @@ -1136,8 +1136,8 @@ void test_PropertySetHelper() //vetoable exception with multible - szPN.getArray()[0] = OUString("INT16"); - szPN.getArray()[1] = OUString("INT16"); + szPN[0] = "INT16"; + szPN[1] = "INT16"; pPS->nINT32 = 0; pPS->nINT16 = 0; pPS_L->nCount = 4; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index eefab7dfd439..5cb3bb6f10f8 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1790,7 +1790,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) try{ aCheckId = xModuleManager->identify( xf ); } catch(const uno::Exception&) - { aCheckId = OUString(); } + { aCheckId = ""; } if ( aModuleId.equals( aCheckId ) ) { @@ -4983,7 +4983,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, sal_Unicode aChar = aDirectory[ aCount-1 ]; if ( aChar != '/') { - aDirectory += OUString( "/" ); + aDirectory += "/"; } } else @@ -4991,7 +4991,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, aBtnImport.Enable( sal_False ); } - aDirectory += OUString( "soffice.cfg/import" ); + aDirectory += "soffice.cfg/import"; uno::Reference< lang::XSingleServiceFactory > xStorageFactory( ::com::sun::star::embed::FileSystemStorageFactory::create( xComponentContext ) ); @@ -5006,11 +5006,11 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, uno::Sequence< uno::Any > aProp( 2 ); beans::PropertyValue aPropValue; - aPropValue.Name = OUString( "UserConfigStorage" ); + aPropValue.Name = "UserConfigStorage"; aPropValue.Value <<= xStorage; aProp[ 0 ] <<= aPropValue; - aPropValue.Name = OUString( "OpenMode" ); + aPropValue.Name = "OpenMode"; aPropValue.Value <<= com::sun::star::embed::ElementModes::READWRITE; aProp[ 1 ] <<= aPropValue; @@ -5256,7 +5256,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< graphic::XGraphic > xGraphic; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = OUString("URL" ); + aMediaProps[0].Name = "URL"; aMediaProps[0].Value <<= aURL; com::sun::star::awt::Size aSize; @@ -5333,7 +5333,7 @@ void SvxIconSelectorDialog::ImportGraphics( sal_Int32 aIndex; OUString aIconName; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = OUString("URL" ); + aMediaProps[0].Name = "URL"; uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPer( m_xImportedImageManager, uno::UNO_QUERY ); @@ -5434,7 +5434,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) ++m_nNextId; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = OUString("URL" ); + aMediaProps[0].Name = "URL"; uno::Reference< graphic::XGraphic > xGraphic; com::sun::star::awt::Size aSize; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 54b068834f4d..a4aecb4e22b9 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -94,7 +94,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =OUString(".uno:DSBEditDoc"); + aUrl.Complete = ".uno:DSBEditDoc"; GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 00b057777d52..44aa252a7816 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -70,7 +70,7 @@ OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported = "com.sun.star.sdb.UserAdministrationDialog"; + aSupported[0] = "com.sun.star.sdb.UserAdministrationDialog"; return aSupported; } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index c72a2fe74d21..2dca4a74d332 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -125,9 +125,9 @@ OUString SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const { Sequence< PropertyValue > aProperties(2); PropertyValue* pValues = aProperties.getArray(); - pValues[0].Name = OUString("NumberingType"); + pValues[0].Name = "NumberingType"; pValues[0].Value <<= nNumType; - pValues[1].Name = OUString("Value"); + pValues[1].Name = "Value"; pValues[1].Value <<= (sal_Int32)nNo; try diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index df1bc83fb959..dbae2024b459 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -127,12 +127,12 @@ Interceptor::Interceptor( m_pDisposeEventListeners(0), m_bLink( bLink ) { - m_aInterceptedURL[0] = OUString(".uno:Save"); - m_aInterceptedURL[1] = OUString(".uno:SaveAll"); - m_aInterceptedURL[2] = OUString(".uno:CloseDoc"); - m_aInterceptedURL[3] = OUString(".uno:CloseWin"); - m_aInterceptedURL[4] = OUString(".uno:CloseFrame"); - m_aInterceptedURL[5] = OUString(".uno:SaveAs"); + m_aInterceptedURL[0] = ".uno:Save"; + m_aInterceptedURL[1] = ".uno:SaveAll"; + m_aInterceptedURL[2] = ".uno:CloseDoc"; + m_aInterceptedURL[3] = ".uno:CloseWin"; + m_aInterceptedURL[4] = ".uno:CloseFrame"; + m_aInterceptedURL[5] = ".uno:SaveAs"; } @@ -209,7 +209,7 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = OUString( "SaveTo" ); + aNewArgs[nInd].Name = "SaveTo"; aNewArgs[nInd].Value <<= sal_True; } @@ -260,7 +260,7 @@ void Interceptor::generateFeatureStateEvent() { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = OUString("Update"); + aStateEvent.FeatureDescriptor = "Update"; aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + aTitle); @@ -269,14 +269,14 @@ void Interceptor::generateFeatureStateEvent() else if ( i == 5 ) { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); + aStateEvent.FeatureDescriptor = "SaveCopyTo"; aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); } else { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = OUString("Close and Return"); + aStateEvent.FeatureDescriptor = "Close and Return"; aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + aTitle); @@ -325,7 +325,7 @@ Interceptor::addStatusListener( frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = OUString("Update"); + aStateEvent.FeatureDescriptor = "Update"; aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (OUString( @@ -365,7 +365,7 @@ Interceptor::addStatusListener( frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = OUString("Close and Return"); + aStateEvent.FeatureDescriptor = "Close and Return"; aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (OUString( @@ -389,7 +389,7 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); + aStateEvent.FeatureDescriptor = "SaveCopyTo"; aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 4830336fa3ea..6dc6b508816d 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -626,7 +626,7 @@ Reference<XEventListener> EventAttacherImpl::attachListenerForTarget( nIndex++; OUString aListenerName = (aListenerType[nIndex] == 'X') ? aListenerType.copy(nIndex+1) : aListenerType; - OUString aAddListenerName = OUString("add") + aListenerName; + OUString aAddListenerName = "add" + aListenerName; // Send Methods to the correct addListener-Method Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( MethodConcept::LISTENER ); @@ -818,7 +818,7 @@ void EventAttacherImpl::removeListener if( aListenerName[nIndex] == 'X' ) // erase X from the interface name aListenerName = aListenerName.copy( nIndex +1 ); - aRemoveListenerName = OUString( "remove" ) + aListenerName; + aRemoveListenerName = "remove" + aListenerName; // Search methods for the correct removeListener method Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( MethodConcept::LISTENER ); diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 804fb032fbff..f54d00b26e5d 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -184,12 +184,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = OUString(","); + rStr = ","; return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = OUString(";"); + rStr = ";"; return true; } } @@ -198,12 +198,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = OUString(","); + rStr = ","; return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = OUString(";"); + rStr = ";"; return true; } } @@ -212,12 +212,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = OUString(";"); + rStr = ";"; return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = OUString("|"); + rStr = "|"; return true; } } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index be4604e5981a..344ce5ee252c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -433,9 +433,9 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength(); uno::Sequence< OUString > aArgs(3); - aArgs[TOKEN_OPEN] = OUString("("); - aArgs[TOKEN_CLOSE] = OUString(")"); - aArgs[TOKEN_SEP] = OUString(";"); + aArgs[TOKEN_OPEN] = "("; + aArgs[TOKEN_CLOSE] = ")"; + aArgs[TOKEN_SEP] = ";"; m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF); m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL); @@ -822,7 +822,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) // 2. Page or Edit: show selected function xub_StrLen nFStart = pData->GetFStart(); - OUString aFormula = OUString(m_pHelper->getCurrentFormula()) + " )"; + OUString aFormula = m_pHelper->getCurrentFormula() + " )"; xub_StrLen nNextFStart = nFStart; xub_StrLen nNextFEnd = 0; @@ -1033,7 +1033,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl) const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc); m_pHelper->insertEntryToLRUList(pDesc); - OUString aFuncName = OUString( pFuncPage->GetSelFunctionName() ) + "()"; + OUString aFuncName = pFuncPage->GetSelFunctionName() + "()"; m_pHelper->setCurrentFormula(aFuncName); pMEdit->ReplaceSelected(aFuncName); @@ -1167,7 +1167,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) for(sal_uInt16 i=0; i<=nEd; i++) { if ( m_aArguments[i].isEmpty() ) - m_aArguments[i] = OUString(" "); + m_aArguments[i] = " "; } if(!pParaWin->GetArgument(nEd).isEmpty()) m_aArguments[nEd] = pParaWin->GetArgument(nEd); @@ -1183,7 +1183,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) for(sal_uInt16 i=nClearPos; i<nArgs; i++) { - m_aArguments[i] = OUString(); + m_aArguments[i] = ""; } } } @@ -1424,7 +1424,7 @@ void FormulaDlg_Impl::RefInputStartAfter( RefEdit* /*pEdit*/, RefButton* /*pButt if( pTheRefEdit ) { - OUString aStr = OUString(aTitle2) + " " + aFtEditName.GetText() + "( "; + OUString aStr = aTitle2 + " " + aFtEditName.GetText() + "( "; if( pParaWin->GetActiveLine() > 0 ) aStr += "...; "; @@ -1467,7 +1467,7 @@ void FormulaDlg_Impl::Update() { FormEditData* pData = m_pHelper->getFormEditData(); const OUString sExpression = pMEdit->GetText(); - aOldFormula = OUString(); + aOldFormula = ""; UpdateTokenArray(sExpression); FormulaCursorHdl(&aMEFormula); CalcStruct(sExpression); diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 18a185844dc5..fa344ef5a19a 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -57,8 +57,8 @@ namespace uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); - aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; + aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker"; return aRet; } } diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 76f0658c345c..2909d7ad43a1 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -79,8 +79,8 @@ namespace css::uno::Sequence< OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames() { css::uno::Sequence< OUString > aRet(2); - aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; + aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker"; return aRet; } } diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index bdf4d2294acb..7f963221d348 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -52,7 +52,7 @@ namespace Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.ui.dialogs.SystemFolderPicker"); + aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker"; return aRet; } } diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 10c85f625313..373c9b3d6ce5 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1281,7 +1281,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x // <- SAFE css::util::URL aCmd; - aCmd.Complete = OUString(".uno:JumpToMark"); + aCmd.Complete = ".uno:JumpToMark"; css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(xContext)); xParser->parseStrict(aCmd); diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index b3508a7f8882..2a07f70ef28a 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -97,7 +97,7 @@ bool HelpIndexer::scanForFiles(OUString const & path) { osl::Directory dir(path); if (osl::FileBase::E_None != dir.open()) { - d_error = OUString("Error reading directory ") + path; + d_error = "Error reading directory " + path; return true; } @@ -116,8 +116,7 @@ bool HelpIndexer::scanForFiles(OUString const & path) { bool HelpIndexer::helpDocument(OUString const & fileName, Document *doc) { // Add the help path as an indexed, untokenized field. - OUString path = OUString("#HLP#") + - d_module + OUString("/") + fileName; + OUString path = "#HLP#" + d_module + "/" + fileName; std::vector<TCHAR> aPath(OUStringToTCHARVec(path)); doc->add(*_CLNEW Field(_T("path"), &aPath[0], Field::STORE_YES | Field::INDEX_UNTOKENIZED)); diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index 55b1c9c7f88e..8d707e569bb7 100644 --- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx +++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx @@ -54,7 +54,7 @@ namespace unsigned int, unsigned int, unsigned int) { uno::Sequence< beans::PropertyValue > aDescriptor(1); - aDescriptor[0].Name = OUString("URL"); + aDescriptor[0].Name = "URL"; aDescriptor[0].Value <<= rURL; return m_xFilter->filter(aDescriptor); } diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 59b6d4cf68af..8d702501899a 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -75,8 +75,8 @@ void TestBreakIterator::testLineBreaking() { OUString aTest("(some text here)"); - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { //Here we want the line break to leave text here) on the next line @@ -97,8 +97,8 @@ void TestBreakIterator::testLineBreaking() OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); OUString aTest(OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); - aLocale.Language = OUString("he"); - aLocale.Country = OUString("IL"); + aLocale.Language = "he"; + aLocale.Country = "IL"; { //Here we want the line break to happen at the whitespace @@ -111,8 +111,8 @@ void TestBreakIterator::testLineBreaking() { OUString aTest("foo /bar/baz"); - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { //Here we want the line break to leave /bar/ba clumped together on the next line @@ -126,8 +126,8 @@ void TestBreakIterator::testLineBreaking() { OUString aTest("aaa]aaa"); - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { //Here we want the line break to move the whole lot to the next line @@ -142,8 +142,8 @@ void TestBreakIterator::testLineBreaking() void TestBreakIterator::testWordBoundaries() { lang::Locale aLocale; - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; i18n::Boundary aBounds; @@ -245,8 +245,7 @@ void TestBreakIterator::testWordBoundaries() if (aBreakTests[i] == 0x200B) continue; #endif - OUString aTest("Word"); - aTest += OUString(aBreakTests[i]) + OUString("Word"); + OUString aTest = "Word" + OUString(aBreakTests[i]) + "Word"; aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true); switch (mode) { @@ -275,8 +274,7 @@ void TestBreakIterator::testWordBoundaries() //make sure that in all cases isBeginWord and isEndWord matches getWordBoundary for (size_t i = 0; i < SAL_N_ELEMENTS(aJoinTests); ++i) { - OUString aTest("Word"); - aTest += OUString(aJoinTests[i]) + OUString("Word"); + OUString aTest = "Word" + OUString(aJoinTests[i]) + "Word"; aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true); switch (mode) { @@ -381,8 +379,8 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=13451 { - aLocale.Language = OUString("ca"); - aLocale.Country = OUString("ES"); + aLocale.Language = "ca"; + aLocale.Country = "ES"; OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!"); @@ -406,12 +404,12 @@ void TestBreakIterator::testWordBoundaries() switch (j) { case 0: - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; break; case 1: - aLocale.Language = OUString("ca"); - aLocale.Country = OUString("ES"); + aLocale.Language = "ca"; + aLocale.Country = "ES"; break; default: CPPUNIT_ASSERT(false); @@ -444,12 +442,12 @@ void TestBreakIterator::testWordBoundaries() switch (j) { case 0: - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; break; case 1: - aLocale.Language = OUString("grc"); - aLocale.Country = OUString(); + aLocale.Language = "grc"; + aLocale.Country = ""; break; default: CPPUNIT_ASSERT(false); @@ -521,8 +519,8 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=107843 { - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; const sal_Unicode TEST[] = { @@ -539,8 +537,8 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=113785 { - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; const sal_Unicode TEST[] = { @@ -566,8 +564,8 @@ void TestBreakIterator::testWordBoundaries() void TestBreakIterator::testGraphemeIteration() { lang::Locale aLocale; - aLocale.Language = OUString("bn"); - aLocale.Country = OUString("IN"); + aLocale.Language = "bn"; + aLocale.Country = "IN"; { const sal_Unicode BA_HALANT_LA[] = { 0x09AC, 0x09CD, 0x09AF }; @@ -611,8 +609,8 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0); } - aLocale.Language = OUString("ta"); - aLocale.Country = OUString("IN"); + aLocale.Language = "ta"; + aLocale.Country = "IN"; { const sal_Unicode KA_VIRAMA_SSA[] = { 0x0B95, 0x0BCD, 0x0BB7 }; @@ -688,8 +686,8 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1); } - aLocale.Language = OUString("hi"); - aLocale.Country = OUString("IN"); + aLocale.Language = "hi"; + aLocale.Country = "IN"; { const sal_Unicode SHA_VOWELSIGNII[] = { 0x936, 0x940 }; @@ -713,8 +711,8 @@ void TestBreakIterator::testGraphemeIteration() void TestBreakIterator::testWeak() { lang::Locale aLocale; - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { const sal_Unicode WEAKS[] = @@ -754,8 +752,8 @@ void TestBreakIterator::testWeak() void TestBreakIterator::testAsian() { lang::Locale aLocale; - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { const sal_Unicode ASIANS[] = @@ -790,8 +788,8 @@ void TestBreakIterator::testAsian() void TestBreakIterator::testThai() { lang::Locale aLocale; - aLocale.Language = OUString("th"); - aLocale.Country = OUString("TH"); + aLocale.Language = "th"; + aLocale.Country = "TH"; //See http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html { @@ -843,8 +841,8 @@ void TestBreakIterator::testThai() void TestBreakIterator::testNorthernThai() { lang::Locale aLocale; - aLocale.Language = OUString("nod"); - aLocale.Country = OUString("TH"); + aLocale.Language = "nod"; + aLocale.Country = "TH"; const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); @@ -864,8 +862,8 @@ void TestBreakIterator::testNorthernThai() void TestBreakIterator::testKhmer() { lang::Locale aLocale; - aLocale.Language = OUString("km"); - aLocale.Country = OUString("KH"); + aLocale.Language = "km"; + aLocale.Country = "KH"; const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 }; @@ -885,8 +883,8 @@ void TestBreakIterator::testKhmer() void TestBreakIterator::testJapanese() { lang::Locale aLocale; - aLocale.Language = OUString("ja"); - aLocale.Country = OUString("JP"); + aLocale.Language = "ja"; + aLocale.Country = "JP"; i18n::Boundary aBounds; { diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 92066c7395db..10e77f50d702 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -43,8 +43,8 @@ private: void TestCharacterClassification::testTitleCase() { lang::Locale aLocale; - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { //basic example @@ -74,8 +74,8 @@ void TestCharacterClassification::testTitleCase() void TestCharacterClassification::testStringType() { lang::Locale aLocale; - aLocale.Language = OUString("en"); - aLocale.Country = OUString("US"); + aLocale.Language = "en"; + aLocale.Country = "US"; { //simple case diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index e1914bb48a86..a4060d4c6f7e 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -666,25 +666,25 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal break; case NUMBER_LOWER_ZH: natNum = NativeNumberMode::NATNUM7; - locale.Language = OUString("zh"); + locale.Language = "zh"; break; case NUMBER_UPPER_ZH_TW: - locale.Country = OUString("TW"); + locale.Country = "TW"; case NUMBER_UPPER_ZH: natNum = NativeNumberMode::NATNUM8; - locale.Language = OUString("zh"); + locale.Language = "zh"; break; case NUMBER_TRADITIONAL_JA: natNum = NativeNumberMode::NATNUM8; - locale.Language = OUString("ja"); + locale.Language = "ja"; break; case NUMBER_UPPER_KO: natNum = NativeNumberMode::NATNUM8; - locale.Language = OUString("ko"); + locale.Language = "ko"; break; case NUMBER_HANGUL_KO: natNum = NativeNumberMode::NATNUM11; - locale.Language = OUString("ko"); + locale.Language = "ko"; break; case CIRCLE_NUMBER: @@ -950,9 +950,9 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) OUString result; Locale aLocale(OUString("en"), OUString(), OUString()); Sequence<beans::PropertyValue> aProperties(2); - aProperties[0].Name = OUString("NumberingType"); + aProperties[0].Name = "NumberingType"; aProperties[0].Value <<= aSupportedTypes[index].nType; - aProperties[1].Name = OUString("Value"); + aProperties[1].Name = "Value"; for (sal_Int32 j = 1; j <= 3; j++) { aProperties[1].Value <<= j; result += makeNumberingString( aProperties, aLocale ); @@ -975,7 +975,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti Sequence< Any > aArgs(1); beans::PropertyValue aPath; - aPath.Name = OUString("nodepath"); + aPath.Name = "nodepath"; aPath.Value <<= OUString("/org.openoffice.Office.Common/I18N"), aArgs[0] <<= aPath; diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx index f90966575a92..7a80f42b0cb6 100644 --- a/idlc/source/astoperation.cxx +++ b/idlc/source/astoperation.cxx @@ -48,7 +48,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index) OUString returnTypeName; if (m_pReturnType == 0) { - returnTypeName = OUString("void"); + returnTypeName = "void"; } else { returnTypeName = OStringToOUString( m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8); diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 8f713e713185..9ff92addcba6 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -159,8 +159,7 @@ namespace io_acceptor m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() ); if( ! m_pipe.is() ) { - OUString error = OUString("io.acceptor: Couldn't setup pipe "); - error += m_sPipeName; + OUString error = "io.acceptor: Couldn't setup pipe " + m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > () ); } } @@ -174,8 +173,7 @@ namespace io_acceptor } if( ! pipe.is() ) { - OUString error = OUString("io.acceptor: pipe already closed"); - error += m_sPipeName; + OUString error = "io.acceptor: pipe already closed" + m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > () ); } PipeConnection *pConn = new PipeConnection( m_sConnectionDescription ); @@ -194,8 +192,7 @@ namespace io_acceptor } else { - OUString error = OUString("io.acceptor: Couldn't setup pipe "); - error += m_sPipeName; + OUString error = "io.acceptor: Couldn't setup pipe " + m_sPipeName; throw ConnectionSetupException( error, Reference< XInterface > ()); } } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index ddcb99664dec..089d08199452 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -137,7 +137,7 @@ namespace io_acceptor m_sLastDescription != sConnectionDescription ) { // instantiate another acceptor for different ports - OUString sMessage = OUString("acceptor::accept called multiple times with different conncetion strings\n" ); + OUString sMessage = "acceptor::accept called multiple times with different conncetion strings\n"; throw ConnectionSetupException( sMessage, Reference< XInterface > () ); } @@ -177,7 +177,7 @@ namespace io_acceptor aHost = aDesc.getParameter( OUString("host")); else - aHost = OUString("localhost"); + aHost = "localhost"; sal_uInt16 nPort = static_cast< sal_uInt16 >( aDesc.getParameter( OUString("port")). @@ -205,8 +205,7 @@ namespace io_acceptor } else { - OUString delegatee = OUString("com.sun.star.connection.Acceptor."); - delegatee += aDesc.getName(); + OUString delegatee = "com.sun.star.connection.Acceptor." + aDesc.getName(); OSL_TRACE( "trying to get service %s\n", @@ -282,7 +281,7 @@ namespace io_acceptor Sequence< OUString > acceptor_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(SERVICE_NAME); + seqNames.getArray()[0] = SERVICE_NAME; return seqNames; } diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index bec6821bee00..2d7e9e979d0e 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -46,57 +46,57 @@ sal_Bool SAL_CALL component_writeInfo( Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey * >( pRegistryKey ) ); - OUString str = OUString("/") + + OUString str = "/" + OPipeTest_getImplementationName() + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; Reference< XRegistryKey > xNewKey = xKey->createKey( str ); xNewKey->createKey( OPipeTest_getServiceName() ); - str = OUString("/") + + str = "/" + OPumpTest_getImplementationName() + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OPumpTest_getServiceName() ); - str = OUString("/") + + str = "/" + ODataStreamTest_getImplementationName(1) + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( ODataStreamTest_getServiceName(1) ); - str = OUString("/") + + str = "/" + ODataStreamTest_getImplementationName(2) + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( ODataStreamTest_getServiceName(2) ); - str = OUString("/") + + str = "/" + OObjectStreamTest_getImplementationName(1) + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OObjectStreamTest_getServiceName(1) ); - str = OUString("/") + + str = "/" + OObjectStreamTest_getImplementationName(2) + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OObjectStreamTest_getServiceName(2) ); - str = OUString("/") + + str = "/" + OMarkableOutputStreamTest_getImplementationName() + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OMarkableOutputStreamTest_getServiceName() ); - str = OUString("/") + + str = "/" + OMarkableInputStreamTest_getImplementationName() + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OMarkableInputStreamTest_getServiceName() ); - str = OUString("/") + + str = "/" + OMyPersistObject_getImplementationName() + - OUString("/UNO/SERVICES"); + "/UNO/SERVICES"; xNewKey = xKey->createKey( str ); xNewKey->createKey( OMyPersistObject_getServiceName() ); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 25667848c54f..4f5a877b8852 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -161,7 +161,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) return false; if (m_sJavaHome.isEmpty()) - m_sJavaHome = OUString("file:///usr/lib"); + m_sJavaHome = "file:///usr/lib"; // init m_sRuntimeLibrary OSL_ASSERT(!m_sHome.isEmpty()); @@ -226,9 +226,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) #ifdef X86_64 //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead - if (!bRt && m_sJavaHome != OUString("file:///usr/lib")) + if (!bRt && m_sJavaHome != "file:///usr/lib") { - m_sHome = OUString("file:///usr/lib64"); + m_sHome = "file:///usr/lib64"; for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index b1d75f7e6c86..b1c5eaf286c4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -403,7 +403,7 @@ bool getJavaProps(const OUString & exePath, //prepare the arguments sal_Int32 cArgs = 3; - OUString arg1 = OUString("-classpath");// + sClassPath; + OUString arg1 = "-classpath";// + sClassPath; OUString arg2 = sClassPath; OUString arg3("JREProperties"); OUString arg4 = "noaccessibility"; @@ -744,7 +744,7 @@ bool getJREInfoFromBinPath( && (index + sMapPath.getLength() == sBinPath.getLength()) && sBinPath[index - 1] == '/') { - sHome = OUString(sBinPath.getStr(), index - 1); + sHome = sBinPath.copy(index - 1); } } if (!sHome.isEmpty()) diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 993ddb3cf729..7bae8ba093b5 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -248,11 +248,11 @@ OUString findPlugin( OUString url; #ifdef UNX #if defined(MACOSX) - OUString path = OUString("DYLD_LIBRARY_PATH"); + OUString path = "DYLD_LIBRARY_PATH"; #elif defined(AIX) - OUString path = OUString("LIBPATH"); + OUString path = "LIBPATH"; #else - OUString path = OUString("LD_LIBRARY_PATH"); + OUString path = "LD_LIBRARY_PATH"; #endif OUString env_path; oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData); diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index b01bf7b7ef90..edc075e86787 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -340,31 +340,31 @@ OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle) { default: case AH_ARROW_FULLARROW: - aArrowName = OUString("Symmetric arrow"); + aArrowName = "Symmetric arrow"; break; case AH_ARROW_HALFARROW: - aArrowName = OUString("Arrow concave"); + aArrowName = "Arrow concave"; break; case AH_ARROW_LINEARROW: - aArrowName = OUString("arrow100"); + aArrowName = "arrow100"; break; case AH_ARROW_INVFULLARROW: - aArrowName = OUString("reverse arrow"); + aArrowName = "reverse arrow"; break; case AH_ARROW_INVHALFARROW: - aArrowName = OUString("reverse concave arrow"); + aArrowName = "reverse concave arrow"; break; case AH_ARROW_INVLINEARROW: - aArrowName = OUString("reverse line arrow"); + aArrowName = "reverse line arrow"; break; case AH_ARROW_TEE: - aArrowName = OUString("Dimension lines"); + aArrowName = "Dimension lines"; break; case AH_ARROW_SQUARE: - aArrowName = OUString("Square"); + aArrowName = "Square"; break; case AH_ARROW_CIRCLE: - aArrowName = OUString("Circle"); + aArrowName = "Circle"; break; } diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index a627faaa78b3..8e55ebbbf52a 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -194,7 +194,7 @@ sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) t Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw() { Sequence< OUString > seq(1); - seq.getArray()[0] = OUString( STR_SERVICE_NAME ); + seq[0] = STR_SERVICE_NAME; return seq; } @@ -240,7 +240,7 @@ OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence if(!bOpenAsTemplate) { aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = OUString("AsTemplate"); + aDescriptor[nPropertyCount].Name = "AsTemplate"; aDescriptor[nPropertyCount].Value <<= sal_True; } return OUString("wordpro_template"); @@ -262,7 +262,7 @@ OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence if(rc != osl::FileBase::E_None) { SAXException except; - except.Message = OUString( "GDocting system path from URL failed!"); + except.Message = "GDocting system path from URL failed!"; throw except; } */ @@ -274,7 +274,7 @@ OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence if(!bOpenAsTemplate) { aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = OUString("AsTemplate"); + aDescriptor[nPropertyCount].Name = "AsTemplate"; aDescriptor[nPropertyCount].Value <<= sal_True; } return OUString("wordpro_template"); diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 27dedc073512..d03216a7b0b0 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -273,19 +273,19 @@ OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber) case NUMCHAR_1: case NUMCHAR_01: case NUMCHAR_Chinese4: - strNumChar = OUString("1"); + strNumChar = "1"; break; case NUMCHAR_A : - strNumChar = OUString("A"); + strNumChar = "A"; break; case NUMCHAR_a: - strNumChar = OUString("a"); + strNumChar = "a"; break; case NUMCHAR_I: - strNumChar = OUString("I"); + strNumChar = "I"; break; case NUMCHAR_i: - strNumChar = OUString("i"); + strNumChar = "i"; break; case NUMCHAR_other: uC = static_cast<UChar32>(pParaNumber->GetNumberChar()); diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index f6181e70ff74..f6225d82086b 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -95,7 +95,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() // 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; } /* }}} */ @@ -185,7 +185,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() } // find the factory symbol - const OUString sSymbolName = OUString( "sql_mysql_get_driver_instance" ); + const OUString sSymbolName = "sql_mysql_get_driver_instance"; typedef void* (* FGetMySQLDriver)(); const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) ); diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 86d4da0756f8..37c4b61fe4e4 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -54,7 +54,7 @@ namespace my_sc_impl Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl() { Sequence< OUString > names(1); - names[0] = OUString("my_module.MyService1"); + names[0] = "my_module.MyService1"; return names; } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index f23e5cfee55c..c9ed065fd690 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -60,7 +60,7 @@ extern Reference< XInterface > SAL_CALL create_MyService1Impl( static Sequence< OUString > getSupportedServiceNames_MyService2Impl() { Sequence<OUString> names(1); - names[0] = OUString("my_module.MyService2"); + names[0] = "my_module.MyService2"; return names; } diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index 65cff20f4ea0..355d760abbce 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -152,25 +152,25 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) // return type for class found if (aMimeType.equals("application/x-vnd.oasis.opendocument.text") || aMimeType.equals("application/vnd.oasis.opendocument.text")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_writer"); + sTypeName = "devguide_FlatXMLType_Cpp_writer"; else if (aMimeType.equals("application/x-vnd.oasis.opendocument.text-master") || aMimeType.equals("application/vnd.oasis.opendocument.text-master")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_master"); + sTypeName = "devguide_FlatXMLType_Cpp_master"; else if (aMimeType.equals("application/x-vnd.oasis.openoffice.text-global") || aMimeType.equals("application/vnd.oasis.openoffice.text-global")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_master"); + sTypeName = "devguide_FlatXMLType_Cpp_master"; else if (aMimeType.equals("application/x-vnd.oasis.opendocument.spreadsheet") || aMimeType.equals("application/vnd.oasis.opendocument.spreadsheet")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_calc"); + sTypeName = "devguide_FlatXMLType_Cpp_calc"; else if (aMimeType.equals("application/x-vnd.oasis.opendocument.drawing") || aMimeType.equals("application/vnd.oasis.opendocument.drawing")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_draw"); + sTypeName = "devguide_FlatXMLType_Cpp_draw"; else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") || aMimeType.equals("application/vnd.oasis.opendocument.presentation")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_impress"); + sTypeName = "devguide_FlatXMLType_Cpp_impress"; else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") || aMimeType.equals("application/vnd.oasis.opendocument.presentation")) - sTypeName = OUString("devguide_FlatXMLType_Cpp_impress"); + sTypeName = "devguide_FlatXMLType_Cpp_impress"; } } return sTypeName; diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 36d90fe014b1..2b7c4b3251d4 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -209,7 +209,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString("com.sun.star.bridge.example.RemoteClientSample"); + seqNames[0] = "com.sun.star.bridge.example.RemoteClientSample"; pNames = &seqNames; } } diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 34068ec54cd1..f20b1f07414c 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1586,7 +1586,7 @@ OUString ZipPackage::static_getImplementationName() Sequence< OUString > ZipPackage::static_getSupportedServiceNames() { uno::Sequence< OUString > aNames( 1 ); - aNames[0] = OUString("com.sun.star.packages.Package"); + aNames[0] = "com.sun.star.packages.Package"; return aNames; } diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 39e68dc03205..1ac7294125e0 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -82,11 +82,11 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo ) { if( m_aPDFBtn.IsChecked() ) { - rInfo.m_aFeatures = OUString("pdf="); + rInfo.m_aFeatures = "pdf="; } else if( m_aFaxBtn.IsChecked() ) { - rInfo.m_aFeatures = OUString("fax"); + rInfo.m_aFeatures = "fax"; } else rInfo.m_aFeatures = ""; @@ -683,7 +683,7 @@ void APFaxDriverPage::fill( PrinterInfo& rInfo ) { if( isDefault() ) { - rInfo.m_aDriverName = OUString("SGENPRT"); + rInfo.m_aDriverName = "SGENPRT"; } } @@ -716,9 +716,9 @@ bool APPdfDriverPage::check() void APPdfDriverPage::fill( PrinterInfo& rInfo ) { if( isDefault() ) - rInfo.m_aDriverName = OUString("SGENPRT"); + rInfo.m_aDriverName = "SGENPRT"; else if( isDist() ) - rInfo.m_aDriverName = OUString("ADISTILL"); + rInfo.m_aDriverName = "ADISTILL"; } //-------------------------------------------------------------------- @@ -1004,7 +1004,7 @@ void AddPrinterDialog::addPrinter() } else if( m_pChooseDevicePage->isFax() ) { - aInfo.m_aFeatures = OUString("fax="); + aInfo.m_aFeatures = "fax="; if( m_pFaxNamePage->isFaxSwallow() ) aInfo.m_aFeatures += "swallow"; } diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 0446d7b26d7b..bb7cb8e65d81 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -177,11 +177,11 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) osl_getModuleURLFromFunctionAddress( reinterpret_cast< oslGenericFunction >(readLoggingConfig), (rtl_uString **) &fileName ); - fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 ); + fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 ); #if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE fileName += "../" LIBO_ETC_FOLDER "/"; #endif - fileName += OUString( SAL_CONFIGFILE("pyuno" )); + fileName += SAL_CONFIGFILE("pyuno" ); rtl::Bootstrap bootstrapHandle( fileName ); OUString str; @@ -913,12 +913,12 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue, } else { - str = OUString("Couldn't find uno._uno_extract_printable_stacktrace"); + str = "Couldn't find uno._uno_extract_printable_stacktrace"; } } else { - str = OUString("Could not load uno.py, no stacktrace available"); + str = "Could not load uno.py, no stacktrace available"; if ( !e.Message.isEmpty() ) { str += OUString (" (Error loading uno.py: "); @@ -931,7 +931,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue, else { // it may occur, that no traceback is given (e.g. only native code below) - str = OUString( "no traceback available" ); + str = "no traceback available"; } if( isInstanceOfStructOrException( excValue.get() ) ) diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx index a202b197cf01..4a850fbf0cec 100644 --- a/registry/workben/regspeed.cxx +++ b/registry/workben/regspeed.cxx @@ -178,7 +178,7 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 i=0; i < S1; i++) { - keyName1 = OUString("/"); + keyName1 = "/"; keyName1 += sName1; keyName1 += OUString().valueOf(i); if (reg_openKey(hRootKey, keyName1.pData, &hKey)) @@ -187,7 +187,7 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 j=0; j < S2; j++) { - keyName2 = OUString("/"); + keyName2 = "/"; keyName2 += sName1; keyName2 += OUString().valueOf(i); keyName2 += "/"; @@ -199,7 +199,7 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 n=0; n < S3; n++) { - keyName3 = OUString("/"); + keyName3 = "/"; keyName3 += sName1; keyName3 += OUString().valueOf(i); keyName3 += "/"; diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index f0821311b80d..cf47d48427fe 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -245,7 +245,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString("com.sun.star.bridge.example.OfficeClientExample"); + seqNames[0] = "com.sun.star.bridge.example.OfficeClientExample"; pNames = &seqNames; } } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 721c9db6c207..c11ee3c1d1ca 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -306,7 +306,7 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon m_pReportControllerObserver = new OXReportControllerObserver(*this); m_pReportControllerObserver->acquire(); - m_sMode = OUString("normal"); + m_sMode = "normal"; DBG_CTOR( rpt_OReportController,NULL); registerProperty(OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index d61ac44d872d..e58f75aae97c 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -200,7 +200,7 @@ Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance( Sequence< OUString > SaxExpatParser::getSupportedServiceNames_Static(void) throw () { Sequence<OUString> aRet(1); - aRet.getArray()[0] = OUString( SERVICE_NAME ); + aRet[0] = SERVICE_NAME; return aRet; } @@ -638,7 +638,7 @@ Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw () { Sequence<OUString> seq(1); - seq.getArray()[0] = OUString( SERVICE_NAME ); + seq[0] = SERVICE_NAME; return seq; } @@ -653,73 +653,73 @@ OUString getErrorMessage( XML_Error xmlE, OUString sSystemId , sal_Int32 nLine ) { OUString Message; if( XML_ERROR_NONE == xmlE ) { - Message = OUString("No"); + Message = "No"; } else if( XML_ERROR_NO_MEMORY == xmlE ) { - Message = OUString("no memory"); + Message = "no memory"; } else if( XML_ERROR_SYNTAX == xmlE ) { - Message = OUString("syntax"); + Message = "syntax"; } else if( XML_ERROR_NO_ELEMENTS == xmlE ) { - Message = OUString("no elements"); + Message = "no elements"; } else if( XML_ERROR_INVALID_TOKEN == xmlE ) { - Message = OUString("invalid token"); + Message = "invalid token"; } else if( XML_ERROR_UNCLOSED_TOKEN == xmlE ) { - Message = OUString("unclosed token"); + Message = "unclosed token"; } else if( XML_ERROR_PARTIAL_CHAR == xmlE ) { - Message = OUString("partial char"); + Message = "partial char"; } else if( XML_ERROR_TAG_MISMATCH == xmlE ) { - Message = OUString("tag mismatch"); + Message = "tag mismatch"; } else if( XML_ERROR_DUPLICATE_ATTRIBUTE == xmlE ) { - Message = OUString("duplicate attribute"); + Message = "duplicate attribute"; } else if( XML_ERROR_JUNK_AFTER_DOC_ELEMENT == xmlE ) { - Message = OUString("junk after doc element"); + Message = "junk after doc element"; } else if( XML_ERROR_PARAM_ENTITY_REF == xmlE ) { - Message = OUString("parameter entity reference"); + Message = "parameter entity reference"; } else if( XML_ERROR_UNDEFINED_ENTITY == xmlE ) { - Message = OUString("undefined entity"); + Message = "undefined entity"; } else if( XML_ERROR_RECURSIVE_ENTITY_REF == xmlE ) { - Message = OUString("recursive entity reference"); + Message = "recursive entity reference"; } else if( XML_ERROR_ASYNC_ENTITY == xmlE ) { - Message = OUString("async entity"); + Message = "async entity"; } else if( XML_ERROR_BAD_CHAR_REF == xmlE ) { - Message = OUString("bad char reference"); + Message = "bad char reference"; } else if( XML_ERROR_BINARY_ENTITY_REF == xmlE ) { - Message = OUString("binary entity reference"); + Message = "binary entity reference"; } else if( XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF == xmlE ) { - Message = OUString("attribute external entity reference"); + Message = "attribute external entity reference"; } else if( XML_ERROR_MISPLACED_XML_PI == xmlE ) { - Message = OUString("misplaced xml processing instruction"); + Message = "misplaced xml processing instruction"; } else if( XML_ERROR_UNKNOWN_ENCODING == xmlE ) { - Message = OUString("unknown encoding"); + Message = "unknown encoding"; } else if( XML_ERROR_INCORRECT_ENCODING == xmlE ) { - Message = OUString("incorrect encoding"); + Message = "incorrect encoding"; } else if( XML_ERROR_UNCLOSED_CDATA_SECTION == xmlE ) { - Message = OUString("unclosed cdata section"); + Message = "unclosed cdata section"; } else if( XML_ERROR_EXTERNAL_ENTITY_HANDLING == xmlE ) { - Message = OUString("external entity reference"); + Message = "external entity reference"; } else if( XML_ERROR_NOT_STANDALONE == xmlE ) { - Message = OUString("not standalone"); + Message = "not standalone"; } OUString str("["); diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index ee041fd87480..6d8f80f2a412 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -777,7 +777,7 @@ bool Converter::convertDuration(double& rfTime, nSecs = nTemp; nTemp = 0; bIsFraction = true; - sDoubleStr = OUString("0."); + sDoubleStr = "0."; } else if ( c == sal_Unicode('S') ) { @@ -785,7 +785,7 @@ bool Converter::convertDuration(double& rfTime, { nSecs = nTemp; nTemp = 0; - sDoubleStr = OUString("0.0"); + sDoubleStr = "0.0"; } } else diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index b4b354d7d2c5..9d41e2bcde56 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -283,7 +283,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = OUString("ItemDescriptorContainer"); + aProp.Name = "ItemDescriptorContainer"; aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -294,7 +294,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = OUString("Type"); + sProps[ 0 ].Name = "Type"; sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 328af86ab1f5..a373bc2a8e0f 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -257,7 +257,7 @@ ScPrintUIOptions::ScPrintUIOptions() ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); + aPrintRangeOpt.maGroupHint = "PrintRange"; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aStrings.GetString(2)), OUString(), aPrintRangeOpt); @@ -1027,7 +1027,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); + pArray[0].Name = SC_UNONAME_PAGESIZE; pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1074,17 +1074,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); + pArray[0].Name = SC_UNONAME_PAGESIZE; pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = OUString( SC_UNONAME_INC_NP_AREA ); + pArray[1].Name = SC_UNONAME_INC_NP_AREA; pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = OUString( SC_UNONAME_SOURCERANGE ); + pArray[2].Name = SC_UNONAME_SOURCERANGE; pArray[2].Value <<= aRangeAddress; } @@ -1567,7 +1567,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); OUString sOUName(sName); - aSeq[0].Name = OUString(SC_ACTIVETABLE); + aSeq[0].Name = SC_ACTIVETABLE; aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -2043,9 +2043,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence<OUString> aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = OUString( SCMODELOBJ_SERVICE ); - pArray[1] = OUString( SCDOCSETTINGS_SERVICE ); + aRet[0] = SCMODELOBJ_SERVICE; + aRet[1] = SCDOCSETTINGS_SERVICE; return aRet; } diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index a7809f3dee1d..982efec183d2 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -327,7 +327,7 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) if ( !xModel.is() ) throw uno::RuntimeException(); - maStatus = OUString(); + maStatus = ""; mbSuccess = false; if ( mnEpsilonLevel < EPS_TIGHT || mnEpsilonLevel > EPS_BAGGY ) @@ -572,7 +572,7 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) uno::Sequence< OUString > SolverComponent_getSupportedServiceNames() { uno::Sequence< OUString > aServiceNames( 1 ); - aServiceNames[ 0 ] = OUString("com.sun.star.sheet.Solver" ); + aServiceNames[ 0 ] = "com.sun.star.sheet.Solver"; return aServiceNames; } diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index b8aec63a67ec..40f46cefea81 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -261,7 +261,7 @@ namespace basprov Sequence < PropertyValue > aArgs(7); aArgs[0].Name = "Document"; aArgs[0].Value <<= sDocURL; - aArgs[1].Name = OUString("LibName"); + aArgs[1].Name = "LibName"; aArgs[1].Value <<= sLibName; aArgs[2].Name = "Name"; aArgs[2].Value <<= sModName; diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 8dc8453cad1f..d11d8f43adc6 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -139,9 +139,9 @@ namespace { uno::makeAny(aLabel)); uno::Sequence<OUString> aListboxItems(3); - aListboxItems[DRAW_INDEX] = OUString( "Drawing" ); - aListboxItems[IMPRESS_INDEX] = OUString( "Presentation" ); - aListboxItems[WRITER_INDEX] = OUString( "Text Document" ); + aListboxItems[DRAW_INDEX] = "Drawing"; + aListboxItems[IMPRESS_INDEX] = "Presentation"; + aListboxItems[WRITER_INDEX] = "Text Document"; m_xListbox->addItems(aListboxItems,0); m_xListbox->selectItemPos(0,sal_True); @@ -167,7 +167,7 @@ namespace { virtual uno::Sequence< OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) { uno::Sequence< OUString > aMethods(1); - aMethods[0] = OUString( "SelectionChanged" ); + aMethods[0] = "SelectionChanged"; return aMethods; } }; @@ -434,14 +434,14 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF { if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) ) - aOutFilterName = OUString( "writer_pdf_addstream_import" ); + aOutFilterName = "writer_pdf_addstream_import"; else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" ) - aOutFilterName = OUString( "impress_pdf_addstream_import" ); + aOutFilterName = "impress_pdf_addstream_import"; else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) ) - aOutFilterName = OUString( "draw_pdf_addstream_import" ); + aOutFilterName = "draw_pdf_addstream_import"; else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" ) - aOutFilterName = OUString( "calc_pdf_addstream_import" ); + aOutFilterName = "calc_pdf_addstream_import"; } } @@ -456,7 +456,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF rFilterData[ nFilterNamePos ].Name = OUString( "FilterName" ); } - aOutTypeName = OUString("pdf_Portable_Document_Format"); + aOutTypeName = "pdf_Portable_Document_Format"; OSL_TRACE( "setting filter name %s, input stream %s\n", OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), @@ -466,7 +466,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF if( xEmbedStream.is() ) { rFilterData.realloc( ++nAttribs ); - rFilterData[nAttribs-1].Name = OUString( "EmbeddedSubstream" ); + rFilterData[nAttribs-1].Name = "EmbeddedSubstream"; rFilterData[nAttribs-1].Value <<= xEmbedStream; } if( !aPwd.isEmpty() ) @@ -475,7 +475,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF { nPwdPos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nPwdPos ].Name = OUString( "Password" ); + rFilterData[ nPwdPos ].Name = "Password"; } rFilterData[ nPwdPos ].Value <<= aPwd; } @@ -486,7 +486,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF { nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nFilterNamePos ].Name = OUString( "FilterName" ); + rFilterData[ nFilterNamePos ].Name = "FilterName"; } const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL); @@ -512,7 +512,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF OSL_FAIL("Unexpected case"); } - aOutTypeName = OUString("pdf_Portable_Document_Format"); + aOutTypeName = "pdf_Portable_Document_Format"; } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 6e88fbef2d8a..bd80b60a5aaa 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -701,12 +701,12 @@ void PresenterScreen::ProcessLayout ( UNO_QUERY_THROW); ::std::vector<OUString> aProperties (6); - aProperties[0] = OUString("PaneURL"); - aProperties[1] = OUString("ViewURL"); - aProperties[2] = OUString("RelativeX"); - aProperties[3] = OUString("RelativeY"); - aProperties[4] = OUString("RelativeWidth"); - aProperties[5] = OUString("RelativeHeight"); + aProperties[0] = "PaneURL"; + aProperties[1] = "ViewURL"; + aProperties[2] = "RelativeX"; + aProperties[3] = "RelativeY"; + aProperties[4] = "RelativeWidth"; + aProperties[5] = "RelativeHeight"; mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xList, @@ -732,10 +732,10 @@ void PresenterScreen::ProcessViewDescriptions ( UNO_QUERY_THROW); ::std::vector<OUString> aProperties (4); - aProperties[0] = OUString("ViewURL"); - aProperties[1] = OUString("Title"); - aProperties[2] = OUString("AccessibleTitle"); - aProperties[3] = OUString("IsOpaque"); + aProperties[0] = "ViewURL"; + aProperties[1] = "Title"; + aProperties[2] = "AccessibleTitle"; + aProperties[3] = "IsOpaque"; mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xViewDescriptionsNode, diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 4c59b259f0eb..79d13d6179f2 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1451,7 +1451,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY); //Layer Name which enables to catch annotations - OUString layerName = OUString("DrawnInSlideshow"); + OUString layerName = "DrawnInSlideshow"; uno::Any aPropLayer; aPropLayer <<= layerName; diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 2b24d493634d..6ada882c77f2 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -140,19 +140,18 @@ void Test::test() { test::getTestArgument( OUString("smoketest.doc"), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(2); - args[0].Name = OUString("MacroExecutionMode"); + args[0].Name = "MacroExecutionMode"; args[0].Handle = -1; args[0].Value <<= com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = css::beans::PropertyState_DIRECT_VALUE; - args[1].Name = OUString("ReadOnly"); + args[1].Name = "ReadOnly"; args[1].Handle = -1; args[1].Value <<= sal_True; args[1].State = css::beans::PropertyState_DIRECT_VALUE; css::util::URL url; - url.Complete = OUString( - "vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?" - "language=Basic&location=document"); + url.Complete = "vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?" + "language=Basic&location=document"; css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(connection_.getComponentContext()); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index e7b1275aca19..9f9d50dd6e12 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1675,7 +1675,7 @@ void UCBStorage_Impl::Init() { // Hack! Avoid access to the manifest file until mediatype is not available in the first segment of a // disk spanned file - m_aContentType = m_aOriginalContentType = OUString( "application/vnd.sun.xml.impress" ); + m_aContentType = m_aOriginalContentType = "application/vnd.sun.xml.impress"; } else if ( m_pContent ) { @@ -1794,11 +1794,10 @@ void UCBStorage_Impl::ReadContent() // create cursor for access to children Sequence< OUString > aProps(4); - OUString* pProps = aProps.getArray(); - pProps[0] = OUString("Title"); - pProps[1] = OUString("IsFolder"); - pProps[2] = OUString("MediaType"); - pProps[3] = OUString("Size"); + aProps[0] = "Title"; + aProps[1] = "IsFolder"; + aProps[2] = "MediaType"; + aProps[3] = "Size"; ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -2017,9 +2016,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert if ( !m_bIsRoot ) aPath += m_aName; aPath += "/"; - aProps[0].Name = OUString("MediaType"); + aProps[0].Name = "MediaType"; aProps[0].Value <<= (OUString ) m_aContentType; - aProps[1].Name = OUString("FullPath"); + aProps[1].Name = "FullPath"; aProps[1].Value <<= (OUString ) aPath; rSequence[ nProps++ ] = aProps; @@ -2040,9 +2039,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert // properties of streams OUString aElementPath( aPath ); aElementPath += pElement->m_aName; - aProps[0].Name = OUString("MediaType"); + aProps[0].Name = "MediaType"; aProps[0].Value <<= (OUString ) pElement->GetContentType(); - aProps[1].Name = OUString("FullPath"); + aProps[1].Name = "FullPath"; aProps[1].Value <<= (OUString ) aElementPath; rSequence[ nProps++ ] = aProps; } @@ -2088,11 +2087,9 @@ bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent ) continue; Sequence < OUString > aNames(1); - OUString* pNames = aNames.getArray(); - pNames[0] = OUString( "Title" ); + aNames[0] = "Title"; Sequence < Any > aValues(1); - Any* pValues = aValues.getArray(); - pValues[0] = makeAny( OUString( m_aName ) ); + aValues[0] = makeAny( OUString( m_aName ) ); Content aNewFolder; if ( !pContent->insertNewContent( rCurr.Type, aNames, aValues, aNewFolder ) ) @@ -2190,7 +2187,7 @@ sal_Int16 UCBStorage_Impl::Commit() if ( pElement->m_xStream->m_bIsOLEStorage ) { // OLE storage should be stored encrytped, if the storage uses encryption - pElement->m_xStream->m_aContentType = OUString("application/vnd.sun.star.oleobject"); + pElement->m_xStream->m_aContentType = "application/vnd.sun.star.oleobject"; Any aValue; aValue <<= (sal_Bool)sal_True; pElement->m_xStream->m_pContent->setPropertyValue("Encrypted", aValue ); @@ -3192,8 +3189,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName ) // assemble a new folder name in the destination folder INetURLObject aObj( rName ); OUString aTmpName = aObj.GetName(); - OUString aTitle = OUString( "content." ); - aTitle += aTmpName; + OUString aTitle = "content." + aTmpName; // create a folder and store its URL Content aFolder( aFolderURL, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); @@ -3231,8 +3227,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName ) OUString aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); // store it as key/value pair - OUString aLink = OUString("ContentURL="); - aLink += aURL; + OUString aLink = "ContentURL=" + aURL; write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 712f3518b7b2..b2d14402f4b4 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -76,7 +76,7 @@ OLESimpleStorage::~OLESimpleStorage() uno::Sequence< OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.embed.OLESimpleStorage"); + aRet[0] = "com.sun.star.embed.OLESimpleStorage"; return aRet; } diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 89ef87dcff27..196ee266052f 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -532,15 +532,15 @@ void SmElementsControl::build() break; case RID_CATEGORY_EXAMPLES: { - OUString aEquation = OUString("C=%pi cdot d = 2 cdot %pi cdot r"); + OUString aEquation = "C=%pi cdot d = 2 cdot %pi cdot r"; addElement(aEquation, aEquation, ""); - aEquation = OUString("E=mc^2"); + aEquation = "E=mc^2"; addElement(aEquation, aEquation, ""); - aEquation = OUString("a^2 + b^2 = c^2"); + aEquation = "a^2 + b^2 = c^2"; addElement(aEquation, aEquation, ""); - aEquation = OUString("f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}"); + aEquation = "f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}"; addElement(aEquation, aEquation, ""); - aEquation = OUString("f ( x ) = {1} over {%sigma sqrt{2%pi} }e^-{{(x-%mu)^2} over {2%sigma^2}}"); + aEquation = "f ( x ) = {1} over {%sigma sqrt{2%pi} }e^-{{(x-%mu)^2} over {2%sigma^2}}"; addElement(aEquation, aEquation, ""); } break; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6e5391c5bbfc..f2a4eab73165 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -83,7 +83,7 @@ SmPrintUIOptions::SmPrintUIOptions() m_aUIProperties.realloc( nNumProps ); // load the math PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx].Name = "OptionsUIFile"; m_aUIProperties[nIdx++].Value <<= OUString("modules/smath/ui/printeroptions.ui"); // create Section for formula (results in an extra tab page in dialog) diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index a8f4eb1cd828..ee8682f397fc 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -318,11 +318,11 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con { switch (pEntry->eState) { - case SFX_ITEM_UNKNOWN : sRet=OUString("Unknown"); break; - case SFX_ITEM_DISABLED: sRet=OUString("Disabled"); break; - case SFX_ITEM_DONTCARE: sRet=OUString("DontCare"); break; - case SFX_ITEM_SET : sRet=OUString("Set"); break; - case SFX_ITEM_DEFAULT : sRet=OUString("Default"); break; + case SFX_ITEM_UNKNOWN : sRet = "Unknown"; break; + case SFX_ITEM_DISABLED: sRet = "Disabled"; break; + case SFX_ITEM_DONTCARE: sRet = "DontCare"; break; + case SFX_ITEM_SET : sRet = "Set"; break; + case SFX_ITEM_DEFAULT : sRet = "Default"; break; } // switch } break; case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break; diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 3972d451642c..d04028dd9f52 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -241,7 +241,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) UnoActionContext aCont(m_pImpl->m_pDoc); if (m_pImpl->m_sMarkName.isEmpty()) { - m_pImpl->m_sMarkName = OUString("Bookmark"); + m_pImpl->m_sMarkName = "Bookmark"; } if ((eType == IDocumentMarkAccess::BOOKMARK) && ::sw::mark::CrossRefNumItemBookmark::IsLegalName(m_pImpl->m_sMarkName)) diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 8a3399c145ad..bf25ba89b384 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -36,7 +36,7 @@ void DataPilotField::testSortInfo() uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldSortInfo aSortInfoValue; OUString aSortInfo("SortInfo"); - aSortInfoValue.Field = OUString("Col1"); + aSortInfoValue.Field = "Col1"; aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; uno::Any xValue; @@ -102,7 +102,7 @@ void DataPilotField::testAutoShowInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue; - aAutoShowInfoValue.DataField = OUString("Col1"); + aAutoShowInfoValue.DataField = "Col1"; aAutoShowInfoValue.IsEnabled = true; OUString aAutoShowInfo("AutoShowInfo"); uno::Any xValue; @@ -135,7 +135,7 @@ void DataPilotField::testReference() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldReference aReferenceValue; - aReferenceValue.ReferenceField = OUString("Col1"); + aReferenceValue.ReferenceField = "Col1"; aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; OUString aReference("Reference"); uno::Any xValue; diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index 32012f68a62c..ffcdf13612ca 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -50,19 +50,19 @@ void XNamedRange::testSetContent() OUString aExpectedContent; // test a cell - aExpectedContent = OUString("D1"); + aExpectedContent = "D1"; xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent().equals(aExpectedContent)); // test a cellrange - aExpectedContent = OUString("D1:D10"); + aExpectedContent = "D1:D10"; xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent().equals(aExpectedContent)); // test a formula - aExpectedContent = OUString("=D10"); + aExpectedContent = "=D10"; xNamedRange->setContent(aExpectedContent); - aExpectedContent = OUString("D10"); + aExpectedContent = "D10"; CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent().equals(aExpectedContent)); } diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 1697d71a66fc..7790a27245df 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -39,7 +39,7 @@ static void out( const sal_Char * pText ) sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, sal_uInt32 * pnIndex, const OUString & aArg) { - const OUString dash = OUString("-"); + const OUString dash = "-"; if(aArg.indexOf(dash) != 0) return sal_False; diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 377736cfabdd..be514af6b9c3 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -542,27 +542,27 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u case 92500: case 92501: case 92504: case 92505: { #if defined(WNT) - FNam=OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman + FNam = "Times New Roman"; // CG Times ist unter Windows Times New Roman #else - FNam=OUString("Times"); // ansonsten ist das einfach Times + FNam = "Times"; // ansonsten ist das einfach Times #endif StdBrei=40; aFont.SetFamily(FAMILY_ROMAN); } break; case 94021: case 94022: case 94023: case 94024: { #if defined(WNT) - FNam=OUString("Arial"); // Univers ist unter Windows Arial + FNam = "Arial"; // Univers ist unter Windows Arial #else - FNam=OUString("Helvetica"); // und ansonsten Helvetica + FNam = "Helvetica"; // und ansonsten Helvetica #endif aFont.SetFamily(FAMILY_SWISS); StdBrei=47; } break; case 93950: case 93951: case 93952: case 93953: { #if defined(WNT) - FNam=OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New + FNam = "Courier New"; // Der Vector-Courierfont unter Windows heisst Courier New #else - FNam=OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier + FNam = "Courier"; // ansonsten ist und bleibt Courier immer Courier #endif aFont.SetFamily(FAMILY_ROMAN); aFont.SetPitch(PITCH_FIXED); diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 57ecb5781053..1e2c8643f92f 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -123,7 +123,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName) xml::AttributeData aData; aData.Namespace = mpContainer->GetAttrNamespace(nAttr); - aData.Type = OUString("CDATA"); + aData.Type = "CDATA"; aData.Value = mpContainer->GetAttrValue(nAttr); uno::Any aAny; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 58cd9384850b..03b6d7f367bc 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2525,13 +2525,13 @@ void SdXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) xPropSet->getPropertyValue("VisibleArea") >>= aVisArea; sal_uInt16 i = 0; - pProps[i].Name = OUString("VisibleAreaTop"); + pProps[i].Name = "VisibleAreaTop"; pProps[i++].Value <<= aVisArea.Y; - pProps[i].Name = OUString("VisibleAreaLeft"); + pProps[i].Name = "VisibleAreaLeft"; pProps[i++].Value <<= aVisArea.X; - pProps[i].Name = OUString("VisibleAreaWidth"); + pProps[i].Name = "VisibleAreaWidth"; pProps[i++].Value <<= aVisArea.Width; - pProps[i].Name = OUString("VisibleAreaHeight"); + pProps[i].Name = "VisibleAreaHeight"; pProps[i++].Value <<= aVisArea.Height; } } diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index b7a0e6e7dfe5..d99642d62ef2 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -199,7 +199,7 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) if( !sParent.isEmpty() ) sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent ); else - sParent = OUString("Standard"); + sParent = "Standard"; pProps->Value <<= sParent; ++pProps; pProps->Name = "ParaConditionalStyleName"; |