[Libreoffice-commits] core.git: basctl/source basic/qa canvas/source dbaccess/source desktop/source desktop/unx extensions/source filter/source i18npool/source idlc/source io/source io/test odk/examples padmin/source registry/workben rsc/source sal/qa sax/source sax/test stoc/test store/workben svtools/source svx/source svx/workben sw/source toolkit/source vcl/generic vcl/source vcl/unx writerfilter/qa writerfilter/source
Thomas Arnhold
thomas at arnhold.org
Tue Mar 19 06:18:49 PDT 2013
basctl/source/basicide/baside2b.cxx | 6 +--
basctl/source/basicide/moduldl2.cxx | 2 -
basic/qa/cppunit/test_vba.cxx | 2 -
canvas/source/cairo/cairo_devicehelper.cxx | 2 -
dbaccess/source/ui/browser/dbloader.cxx | 4 +-
dbaccess/source/ui/browser/unodatbr.cxx | 2 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 18 ++++------
desktop/source/app/app.cxx | 6 +--
desktop/source/app/officeipcthread.cxx | 6 +--
desktop/unx/source/officeloader/officeloader.cxx | 2 -
extensions/source/plugin/win/winmgr.cxx | 2 -
filter/source/placeware/exporter.cxx | 2 -
filter/source/placeware/tempfile.cxx | 4 +-
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 4 --
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 2 -
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 4 +-
i18npool/source/localedata/LocaleNode.cxx | 6 +--
idlc/source/idlccompile.cxx | 4 +-
io/source/acceptor/acc_pipe.cxx | 2 -
io/source/acceptor/acc_socket.cxx | 2 -
io/test/testcomponent.cxx | 2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx | 2 -
padmin/source/adddlg.cxx | 2 -
registry/workben/regspeed.cxx | 6 +--
rsc/source/rsc/rsc.cxx | 2 -
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 7 +--
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 4 +-
sax/source/expatwrap/sax_expat.cxx | 6 +--
sax/test/testcomponent.cxx | 4 +-
stoc/test/testregistry.cxx | 8 ++--
stoc/test/testsmgr.cxx | 2 -
store/workben/t_store.cxx | 5 +-
svtools/source/brwbox/brwbox3.cxx | 18 +++++-----
svtools/source/config/printoptions.cxx | 4 +-
svx/source/dialog/docrecovery.cxx | 2 -
svx/source/unodraw/recoveryui.cxx | 4 +-
svx/workben/msview/xmlconfig.cxx | 11 ++----
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
toolkit/source/awt/vclxmenu.cxx | 6 +--
toolkit/source/controls/formattedcontrol.cxx | 2 -
vcl/generic/app/gensys.cxx | 2 -
vcl/source/app/unohelp.cxx | 4 +-
vcl/source/gdi/pdfwriter_impl.cxx | 2 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 -
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 -
46 files changed, 94 insertions(+), 101 deletions(-)
New commits:
commit 5bb4a2ba1d8a6b98720868786e552aa8fd2a22eb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 19 14:16:55 2013 +0100
further OUString cleanup
Change-Id: I19954ee5976cb881a5fe73a889c8e04a19b14eb6
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 8ab5dd9..bb81726 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1366,7 +1366,7 @@ void WatchWindow::AddWatch( const String& rVName )
WatchItem* pWatchItem = new WatchItem(aVar);
OUString aWatchStr_( aVar );
- aWatchStr_ += OUString( "\t\t" );
+ aWatchStr_ += "\t\t";
SvTreeListEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND );
pNewEntry->SetUserData( pWatchItem );
@@ -2121,7 +2121,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else
{
- aWatchStr += OUString( "<?>" );
+ aWatchStr += "<?>";
}
}
else if ( (sal_uInt8)eType == (sal_uInt8)SbxOBJECT )
@@ -2199,7 +2199,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else if( !bArrayElement )
{
- aWatchStr += OUString( "<Out of Scope>" );
+ aWatchStr += "<Out of Scope>";
}
if( bCollapse )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 92e54d0..68b41ba 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -940,7 +940,7 @@ void LibPage::InsertLib()
{
OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) );
aErrStr = aErrStr.replaceAll("XX", aLibName);
- aErrStr += OUString( "\n" );
+ aErrStr += "\n";
aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY);
ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
continue;
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 65338a9..7ce4a4a 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -122,7 +122,7 @@ void VBATest::testMiscOLEStuff()
uno::Sequence< uno::Any > aArgs(1);
// path to test document
OUString sPath = getPathFromSrc("/basic/qa/vba_tests/data/");
- sPath += OUString( "ADODBdata.xls" );
+ sPath += "ADODBdata.xls";
sPath = sPath.replaceAll( "/", "\\" );
aArgs[ 0 ] = uno::makeAny( sPath );
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index f9df779..e8fe710 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -254,7 +254,7 @@ namespace cairocanvas
{
OUString aFilename("dbg_frontbuffer");
aFilename += OUString::valueOf(nFilePostfixCount);
- aFilename += OUString(".bmp");
+ aFilename += ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 4f9d37e..ad7cbb1 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -163,10 +163,10 @@ extern "C" void SAL_CALL writeDBLoaderInfo(void* pRegistryKey)
aImpl += DBContentLoader::getImplementationName_Static();
OUString aImpltwo = aImpl;
- aImpltwo += OUString("/UNO/Loader");
+ aImpltwo += "/UNO/Loader";
Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
aImpltwo = aImpl;
- aImpltwo += OUString("/Loader");
+ aImpltwo += "/Loader";
Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo );
xNewKey = xLoaderKey->createKey( OUString("Pattern") );
xNewKey->setAsciiValue( OUString(".component:DB*") );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 764aec9..d37e762 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3745,7 +3745,7 @@ OUString SbaTableQueryBrowser::getPrivateTitle() const
sTitle = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
if ( !sName.isEmpty() )
{
- sName += OUString(" - ");
+ sName += " - ";
sName += sTitle;
sTitle = sName;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b1b91f6..b9c5279 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -374,9 +374,9 @@ namespace
OUString aQuote = xMetaData->getIdentifierQuoteString();
if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName )
{
- aTableListStr += OUString(" ");
+ aTableListStr += " ";
if ( generateAsBeforeTableAlias( _xConnection ) )
- aTableListStr += OUString("AS ");
+ aTableListStr += "AS ";
aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
}
aDBName = aTableListStr;
@@ -864,9 +864,7 @@ namespace
}
else
{
- aWhereStr += aWork;
- aWhereStr += OUString("=");
- aWhereStr += aCriteria;
+ aWhereStr += aWork + "=" + aCriteria;
}
}
}
@@ -1107,17 +1105,17 @@ namespace
{
// create outer join
if ( bUseEscape )
- aStr += OUString("{ OJ ");
+ aStr += "{ OJ ";
aStr += aJoin;
if ( bUseEscape )
- aStr += OUString(" }");
+ aStr += " }";
}
break;
default:
aStr += aJoin;
break;
}
- aStr += OUString(",");
+ aStr += ",";
aTableListStr += aStr;
}
}
@@ -3108,8 +3106,8 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
{
// first try the international version
OUString sSql;
- sSql += OUString("SELECT * ");
- sSql += OUString(" FROM x WHERE ");
+ sSql += "SELECT * ";
+ sSql += " FROM x WHERE ";
sSql += pEntry->GetField();
sSql += _sCriteria;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3e03a57..eeca5a7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2274,11 +2274,11 @@ void Desktop::OpenClients()
if ( lastIndex > 0 )
{
aIniName = aIniName.copy( 0, lastIndex+1 );
- aIniName += OUString( "perftune" );
+ aIniName += "perftune";
#if defined(WNT)
- aIniName += OUString( ".ini" );
+ aIniName += ".ini";
#else
- aIniName += OUString( "rc" );
+ aIniName += "rc";
#endif
}
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index c416ccc..af44990 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -486,11 +486,11 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
if ( lastIndex > 0 )
{
aIniName = aIniName.copy( 0, lastIndex+1 );
- aIniName += OUString( "perftune" );
+ aIniName += "perftune";
#if defined(WNT)
- aIniName += OUString( ".ini" );
+ aIniName += ".ini";
#else
- aIniName += OUString( "rc" );
+ aIniName += "rc";
#endif
}
diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx
index ba8eb06..2c24a12 100644
--- a/desktop/unx/source/officeloader/officeloader.cxx
+++ b/desktop/unx/source/officeloader/officeloader.cxx
@@ -37,7 +37,7 @@ SAL_IMPLEMENT_MAIN()
osl_getExecutableFile( &sExecutableFile.pData );
- sExecutableFile += OUString(".bin");
+ sExecutableFile += ".bin";
nCommandArgs = osl_getCommandArgCount();
pCommandArgs = new rtl_uString *[nCommandArgs];
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 81d1e55..8052e66 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -409,7 +409,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
{
case ',':
case ';':
- aExtensions += OUString(";*.");
+ aExtensions += ";*.";
case ' ':
break;
case '*':
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index 319b42e..ccc8070 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -346,7 +346,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
OUString aName("i");
aName += OUString::valueOf( nPage );
- aName += OUString(".gif");
+ aName += ".gif";
pEntry->setURL( aName );
if(xStatusIndicator.is())
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 6168d22..b3bd97f 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -147,9 +147,9 @@ OUString TempFile::createTempFileURL()
u %= (nRadix*nRadix*nRadix);
OUString aTmp( aTempDirURL );
if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
- aTmp += OUString( "/" );
+ aTmp += "/";
aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
- aTmp += OUString( ".tmp" );
+ aTmp += ".tmp";
osl::File aFile( aTmp );
osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 15b86e1e..60e5188 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1345,9 +1345,7 @@ OUString getApplicationUIName( const OUString& rServiceName )
OUString aRet = RESIDSTR(STR_UNKNOWN_APPLICATION);
if( !rServiceName.isEmpty() )
{
- aRet += OUString( " (" );
- aRet += rServiceName;
- aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
+ aRet += " (" + rServiceName + ")";
}
return aRet;
}
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c7c78f8..ef3db9d 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -372,7 +372,7 @@ void XMLFilterTestDialog::onExportBrowse()
{
if( n > 0 )
aExtension += OUString( sal_Unicode(';') );
- aExtension += OUString( "*." );
+ aExtension += "*.";
aExtension += (*pExtensions++);
}
}
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 75818ad..61573a9 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -956,9 +956,9 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
for (sal_Int32 j = 1; j <= 3; j++) {
aProperties[1].Value <<= j;
result += makeNumberingString( aProperties, aLocale );
- result += OUString(", ");
+ result += ", ";
}
- result += OUString("...");
+ result += "...";
return result;
}
}
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index f8a9620..9ec83ba 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -704,11 +704,11 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
{
OUString aStr( "Duplicated default for usage=\"");
aStr += aUsage;
- aStr += OUString( "\" type=\"");
+ aStr += "\" type=\"";
aStr += aType;
- aStr += OUString( "\": formatindex=\"");
+ aStr += "\": formatindex=\"";
aStr += aFormatIndex;
- aStr += OUString( "\".");
+ aStr += "\".";
incError( aStr);
}
}
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 8770a2f..2c8beb5e4 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -308,9 +308,9 @@ sal_Int32 compileFile(const OString * pathname)
cpp = cpp.copy(0, idx);
#if defined(SAL_W32)
- cpp += OUString("ucpp.exe");
+ cpp += "ucpp.exe";
#else
- cpp += OUString("ucpp");
+ cpp += "ucpp";
#endif
#else // SYSTEM_UCPP
cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP));
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index a8b8856..b2bc9a8 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -73,7 +73,7 @@ namespace io_acceptor
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString(",uniqueValue=");
+ m_sDescription += ",uniqueValue=";
m_sDescription += OUString::valueOf(
sal::static_int_cast<sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)),
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 1e50814..a5c7e20 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -164,7 +164,7 @@ namespace io_acceptor {
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString( ",uniqueValue=" ) ;
+ m_sDescription += ",uniqueValue=" ;
m_sDescription += OUString::valueOf(
sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_socket)),
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 05be118..9780266 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -102,7 +102,7 @@ int main (int argc, char **argv)
#else
OUString aDllName("lib");
aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
- aDllName += OUString(".so");
+ aDllName += ".so";
#endif
xReg->registerImplementation(
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index 0d57aa2..1dd29d8 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -69,7 +69,7 @@ void REGISTER_PROVIDER(
{
OUString aMainKeyName("/");
aMainKeyName += aServiceImplName;
- aMainKeyName += OUString("/UNO/SERVICES");
+ aMainKeyName += "/UNO/SERVICES";
Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not create a registry key !");
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index b506db2..12c4efa 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -1009,7 +1009,7 @@ void AddPrinterDialog::addPrinter()
{
aInfo.m_aFeatures = OUString("fax=");
if( m_pFaxNamePage->isFaxSwallow() )
- aInfo.m_aFeatures += OUString("swallow");
+ aInfo.m_aFeatures += "swallow";
}
else if( m_pChooseDevicePage->isPDF() )
{
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index 0939b5d..c127202 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -192,7 +192,7 @@ int _cdecl main( int argc, char * argv[] )
keyName2 = OUString("/");
keyName2 += sName1;
keyName2 += OUString().valueOf(i);
- keyName2 += OUString("/");
+ keyName2 += "/";
keyName2 += sName2;
keyName2 += OUString().valueOf(j);
if (reg_openKey(hRootKey, keyName2.pData, &hSubKey))
@@ -204,10 +204,10 @@ int _cdecl main( int argc, char * argv[] )
keyName3 = OUString("/");
keyName3 += sName1;
keyName3 += OUString().valueOf(i);
- keyName3 += OUString("/");
+ keyName3 += "/";
keyName3 += sName2;
keyName3 += OUString().valueOf(j);
- keyName3 += OUString("/");
+ keyName3 += "/";
keyName3 += sName3;
keyName3 += OUString().valueOf(n);
if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index de18023..7489218 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -829,7 +829,7 @@ ERRTYPE RscCompiler::Link()
OUString sIlstUrl;
sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
- sIlstUrl += OUString(".ilst");
+ sIlstUrl += ".ilst";
sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
aSysList = lcl_getSystemPath(sIlstUrl);
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 0cab17f..b7b1640 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -112,7 +112,7 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
{
rtl::OUString aDirURL(getExecutableDirectory());
- aDirURL += OUString("/");
+ aDirURL += "/";
aDirURL += OUString::createFromAscii( _sFilename.getStr() );
#if defined(WNT)
aDirURL += rtl::OUString(".ini");
@@ -577,8 +577,7 @@ namespace rtl_Bootstrap
rtl::OUString suMacro("${"); //rtlrc:Bootstrap:RTLVALUE}");
rtl::OUString aDirURL("$ORIGIN");
- aDirURL += OUString("/");
- aDirURL += OUString("rtl");
+ aDirURL += "/rtl";
#if defined(WNT)
aDirURL += rtl::OUString(".ini");
#else
@@ -748,7 +747,7 @@ namespace rtl_Bootstrap
rtl::OUString suName("INHERITED_VALUE");
OUString suGetValue;
Bootstrap::get( suName, suGetValue );
- suGetValue += OUString("/well");
+ suGetValue += "/well";
CPPUNIT_ASSERT_MESSAGE("expandMacros failed.", suGetValue.compareTo(suMacro) == 0 );
}
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index ed25a62..15a0851 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -164,7 +164,7 @@ void oldtests::test_OUStringBuffer()
TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 4");
sal_Int32 n = 123456789L;
- s1 += OUString(" 123456789");
+ s1 += " 123456789";
b2.append(OUString(" "));
b2.append(n);
TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5");
@@ -174,7 +174,7 @@ void oldtests::test_OUStringBuffer()
#else
sal_Int64 m = -3223372036854775807;
#endif
- s1 += OUString(" -3223372036854775807");
+ s1 += " -3223372036854775807";
b2.append(OUString(" "));
b2.append(m);
TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6");
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index b210c2e..72b84e2 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -730,11 +730,11 @@ OUString getErrorMessage( XML_Error xmlE, OUString sSystemId , sal_Int32 nLine )
OUString str("[");
str += sSystemId;
- str += OUString(" line ");
+ str += " line ";
str += OUString::valueOf( nLine );
- str += OUString("]: ");
+ str += "]: ";
str += Message;
- str += OUString("error");
+ str += "error";
return str;
}
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index a8b83f3..b81e07d 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -91,7 +91,7 @@ int main (int argc, char **argv)
#else
OUString aDllName = OUString( "lib");
aDllName += OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US );
- aDllName += OUString( ".so");
+ aDllName += ".so";
#endif
xReg->registerImplementation(
OUString("com.sun.star.loader.SharedLibrary"),
@@ -119,7 +119,7 @@ int main (int argc, char **argv)
#else
OUString aDllName = OUString( "lib");
aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
- aDllName += OUString( ".so");
+ aDllName += ".so";
#endif
xReg->registerImplementation(
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 0f24e3e..c118cbd 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -111,7 +111,7 @@ Registry *myRegistry = new Registry();
RegistryKey rootKey, rKey, rKey2;
OUString userReg = getExePath();
-userReg += OUString("user.rdb");
+userReg += "user.rdb";
if(myRegistry->open(userReg, REG_READWRITE))
{
OSL_VERIFY(!myRegistry->create(userReg));
@@ -131,7 +131,7 @@ void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarg
RegistryKey rootKey;
OUString appReg = getExePath();
- appReg += OUString("stoctest.rdb");
+ appReg += "stoctest.rdb";
OSL_VERIFY(!myRegistry->open(appReg, REG_READWRITE));
OSL_VERIFY(!myRegistry->openRootKey(rootKey));
@@ -440,8 +440,8 @@ void test_DefaultRegistry(
OUString userRdb(exePath);
OUString applicatRdb(exePath);
- userRdb += OUString("user.rdb");
- applicatRdb += OUString("stoctest.rdb");
+ userRdb += "user.rdb";
+ applicatRdb += "stoctest.rdb";
Reference < XMultiServiceFactory > rSMgr = ::cppu::createRegistryServiceFactory( userRdb, applicatRdb, sal_False, OUString());
//OUString("//./e:/src596/stoc/wntmsci3/bin") );
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index 05b8fef..d603237 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -63,7 +63,7 @@ void setStarUserRegistry()
RegistryKey rootKey, rKey, rKey2;
OUString userReg = getExePath();
- userReg += OUString("user.rdb");
+ userReg += "user.rdb";
if(myRegistry->open(userReg, REG_READWRITE))
{
OSL_VERIFY(!myRegistry->create(userReg));
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 7709c58..507edde 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -162,8 +162,7 @@ DirectoryTraveller::DirectoryTraveller (
m_nLevel (nLevel),
m_nCount (0)
{
- m_aPath += rName;
- m_aPath += OUString("/");
+ m_aPath += rName + "/";
}
/*
@@ -359,7 +358,7 @@ int SAL_CALL main (int argc, char **argv)
{
OUString aName ("demostor-");
aName += OUString::valueOf ((sal_Int32)(i + 1), 10);
- aName += OUString(".dat");
+ aName += ".dat";
#if (_DEMOSTOR_REMOVE == 1)
eErrCode = aFile.remove (aPath, aName);
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 0ba1a76..ff34cb0 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -229,31 +229,31 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
case ::svt::BBTYPE_TABLECELL:
aRetText = OUString( "TableCell" );
#if OSL_DEBUG_LEVEL > 1
- aRetText += OUString( " [" );
+ aRetText += " [";
aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
- aRetText += OUString( "," );
+ aRetText += ",";
aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
- aRetText += OUString( "]" );
+ aRetText += "]";
#endif
break;
case ::svt::BBTYPE_ROWHEADERCELL:
aRetText = OUString( "RowHeaderCell" );
#if OSL_DEBUG_LEVEL > 1
- aRetText += OUString( " [" );
+ aRetText += " [";
aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
- aRetText += OUString( "," );
+ aRetText += ",";
aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
- aRetText += OUString( "]" );
+ aRetText += "]";
#endif
break;
case ::svt::BBTYPE_COLUMNHEADERCELL:
aRetText = OUString( "ColumnHeaderCell" );
#if OSL_DEBUG_LEVEL > 1
- aRetText += OUString( " [" );
+ aRetText += " [";
aRetText += OUString::valueOf(sal_Int32(GetCurRow()));
- aRetText += OUString( "," );
+ aRetText += ",";
aRetText += OUString::valueOf(sal_Int32(GetCurColumnId()));
- aRetText += OUString( "]" );
+ aRetText += "]";
#endif
break;
default:
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index f36fc74..3dfbd29 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -724,7 +724,7 @@ SvtPrinterOptions::SvtPrinterOptions()
if( m_pStaticDataContainer == NULL )
{
OUString aRootPath( ROOTNODE_START );
- m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/Printer" ) );
+ m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/Printer" );
pPrinterOptionsDataContainer = m_pStaticDataContainer;
svtools::ItemHolder2::holdConfigItem(E_PRINTOPTIONS);
}
@@ -758,7 +758,7 @@ SvtPrintFileOptions::SvtPrintFileOptions()
if( m_pStaticDataContainer == NULL )
{
OUString aRootPath( ROOTNODE_START );
- m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += OUString( "/File" ) );
+ m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/File" );
pPrintFileOptionsDataContainer = m_pStaticDataContainer;
svtools::ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS);
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index e87fb87..103599d 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1945,7 +1945,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
Bootstrap::expandMacros( ustrValue );
#if defined(WNT)
- ustrValue += OUString("/user/crashdata");
+ ustrValue += "/user/crashdata";
#endif
return ustrValue;
}
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 164457e..324b4a4 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -184,7 +184,7 @@ static OUString GetCrashConfigDir()
Bootstrap::expandMacros( ustrValue );
#if defined(WNT)
- ustrValue += OUString("/user/crashdata");
+ ustrValue += "/user/crashdata";
#endif
return ustrValue;
}
@@ -202,7 +202,7 @@ static OUString GetUnsentURL()
{
OUString aURL = GetCrashConfigDir();
- aURL += OUString( "/" );
+ aURL += "/";
aURL += OUString( LCKFILE );
return aURL;
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index 7f46b73..1b2cbdf 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -344,8 +344,7 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons
OUString aRet;
if( maName.getLength() )
{
- aRet += maName;
- aRet += OUString( " = " );
+ aRet += maName + " = ";
}
switch( mnType )
@@ -387,10 +386,10 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength )
if( (nRow == 16) || (nLength==0) )
{
while( aHex.getLength() < (16*3) )
- aHex += OUString( " " );
+ aHex += " ";
aOut += aHex;
aOut += aAscii;
- aOut += OUString( "\n\r" );
+ aOut += "\n\r";
aHex = aEmpty;
aAscii = aEmpty;
nRow = 0;
@@ -476,7 +475,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
{
aRet += (*aIter++)->format( rStream, nLength );
if( (aIter != aEnd) || (nLength != 0) )
- aRet += OUString( "\n\r" );
+ aRet += "\n\r";
}
if( nLength )
@@ -486,7 +485,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
{
aRet = getName();
if( aRet.getLength() )
- aRet += OUString( " = " );
+ aRet += " = ";
OUString aValue;
switch( getType() )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2ca1fc1..bbe5231 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1170,7 +1170,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, co
rNode.GetLang( nPos ) ) );
OUString sLang( aLocale.Language );
if ( !aLocale.Country.isEmpty() )
- sLang += OUString( "-" ) + OUString( aLocale.Country );
+ sLang += "-" + aLocale.Country;
m_pSerializer->singleElementNS( XML_w, XML_lid,
FSNS( XML_w, XML_val ),
OUStringToOString( sLang, RTL_TEXTENCODING_UTF8 ).getStr( ), FSEND );
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 154c265..6ea7cd6 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -40,16 +40,16 @@
if ( MENU_ITEM_NOTFOUND == mpMenu->GetItemPos( nItemId ) ) \
throw ::com::sun::star::container::NoSuchElementException( \
OUString( Func ) \
- += OUString( ": There is no menu item with " ) \
+ += ": There is no menu item with " \
+= OUString::valueOf( sal_Int32( nItemId ) ) \
- += OUString( " as identifier" ), \
+ += " as identifier", \
*this \
);
#define THROW_MENUPOS_NOT_FOUND( Func, nPos ) \
if ( MENU_ITEM_NOTFOUND == sal_uInt16( nPos ) ) \
throw ::com::sun::star::container::NoSuchElementException( \
OUString( Func ) \
- += OUString( ": There is no menu item at position " ) \
+ += ": There is no menu item at position " \
+= OUString::valueOf( sal_Int32( nPos ) ), \
*this \
);
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 51af6be..1ed4fd4 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -364,7 +364,7 @@ namespace toolkit
throw IllegalArgumentException(
( OUString("Unable to convert the given value for the property ")
+= GetPropertyName((sal_uInt16)nPropId) )
- += OUString(" (double, integer, or string expected)."),
+ += " (double, integer, or string expected).",
static_cast< XPropertySet* >(this),
1);
}
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx
index b24cfa2..75e8d5c 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/generic/app/gensys.cxx
@@ -191,7 +191,7 @@ const char* SalGenericSystem::getFrameClassName()
{
OUString aIni, aProduct;
rtl::Bootstrap::get( "BRAND_BASE_DIR", aIni );
- aIni += OUString("/program/") + SAL_CONFIGFILE( "bootstrap" );
+ aIni += "/program/") + SAL_CONFIGFILE( "bootstrap";
rtl::Bootstrap aBootstrap( aIni );
aBootstrap.getFrom( "ProductKey", aProduct );
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 47da039..3b15d25 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -67,9 +67,9 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
aLibName += aDLLSuffix;
}
#ifdef MACOSX
- aLibName += OUString( ".dylib" );
+ aLibName += ".dylib";
#else
- aLibName += OUString( ".so" );
+ aLibName += ".so";
#endif
#endif
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f81b215..70ccd94 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -12091,7 +12091,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
m_nSignatureObject = createObject();
rNewWidget.m_aValue = OUString::valueOf( m_nSignatureObject );
- rNewWidget.m_aValue += OUString(" 0 R");
+ rNewWidget.m_aValue += " 0 R";
//createDefaultSignatureAppearance( rNewWidget, rSig );
// let's add a fake appearance
rNewWidget.m_aAppearances[ "N" ][ "Standard" ] = new SvMemoryStream();
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 40c78c9..0983642 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1855,7 +1855,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
if (!aToken.isEmpty())
{
if (!aTokens.isEmpty())
- aTokens += OUString(",");
+ aTokens += ",";
aTokens = aTokens += aToken;
gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
case_insensitive_filter,
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index 6ea35c6..091853f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -39,7 +39,7 @@ OString getTempFileName(const OUString& fileName)
OUString ousTmpUrl;
FileBase::getTempDirURL(ousTmpUrl);
if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
- ousTmpUrl += OUString("/");
+ ousTmpUrl += "/";
ousTmpUrl += fileName;
OUString sysTmpPath;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 62e91e6b..5249272 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2769,7 +2769,7 @@ void DomainMapper_Impl::CloseFieldCommand()
}
else
{
- sServiceName += OUString( "TextField.");
+ sServiceName += "TextField.";
sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName );
}
More information about the Libreoffice-commits
mailing list