Kaydet (Commit) e52779d2 authored tarafından Noel Grandin's avatar Noel Grandin

remove unnecessary use of OUString constructor

Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
üst e9c4ee99
......@@ -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) );
}
......
......@@ -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
......
......@@ -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");
......
......@@ -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 =
......
......@@ -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 );
}
}
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 >() );
}
}
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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)")));
......
......@@ -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 );
......
......@@ -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;
}
}
......
......@@ -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);
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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);
......
......@@ -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));
......
......@@ -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);
}
......
......@@ -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)
{