[Libreoffice-commits] core.git: 42 commits - basic/source chart2/source comphelper/source configmgr/source connectivity/source cppu/source dbaccess/source desktop/source extensions/source filter/source forms/source formula/source framework/source i18npool/source io/source jvmfwk/plugins jvmfwk/source oox/source pyuno/source reportdesign/source sax/source sc/qa scripting/source sc/source sdext/source sd/source sfx2/source shell/source stoc/source svl/source svtools/source svx/source sw/source toolkit/source tools/source ucbhelper/source ucb/source unotools/source unoxml/source uui/source vcl/osx vcl/source vcl/workben xmlhelp/source xmloff/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Sun Aug 30 23:05:19 PDT 2015
basic/source/classes/sbunoobj.cxx | 162 +++++-----
basic/source/runtime/methods.cxx | 6
chart2/source/tools/ObjectIdentifier.cxx | 44 +-
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 8
chart2/source/tools/StatisticsHelper.cxx | 4
comphelper/source/container/enumerablemap.cxx | 6
comphelper/source/misc/configurationhelper.cxx | 12
comphelper/source/misc/logging.cxx | 8
comphelper/source/misc/namedvaluecollection.cxx | 6
comphelper/source/misc/officeresourcebundle.cxx | 2
comphelper/source/property/propertycontainerhelper.cxx | 10
comphelper/source/property/propertystatecontainer.cxx | 4
configmgr/source/broadcaster.cxx | 2
configmgr/source/data.cxx | 10
connectivity/source/commontools/DateConversion.cxx | 22 -
connectivity/source/commontools/TIndexes.cxx | 10
connectivity/source/commontools/TKeys.cxx | 24 -
connectivity/source/commontools/dbconversion.cxx | 2
connectivity/source/commontools/dbtools.cxx | 14
connectivity/source/commontools/dbtools2.cxx | 14
connectivity/source/commontools/filtermanager.cxx | 6
connectivity/source/commontools/parameters.cxx | 4
connectivity/source/commontools/sqlerror.cxx | 2
connectivity/source/drivers/firebird/Util.cxx | 6
connectivity/source/drivers/hsqldb/HConnection.cxx | 10
connectivity/source/drivers/hsqldb/HDriver.cxx | 8
connectivity/source/drivers/hsqldb/HTools.cxx | 14
connectivity/source/drivers/hsqldb/HView.cxx | 12
connectivity/source/drivers/macab/MacabDriver.cxx | 4
connectivity/source/drivers/mysql/YTables.cxx | 4
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 144 ++++----
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 20 -
connectivity/source/drivers/postgresql/pq_connection.cxx | 16
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 28 -
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 22 -
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 10
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx | 4
connectivity/source/drivers/postgresql/pq_statement.cxx | 24 -
connectivity/source/drivers/postgresql/pq_tools.cxx | 6
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 8
connectivity/source/drivers/postgresql/pq_xbase.cxx | 4
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 10
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 30 -
connectivity/source/drivers/postgresql/pq_xindexes.cxx | 6
connectivity/source/drivers/postgresql/pq_xusers.cxx | 12
connectivity/source/drivers/postgresql/pq_xview.cxx | 4
connectivity/source/parse/sqlnode.cxx | 40 +-
cppu/source/typelib/static_types.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 4
dbaccess/source/core/api/viewcontainer.cxx | 4
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 4
dbaccess/source/core/inc/composertools.hxx | 6
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 8
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4
desktop/source/app/app.cxx | 34 +-
desktop/source/app/officeipcthread.cxx | 18 -
desktop/source/deployment/dp_log.cxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 4
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 4
desktop/source/deployment/manager/dp_manager.cxx | 4
desktop/source/deployment/misc/dp_identifier.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 4
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 10
desktop/source/deployment/registry/dp_backenddb.cxx | 14
desktop/source/deployment/registry/dp_registry.cxx | 6
desktop/source/deployment/registry/package/dp_package.cxx | 2
desktop/source/migration/migration.cxx | 4
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 22 -
extensions/source/config/ldap/ldapaccess.cxx | 12
extensions/source/logging/csvformatter.cxx | 8
extensions/source/logging/plaintextformatter.cxx | 32 -
extensions/source/propctrlr/eformshelper.cxx | 4
extensions/source/propctrlr/eventhandler.cxx | 14
extensions/source/propctrlr/formcomponenthandler.cxx | 6
extensions/source/propctrlr/pcrcommon.cxx | 2
extensions/source/update/check/updateprotocol.cxx | 8
extensions/source/update/ui/updatecheckui.cxx | 2
filter/source/svg/test/odfserializer.cxx | 2
forms/source/component/ComboBox.cxx | 4
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Filter.cxx | 6
forms/source/xforms/convert.cxx | 8
formula/source/core/api/FormulaCompiler.cxx | 2
framework/source/accelerators/acceleratorconfiguration.cxx | 8
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwe/helper/titlehelper.cxx | 6
framework/source/fwi/classes/converter.cxx | 28 -
framework/source/helper/persistentwindowstate.cxx | 8
framework/source/jobs/helponstartup.cxx | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
framework/source/recording/dispatchrecorder.cxx | 90 ++---
framework/source/services/autorecovery.cxx | 10
framework/source/services/desktop.cxx | 2
framework/source/services/pathsettings.cxx | 10
framework/source/services/substitutepathvars.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 16
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 2
framework/source/uielement/headermenucontroller.cxx | 14
framework/source/uifactory/factoryconfiguration.cxx | 2
framework/source/uifactory/uielementfactorymanager.cxx | 4
framework/source/xml/acceleratorconfigurationreader.cxx | 8
framework/source/xml/imagesdocumenthandler.cxx | 8
i18npool/source/breakiterator/breakiteratorImpl.cxx | 2
i18npool/source/breakiterator/xdictionary.cxx | 4
i18npool/source/collator/collator_unicode.cxx | 10
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 4
i18npool/source/localedata/LocaleNode.cxx | 2
i18npool/source/localedata/localedata.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 2
io/source/acceptor/acc_socket.cxx | 20 -
io/source/connector/ctr_socket.cxx | 8
io/source/stm/omark.cxx | 24 -
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4
jvmfwk/source/fwkutil.hxx | 4
oox/source/core/relationshandler.cxx | 4
oox/source/core/xmlfilterbase.cxx | 4
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/dump/dumperbase.cxx | 6
oox/source/export/chartexport.cxx | 4
oox/source/export/drawingml.cxx | 2
oox/source/export/shapes.cxx | 16
oox/source/ole/vbamodule.cxx | 22 -
oox/source/ppt/commonbehaviorcontext.cxx | 2
pyuno/source/loader/pyuno_loader.cxx | 4
pyuno/source/module/pyuno_adapter.cxx | 12
pyuno/source/module/pyuno_except.cxx | 14
pyuno/source/module/pyuno_module.cxx | 50 +--
pyuno/source/module/pyuno_runtime.cxx | 32 -
pyuno/source/module/pyuno_type.cxx | 14
pyuno/source/module/pyuno_util.cxx | 2
reportdesign/source/core/api/ReportEngineJFree.cxx | 2
reportdesign/source/core/misc/reportformula.cxx | 10
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2
sax/source/tools/converter.cxx | 14
sc/qa/unit/subsequent_export-test.cxx | 6
sc/qa/unit/ucalc_formula.cxx | 16
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/dputil.cxx | 2
sc/source/core/data/funcdesc.cxx | 26 -
sc/source/core/tool/interpr1.cxx | 4
sc/source/core/tool/rangeutl.cxx | 2
sc/source/filter/dif/difexp.cxx | 14
sc/source/filter/excel/read.cxx | 2
sc/source/filter/excel/xestream.cxx | 4
sc/source/filter/excel/xipage.cxx | 2
sc/source/filter/oox/formulabase.cxx | 2
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 8
sc/source/filter/xml/xmlexprt.cxx | 6
sc/source/filter/xml/xmlimprt.cxx | 8
sc/source/ui/attrdlg/scabstdlg.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 2
sc/source/ui/docshell/documentlinkmgr.cxx | 8
sc/source/ui/formdlg/dwfunctr.cxx | 8
sc/source/ui/miscdlgs/datafdlg.cxx | 2
sc/source/ui/vba/vbafont.cxx | 6
scripting/source/basprov/basprov.cxx | 10
scripting/source/provider/ActiveMSPList.cxx | 12
scripting/source/provider/MasterScriptProvider.cxx | 6
scripting/source/provider/URIHelper.cxx | 6
sd/source/filter/eppt/pptx-epptooxml.cxx | 64 +--
sd/source/filter/ppt/pptinanimations.cxx | 14
sdext/source/pdfimport/misc/pdfihelper.cxx | 6
sdext/source/pdfimport/odf/odfemitter.cxx | 16
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 8
sdext/source/pdfimport/tree/imagecontainer.cxx | 4
sdext/source/pdfimport/tree/style.cxx | 2
sdext/source/pdfimport/tree/writertreevisiting.cxx | 20 -
sdext/source/pdfimport/wrapper/wrapper.cxx | 2
sfx2/source/sidebar/ResourceManager.cxx | 4
shell/source/backends/localebe/localebackend.cxx | 4
stoc/source/implementationregistration/implreg.cxx | 4
svl/source/misc/gridprinter.cxx | 6
svtools/source/uno/wizard/unowizard.cxx | 2
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/fmscriptingenv.cxx | 6
svx/source/form/fmshimp.cxx | 4
svx/source/form/formcontrolfactory.cxx | 4
svx/source/form/formcontroller.cxx | 8
svx/source/svdraw/svdocirc.cxx | 4
svx/source/svdraw/svdorect.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/uibase/uno/unomod.cxx | 2
toolkit/source/awt/animatedimagespeer.cxx | 2
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 10
tools/source/fsys/urlobj.cxx | 2
ucb/source/core/ucb.cxx | 26 -
ucb/source/core/ucbstore.cxx | 14
ucb/source/ucp/ext/ucpext_provider.cxx | 2
ucb/source/ucp/ftp/ftpurl.cxx | 8
ucb/source/ucp/hierarchy/hierarchydata.cxx | 20 -
ucb/source/ucp/tdoc/tdoc_content.cxx | 6
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
ucb/source/ucp/webdav-neon/NeonUri.cxx | 16
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 6
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 4
ucbhelper/source/client/proxydecider.cxx | 10
unotools/source/config/bootstrap.cxx | 10
unotools/source/config/docinfohelper.cxx | 2
unotools/source/config/extendedsecurityoptions.cxx | 2
unotools/source/config/viewoptions.cxx | 4
unotools/source/i18n/localedatawrapper.cxx | 8
unoxml/source/dom/documentbuilder.cxx | 4
unoxml/source/rdf/CLiteral.cxx | 4
unoxml/source/xpath/xpathapi.cxx | 10
uui/source/iahndl-errorhandler.cxx | 2
uui/source/iahndl.cxx | 6
vcl/osx/printaccessoryview.mm | 2
vcl/source/control/throbber.cxx | 8
vcl/source/gdi/print3.cxx | 4
vcl/source/window/printdlg.cxx | 2
vcl/source/window/window.cxx | 2
vcl/workben/svpclient.cxx | 2
vcl/workben/svptest.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 4
xmloff/source/core/xmlerror.cxx | 48 +-
xmloff/source/style/xmlnumfe.cxx | 8
xmloff/source/style/xmlnumfi.cxx | 6
xmloff/source/text/txtflde.cxx | 4
xmloff/source/text/txtftne.cxx | 2
xmloff/source/text/txtvfldi.cxx | 8
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
234 files changed, 1153 insertions(+), 1153 deletions(-)
New commits:
commit ba4276efa341c9d09aa1198b027046b802a5b835
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 31 08:04:43 2015 +0200
loplugin:stringconstant: OUStringBuffer: appendAscii -> append
Change-Id: I349e1b9e3ea81c0684c6234497b6d44b47666b09
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index f87eeac..e5b05fc 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -292,25 +292,25 @@ namespace
{
while ( _nLevel-- > 0 )
{
- _inout_rBuffer.appendAscii( " " );
+ _inout_rBuffer.append( " " );
}
}
}
void implAppendExceptionMsg( OUStringBuffer& _inout_rBuffer, const Exception& _e, const OUString& _rExceptionType, sal_Int32 _nLevel )
{
- _inout_rBuffer.appendAscii( "\n" );
+ _inout_rBuffer.append( "\n" );
lcl_indent( _inout_rBuffer, _nLevel );
- _inout_rBuffer.appendAscii( "Type: " );
+ _inout_rBuffer.append( "Type: " );
if ( _rExceptionType.isEmpty() )
- _inout_rBuffer.appendAscii( "Unknown" );
+ _inout_rBuffer.append( "Unknown" );
else
_inout_rBuffer.append( _rExceptionType );
- _inout_rBuffer.appendAscii( "\n" );
+ _inout_rBuffer.append( "\n" );
lcl_indent( _inout_rBuffer, _nLevel );
- _inout_rBuffer.appendAscii( "Message: " );
+ _inout_rBuffer.append( "Message: " );
_inout_rBuffer.append( _e.Message );
}
@@ -414,7 +414,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
implAppendExceptionMsg( aMessageBuf, aWrapped, aExamine.getValueTypeName(), nLevel );
if ( aWrapped.TargetException.getValueTypeClass() == TypeClass_EXCEPTION )
// there is a next chain element
- aMessageBuf.appendAscii( "\nTargetException:" );
+ aMessageBuf.append( "\nTargetException:" );
// next round
aExamine = aWrapped.TargetException;
@@ -1579,7 +1579,7 @@ OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Referenc
OUStringBuffer aRetStr;
for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ )
- aRetStr.appendAscii( " " );
+ aRetStr.append( " " );
aRetStr.append( xClass->getName() );
OUString aClassName = xClass->getName();
Type aClassType( xClass->getTypeClass(), aClassName.getStr() );
@@ -1587,12 +1587,12 @@ OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Referenc
// checking if the interface is really supported
if( !x->queryInterface( aClassType ).hasValue() )
{
- aRetStr.appendAscii( " (ERROR: Not really supported!)\n" );
+ aRetStr.append( " (ERROR: Not really supported!)\n" );
}
// Are there super interfaces?
else
{
- aRetStr.appendAscii( "\n" );
+ aRetStr.append( "\n" );
// get the super interfaces
Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses();
@@ -1641,11 +1641,11 @@ OUString getDbgObjectName( SbUnoObject* pUnoObj )
OUStringBuffer aRet;
if( aName.getLength() > 20 )
{
- aRet.appendAscii( "\n" );
+ aRet.append( "\n" );
}
- aRet.appendAscii( "\"" );
+ aRet.append( "\"" );
aRet.append( aName );
- aRet.appendAscii( "\":" );
+ aRet.append( "\":" );
return aRet.makeStringAndClear();
}
@@ -1770,7 +1770,7 @@ OUString Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
if( eType != TypeClass_INTERFACE )
{
aRet.appendAscii( ID_DBG_SUPPORTEDINTERFACES );
- aRet.appendAscii( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
+ aRet.append( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
}
else
{
@@ -1779,9 +1779,9 @@ OUString Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
Reference< XTypeProvider > xTypeProvider( x, UNO_QUERY );
- aRet.appendAscii( "Supported interfaces by object " );
+ aRet.append( "Supported interfaces by object " );
aRet.append( getDbgObjectName( pUnoObj ) );
- aRet.appendAscii( "\n" );
+ aRet.append( "\n" );
if( xTypeProvider.is() )
{
// get the interfaces of the implementation
@@ -1802,9 +1802,9 @@ OUString Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
typelib_TypeDescription * pTD = 0;
rType.getDescription( &pTD );
- aRet.appendAscii( "*** ERROR: No IdlClass for type \"" );
+ aRet.append( "*** ERROR: No IdlClass for type \"" );
aRet.append( pTD->pTypeName );
- aRet.appendAscii( "\"\n*** Please check type library\n" );
+ aRet.append( "\"\n*** Please check type library\n" );
}
}
}
@@ -1820,40 +1820,40 @@ OUString Dbg_SbxDataType2String( SbxDataType eType )
OUStringBuffer aRet;
switch( +eType )
{
- case SbxEMPTY: aRet.appendAscii("SbxEMPTY"); break;
- case SbxNULL: aRet.appendAscii("SbxNULL"); break;
- case SbxINTEGER: aRet.appendAscii("SbxINTEGER"); break;
- case SbxLONG: aRet.appendAscii("SbxLONG"); break;
- case SbxSINGLE: aRet.appendAscii("SbxSINGLE"); break;
- case SbxDOUBLE: aRet.appendAscii("SbxDOUBLE"); break;
- case SbxCURRENCY: aRet.appendAscii("SbxCURRENCY"); break;
- case SbxDECIMAL: aRet.appendAscii("SbxDECIMAL"); break;
- case SbxDATE: aRet.appendAscii("SbxDATE"); break;
- case SbxSTRING: aRet.appendAscii("SbxSTRING"); break;
- case SbxOBJECT: aRet.appendAscii("SbxOBJECT"); break;
- case SbxERROR: aRet.appendAscii("SbxERROR"); break;
- case SbxBOOL: aRet.appendAscii("SbxBOOL"); break;
- case SbxVARIANT: aRet.appendAscii("SbxVARIANT"); break;
- case SbxDATAOBJECT: aRet.appendAscii("SbxDATAOBJECT"); break;
- case SbxCHAR: aRet.appendAscii("SbxCHAR"); break;
- case SbxBYTE: aRet.appendAscii("SbxBYTE"); break;
- case SbxUSHORT: aRet.appendAscii("SbxUSHORT"); break;
- case SbxULONG: aRet.appendAscii("SbxULONG"); break;
- case SbxSALINT64: aRet.appendAscii("SbxINT64"); break;
- case SbxSALUINT64: aRet.appendAscii("SbxUINT64"); break;
- case SbxINT: aRet.appendAscii("SbxINT"); break;
- case SbxUINT: aRet.appendAscii("SbxUINT"); break;
- case SbxVOID: aRet.appendAscii("SbxVOID"); break;
- case SbxHRESULT: aRet.appendAscii("SbxHRESULT"); break;
- case SbxPOINTER: aRet.appendAscii("SbxPOINTER"); break;
- case SbxDIMARRAY: aRet.appendAscii("SbxDIMARRAY"); break;
- case SbxCARRAY: aRet.appendAscii("SbxCARRAY"); break;
- case SbxUSERDEF: aRet.appendAscii("SbxUSERDEF"); break;
- case SbxLPSTR: aRet.appendAscii("SbxLPSTR"); break;
- case SbxLPWSTR: aRet.appendAscii("SbxLPWSTR"); break;
- case SbxCoreSTRING: aRet.appendAscii("SbxCoreSTRING"); break;
- case SbxOBJECT | SbxARRAY: aRet.appendAscii("SbxARRAY"); break;
- default: aRet.appendAscii("Unknown Sbx-Type!");break;
+ case SbxEMPTY: aRet.append("SbxEMPTY"); break;
+ case SbxNULL: aRet.append("SbxNULL"); break;
+ case SbxINTEGER: aRet.append("SbxINTEGER"); break;
+ case SbxLONG: aRet.append("SbxLONG"); break;
+ case SbxSINGLE: aRet.append("SbxSINGLE"); break;
+ case SbxDOUBLE: aRet.append("SbxDOUBLE"); break;
+ case SbxCURRENCY: aRet.append("SbxCURRENCY"); break;
+ case SbxDECIMAL: aRet.append("SbxDECIMAL"); break;
+ case SbxDATE: aRet.append("SbxDATE"); break;
+ case SbxSTRING: aRet.append("SbxSTRING"); break;
+ case SbxOBJECT: aRet.append("SbxOBJECT"); break;
+ case SbxERROR: aRet.append("SbxERROR"); break;
+ case SbxBOOL: aRet.append("SbxBOOL"); break;
+ case SbxVARIANT: aRet.append("SbxVARIANT"); break;
+ case SbxDATAOBJECT: aRet.append("SbxDATAOBJECT"); break;
+ case SbxCHAR: aRet.append("SbxCHAR"); break;
+ case SbxBYTE: aRet.append("SbxBYTE"); break;
+ case SbxUSHORT: aRet.append("SbxUSHORT"); break;
+ case SbxULONG: aRet.append("SbxULONG"); break;
+ case SbxSALINT64: aRet.append("SbxINT64"); break;
+ case SbxSALUINT64: aRet.append("SbxUINT64"); break;
+ case SbxINT: aRet.append("SbxINT"); break;
+ case SbxUINT: aRet.append("SbxUINT"); break;
+ case SbxVOID: aRet.append("SbxVOID"); break;
+ case SbxHRESULT: aRet.append("SbxHRESULT"); break;
+ case SbxPOINTER: aRet.append("SbxPOINTER"); break;
+ case SbxDIMARRAY: aRet.append("SbxDIMARRAY"); break;
+ case SbxCARRAY: aRet.append("SbxCARRAY"); break;
+ case SbxUSERDEF: aRet.append("SbxUSERDEF"); break;
+ case SbxLPSTR: aRet.append("SbxLPSTR"); break;
+ case SbxLPWSTR: aRet.append("SbxLPWSTR"); break;
+ case SbxCoreSTRING: aRet.append("SbxCoreSTRING"); break;
+ case SbxOBJECT | SbxARRAY: aRet.append("SbxARRAY"); break;
+ default: aRet.append("Unknown Sbx-Type!");break;
}
return aRet.makeStringAndClear();
}
@@ -1862,7 +1862,7 @@ OUString Dbg_SbxDataType2String( SbxDataType eType )
OUString Impl_DumpProperties( SbUnoObject* pUnoObj )
{
OUStringBuffer aRet;
- aRet.appendAscii("Properties of object ");
+ aRet.append("Properties of object ");
aRet.append( getDbgObjectName( pUnoObj ) );
// analyse the Uno-Infos to recognise the arrays
@@ -1875,7 +1875,7 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj )
}
if( !xAccess.is() )
{
- aRet.appendAscii( "\nUnknown, no introspection available\n" );
+ aRet.append( "\nUnknown, no introspection available\n" );
return aRet.makeStringAndClear();
}
@@ -1893,7 +1893,7 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj )
{
OUStringBuffer aPropStr;
if( (i % nPropsPerLine) == 0 )
- aPropStr.appendAscii( "\n" );
+ aPropStr.append( "\n" );
// output the type and name
// Is it in Uno a sequence?
@@ -1920,14 +1920,14 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj )
}
aPropStr.append( Dbg_SbxDataType2String( eType ) );
if( bMaybeVoid )
- aPropStr.appendAscii( "/void" );
- aPropStr.appendAscii( " " );
+ aPropStr.append( "/void" );
+ aPropStr.append( " " );
aPropStr.append( pVar->GetName() );
if( i == nPropCount - 1 )
- aPropStr.appendAscii( "\n" );
+ aPropStr.append( "\n" );
else
- aPropStr.appendAscii( "; " );
+ aPropStr.append( "; " );
aRet.append( aPropStr.makeStringAndClear() );
}
@@ -1939,7 +1939,7 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj )
OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
{
OUStringBuffer aRet;
- aRet.appendAscii("Methods of object ");
+ aRet.append("Methods of object ");
aRet.append( getDbgObjectName( pUnoObj ) );
// XIntrospectionAccess, so that the types of the parameter could be outputed
@@ -1952,7 +1952,7 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
}
if( !xAccess.is() )
{
- aRet.appendAscii( "\nUnknown, no introspection available\n" );
+ aRet.append( "\nUnknown, no introspection available\n" );
return aRet.makeStringAndClear();
}
Sequence< Reference< XIdlMethod > > methods = xAccess->getMethods
@@ -1963,7 +1963,7 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
sal_uInt16 nMethodCount = pMethods->Count();
if( !nMethodCount )
{
- aRet.appendAscii( "\nNo methods found\n" );
+ aRet.append( "\nNo methods found\n" );
return aRet.makeStringAndClear();
}
sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30;
@@ -1973,7 +1973,7 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
if( pVar )
{
if( (i % nPropsPerLine) == 0 )
- aRet.appendAscii( "\n" );
+ aRet.append( "\n" );
// address the method
const Reference< XIdlMethod >& rxMethod = pUnoMethods[i];
@@ -1988,9 +1988,9 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
}
// output the name and the type
aRet.append( Dbg_SbxDataType2String( eType ) );
- aRet.appendAscii( " " );
+ aRet.append( " " );
aRet.append ( pVar->GetName() );
- aRet.appendAscii( " ( " );
+ aRet.append( " ( " );
// the get-method mustn't have a parameter
Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
@@ -2003,18 +2003,18 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
{
aRet.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
if( j < nParamCount - 1 )
- aRet.appendAscii( ", " );
+ aRet.append( ", " );
}
}
else
- aRet.appendAscii( "void" );
+ aRet.append( "void" );
- aRet.appendAscii( " ) " );
+ aRet.append( " ) " );
if( i == nMethodCount - 1 )
- aRet.appendAscii( "\n" );
+ aRet.append( "\n" );
else
- aRet.appendAscii( "; " );
+ aRet.append( "; " );
}
}
return aRet.makeStringAndClear();
@@ -4942,7 +4942,7 @@ Any SbUnoStructRefObject::getUnoAny()
OUString SbUnoStructRefObject::Impl_DumpProperties()
{
OUStringBuffer aRet;
- aRet.appendAscii("Properties of object ");
+ aRet.append("Properties of object ");
aRet.append( getDbgObjectName() );
sal_uInt16 nPropCount = pProps->Count();
@@ -4955,7 +4955,7 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
OUStringBuffer aPropStr;
if( (i % nPropsPerLine) == 0 )
{
- aPropStr.appendAscii( "\n" );
+ aPropStr.append( "\n" );
}
// output the type and name
// Is it in Uno a sequence?
@@ -4978,16 +4978,16 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
}
aPropStr.append( Dbg_SbxDataType2String( eType ) );
- aPropStr.appendAscii( " " );
+ aPropStr.append( " " );
aPropStr.append( pVar->GetName() );
if( i == nPropCount - 1 )
{
- aPropStr.appendAscii( "\n" );
+ aPropStr.append( "\n" );
}
else
{
- aPropStr.appendAscii( "; " );
+ aPropStr.append( "; " );
}
aRet.append( aPropStr.makeStringAndClear() );
}
@@ -5019,7 +5019,7 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
OUStringBuffer aRet;
aRet.appendAscii( ID_DBG_SUPPORTEDINTERFACES );
- aRet.appendAscii( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
+ aRet.append( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
pVar->PutString( aRet.makeStringAndClear() );
}
@@ -5037,9 +5037,9 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
// by now all properties must be established
implCreateAll();
OUStringBuffer aRet;
- aRet.appendAscii("Methods of object ");
+ aRet.append("Methods of object ");
aRet.append( getDbgObjectName() );
- aRet.appendAscii( "\nNo methods found\n" );
+ aRet.append( "\nNo methods found\n" );
pVar->PutString( aRet.makeStringAndClear() );
}
return;
@@ -5100,11 +5100,11 @@ OUString SbUnoStructRefObject::getDbgObjectName()
OUStringBuffer aRet;
if( aName.getLength() > 20 )
{
- aRet.appendAscii( "\n" );
+ aRet.append( "\n" );
}
- aRet.appendAscii( "\"" );
+ aRet.append( "\"" );
aRet.append( aName );
- aRet.appendAscii( "\":" );
+ aRet.append( "\":" );
return aRet.makeStringAndClear();
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 09dddbb..2bc975b 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4854,16 +4854,16 @@ RTLFUNC(Partition)
// appending the leading spaces for the lowervalue
for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
{
- aRetStr.appendAscii(" ");
+ aRetStr.append(" ");
}
}
- aRetStr.append( aLowerValue ).appendAscii(":");
+ aRetStr.append( aLowerValue ).append(":");
if( nLen > nLen2 )
{
// appending the leading spaces for the uppervalue
for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
{
- aRetStr.appendAscii(" ");
+ aRetStr.append(" ");
}
}
aRetStr.append( aUpperValue );
commit 9320b9600ae244daead8609f7b27e8cbccf901d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 31 08:04:33 2015 +0200
loplugin:stringconstant: OUStringBuffer: appendAscii -> append
Change-Id: Iff591fb7cd434805998fdd14b94c4dd9654ba55e
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index d3b480f..3b917ac 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -77,14 +77,14 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType
if( !rDragMethodServiceName.isEmpty() )
{
if( !aRet.isEmpty() )
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append( m_aDragMethodEquals );
aRet.append( rDragMethodServiceName );
if( !rDragParameterString.isEmpty() )
{
if( !aRet.isEmpty() )
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append( m_aDragParameterEquals );
aRet.append( rDragParameterString );
}
@@ -507,13 +507,13 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
OUStringBuffer aRet( m_aProtocol );
aRet.append( lcl_createClassificationStringForType( eObjectType, rDragMethodServiceName, rDragParameterString ));
if(aRet.getLength() > (sal_Int32)strlen(m_aProtocol))
- aRet.appendAscii("/");
+ aRet.append("/");
if(!rParentParticle.isEmpty())
{
aRet.append(rParentParticle);
if( !rChildParticle.isEmpty() )
- aRet.appendAscii(":");
+ aRet.append(":");
}
aRet.append(rChildParticle);
@@ -554,7 +554,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
if( xCooSys == xCurrentCooSys )
{
aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, rModel );
- aRet.appendAscii(":CS=");
+ aRet.append(":CS=");
aRet.append( OUString::number( nCooSysIndex ) );
break;
}
@@ -582,7 +582,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
if( xCooSys == xCurrentCooSys )
{
aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel );
- aRet.appendAscii(":CS=");
+ aRet.append(":CS=");
aRet.append( OUString::number( nCooSysIndex ) );
break;
}
@@ -599,7 +599,7 @@ OUString ObjectIdentifier::createParticleForAxis(
OUStringBuffer aRet("Axis=");
aRet.append( OUString::number( nDimensionIndex ) );
- aRet.appendAscii(",");
+ aRet.append(",");
aRet.append( OUString::number( nAxisIndex ) );
return aRet.makeStringAndClear();
@@ -611,7 +611,7 @@ OUString ObjectIdentifier::createParticleForGrid(
{
OUStringBuffer aRet("Axis=");
aRet.append( OUString::number( nDimensionIndex ) );
- aRet.appendAscii(",");
+ aRet.append(",");
aRet.append( OUString::number( nAxisIndex ) );
aRet.append( ":Grid=0" );
@@ -642,15 +642,15 @@ OUString ObjectIdentifier::createParticleForSeries(
{
OUStringBuffer aRet;
- aRet.appendAscii("D=");
+ aRet.append("D=");
aRet.append( OUString::number( nDiagramIndex ) );
- aRet.appendAscii(":CS=");
+ aRet.append(":CS=");
aRet.append( OUString::number( nCooSysIndex ) );
- aRet.appendAscii(":CT=");
+ aRet.append(":CT=");
aRet.append( OUString::number( nChartTypeIndex ) );
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_DATA_SERIES ));
- aRet.appendAscii("=");
+ aRet.append("=");
aRet.append( OUString::number( nSeriesIndex ) );
return aRet.makeStringAndClear();
@@ -666,9 +666,9 @@ OUString ObjectIdentifier::createParticleForLegend(
//todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, rModel ) );
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_LEGEND ));
- aRet.appendAscii("=");
+ aRet.append("=");
return aRet.makeStringAndClear();
}
@@ -683,9 +683,9 @@ OUString ObjectIdentifier::createParticleForLegend(
//todo: if more than one diagram is implemeted, find the correct diagram which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel ) );
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_LEGEND ));
- aRet.appendAscii("=");
+ aRet.append("=");
return aRet.makeStringAndClear();
}
@@ -712,13 +712,13 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
OUStringBuffer aRet( m_aProtocol );
aRet.append( lcl_createClassificationStringForType( eObjectType, rDragMethodServiceName, rDragParameterString ));
if(aRet.getLength() > (sal_Int32)strlen(m_aProtocol))
- aRet.appendAscii("/");
+ aRet.append("/");
aRet.append(rParentPartical);
if(!rParentPartical.isEmpty())
- aRet.appendAscii(":");
+ aRet.append(":");
aRet.append(getStringForType( eObjectType ));
- aRet.appendAscii("=");
+ aRet.append("=");
aRet.append(rParticleID);
return aRet.makeStringAndClear();
@@ -1135,7 +1135,7 @@ OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OU
OUStringBuffer aRet(rParticle);
if( !aRet.isEmpty() && !rChildParticle.isEmpty() )
- aRet.appendAscii(":");
+ aRet.append(":");
if( !rChildParticle.isEmpty() )
aRet.append(rChildParticle);
@@ -1147,7 +1147,7 @@ OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType,
OUStringBuffer aRet( getStringForType( eObjectType ) );
if( !aRet.isEmpty() )
{
- aRet.appendAscii("=");
+ aRet.append("=");
aRet.append(OUString::number(nIndex));
}
return aRet.makeStringAndClear();
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index 9b39e01..176e98b 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -247,12 +247,12 @@ OUString PolynomialRegressionCurveCalculator::ImplGetRepresentation(
}
else if (aValue < 0.0)
{
- aBuf.appendAscii( " - " );
+ aBuf.append( " - " );
}
else
{
if (i != aLastIndex)
- aBuf.appendAscii( " + " );
+ aBuf.append( " + " );
}
aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, std::abs( aValue ) ) );
@@ -261,11 +261,11 @@ OUString PolynomialRegressionCurveCalculator::ImplGetRepresentation(
{
if (i == 1)
{
- aBuf.appendAscii( "x" );
+ aBuf.append( "x" );
}
else
{
- aBuf.appendAscii( "x^" );
+ aBuf.append( "x^" );
aBuf.append(i);
}
}
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index cbabbf1..0c0064d 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -91,9 +91,9 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence(
aRole.append( '-' );
if( bPositiveValue )
- aRole = aRole.appendAscii( "positive" );
+ aRole.append( "positive" );
else
- aRole = aRole.appendAscii( "negative" );
+ aRole.append( "negative" );
OUString aLongRole = aRole.makeStringAndClear();
Reference< chart2::data::XLabeledDataSequence > xLSeq(
commit 1d6cd0146e5e504665b0075311471109cdde52ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 31 08:04:28 2015 +0200
loplugin:stringconstant: OUStringBuffer: appendAscii -> append
Change-Id: I957be579527123be25abca0b7dcb69295711abf8
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 1672587..5b5f3a1 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -470,11 +470,11 @@ namespace comphelper
if ( !bValid )
{
OUStringBuffer aMessage;
- aMessage.appendAscii( "Incompatible value type. Found '" );
+ aMessage.append( "Incompatible value type. Found '" );
aMessage.append( _value.getValueTypeName() );
- aMessage.appendAscii( "', where '" );
+ aMessage.append( "', where '" );
aMessage.append( m_aData.m_aValueType.getTypeName() );
- aMessage.appendAscii( "' (or compatible type) is expected." );
+ aMessage.append( "' (or compatible type) is expected." );
throw IllegalTypeException( aMessage.makeStringAndClear(), *const_cast< EnumerableMap* >( this ) );
}
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index b3f7472..1cf5bae 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -87,9 +87,9 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs
if (!xProps.is())
{
OUStringBuffer sMsg(256);
- sMsg.appendAscii("The requested path \"");
+ sMsg.append("The requested path \"");
sMsg.append (sRelPath );
- sMsg.appendAscii("\" does not exists." );
+ sMsg.append("\" does not exists." );
throw css::container::NoSuchElementException(
sMsg.makeStringAndClear());
@@ -110,9 +110,9 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::
if (!xProps.is())
{
OUStringBuffer sMsg(256);
- sMsg.appendAscii("The requested path \"");
+ sMsg.append("The requested path \"");
sMsg.append (sRelPath );
- sMsg.appendAscii("\" does not exists." );
+ sMsg.append("\" does not exists." );
throw css::container::NoSuchElementException(
sMsg.makeStringAndClear());
@@ -131,9 +131,9 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode
if (!xSet.is())
{
OUStringBuffer sMsg(256);
- sMsg.appendAscii("The requested path \"");
+ sMsg.append("The requested path \"");
sMsg.append (sRelPathToSet );
- sMsg.appendAscii("\" does not exists." );
+ sMsg.append("\" does not exists." );
throw css::container::NoSuchElementException(
sMsg.makeStringAndClear());
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 9f6eb73..e6cef1d 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -233,7 +233,7 @@ namespace comphelper
try
{
OUStringBuffer aBuffer;
- aBuffer.appendAscii( "string:" );
+ aBuffer.append( "string:" );
aBuffer.append( _nMessageResID );
OSL_VERIFY( _rxBundle->getDirectElement( aBuffer.makeStringAndClear() ) >>= sMessage );
}
@@ -262,11 +262,11 @@ namespace comphelper
if ( sMessage.isEmpty() )
{
OUStringBuffer aBuffer;
- aBuffer.appendAscii( "<invalid event resource: '" );
+ aBuffer.append( "<invalid event resource: '" );
aBuffer.append( m_pData->sBundleBaseName );
- aBuffer.appendAscii( ":" );
+ aBuffer.append( ":" );
aBuffer.append( _nMessageResID );
- aBuffer.appendAscii( "'>" );
+ aBuffer.append( "'>" );
sMessage = aBuffer.makeStringAndClear();
}
return sMessage;
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index cd6c7d6..62705ac 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -252,11 +252,11 @@ namespace comphelper
// argument exists, but is of wrong type
OUStringBuffer aBuffer;
- aBuffer.appendAscii( "Invalid value type for '" );
+ aBuffer.append( "Invalid value type for '" );
aBuffer.append ( _rValueName );
- aBuffer.appendAscii( "'.\nExpected: " );
+ aBuffer.append( "'.\nExpected: " );
aBuffer.append ( _rExpectedValueType.getTypeName() );
- aBuffer.appendAscii( "\nFound: " );
+ aBuffer.append( "\nFound: " );
aBuffer.append ( pos->second.getValueType().getTypeName() );
throw IllegalArgumentException( aBuffer.makeStringAndClear(), NULL, 0 );
}
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index 535a207..daffd7c 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -97,7 +97,7 @@ namespace comphelper
OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
{
OUStringBuffer key;
- key.appendAscii( "string:" );
+ key.append( "string:" );
key.append( _resourceId );
return key.makeStringAndClear();
}
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 1d4a911..335919b 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -202,14 +202,14 @@ namespace
void lcl_throwIllegalPropertyValueTypeException( const PropertyDescription& _rProperty, const Any& _rValue )
{
OUStringBuffer aErrorMessage;
- aErrorMessage.appendAscii( "The given value cannot be converted to the required property type." );
- aErrorMessage.appendAscii( "\n(property name \"" );
+ aErrorMessage.append( "The given value cannot be converted to the required property type." );
+ aErrorMessage.append( "\n(property name \"" );
aErrorMessage.append( _rProperty.aProperty.Name );
- aErrorMessage.appendAscii( "\", found value type \"" );
+ aErrorMessage.append( "\", found value type \"" );
aErrorMessage.append( _rValue.getValueType().getTypeName() );
- aErrorMessage.appendAscii( "\", required property type \"" );
+ aErrorMessage.append( "\", required property type \"" );
aErrorMessage.append( _rProperty.aProperty.Type.getTypeName() );
- aErrorMessage.appendAscii( "\")" );
+ aErrorMessage.append( "\")" );
throw IllegalArgumentException( aErrorMessage.makeStringAndClear(), NULL, 4 );
}
}
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index db12ef5..3b5e7ed 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -38,9 +38,9 @@ namespace comphelper
// strings only would suffice, and could be realized with an UNO service, so we do not
// need the dependency to the Tools project)
OUStringBuffer sMessage;
- sMessage.appendAscii( "The property \"" );
+ sMessage.append( "The property \"" );
sMessage.append( _rPropertyName );
- sMessage.appendAscii( "\" is unknown." );
+ sMessage.append( "\" is unknown." );
return sMessage.makeStringAndClear();
}
}
commit 5f5ccfc0a69de4c10b6adeeaaf284bcb07ab7f39
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 31 08:04:20 2015 +0200
loplugin:stringconstant: OUStringBuffer: appendAscii -> append
Change-Id: Id852428e7b7cde6eec6eeb9a2a9004d1f2e789b6
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 2652ae8..87481cc 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -47,7 +47,7 @@ namespace {
void appendMessage(
OUStringBuffer & buffer, css::uno::Exception const & exception)
{
- buffer.appendAscii("; ");
+ buffer.append("; ");
buffer.append(exception.Message);
}
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index e322b10..0eb1fff 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -87,25 +87,25 @@ OUString Data::createSegment(
}
OUStringBuffer buf(templateName);
//TODO: verify template name contains no bad chars?
- buf.appendAscii("['");
+ buf.append("['");
for (sal_Int32 i = 0; i < name.getLength(); ++i) {
sal_Unicode c = name[i];
switch (c) {
case '&':
- buf.appendAscii("&");
+ buf.append("&");
break;
case '"':
- buf.appendAscii(""");
+ buf.append(""");
break;
case '\'':
- buf.appendAscii("'");
+ buf.append("'");
break;
default:
buf.append(c);
break;
}
}
- buf.appendAscii("']");
+ buf.append("']");
return buf.makeStringAndClear();
}
commit 7bff36d45d946abe40bb7a642165a54d289e11c1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 31 08:04:12 2015 +0200
loplugin:stringconstant: OUStringBuffer: appendAscii -> append
Change-Id: I68b02ad101c4c2165b4618ed5d97cbffc2c43d2d
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index ffcc941..a3e5bb8 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -63,9 +63,9 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
{
if (::cppu::any2bool(_rVal))
- aRet.appendAscii("1");
+ aRet.append("1");
else
- aRet.appendAscii("0");
+ aRet.append("0");
}
else
{
@@ -78,7 +78,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
if (bQuote)
- aRet.appendAscii("'");
+ aRet.append("'");
{
OUString aTemp;
_rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
@@ -96,7 +96,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
aRet.append(aTemp);
}
if (bQuote)
- aRet.appendAscii("'");
+ aRet.append("'");
break;
case DataType::REAL:
case DataType::DOUBLE:
@@ -136,10 +136,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
if ( bOk )
{
if (bQuote)
- aRet.appendAscii("{ts '");
+ aRet.append("{ts '");
aRet.append(DBTypeConversion::toDateTimeString(aDateTime));
if (bQuote)
- aRet.appendAscii("'}");
+ aRet.append("'}");
break;
}
break;
@@ -166,10 +166,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
bOk = _rVal >>= aDate;
OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!");
if (bQuote)
- aRet.appendAscii("{d '");
+ aRet.append("{d '");
aRet.append(DBTypeConversion::toDateString(aDate));
if (bQuote)
- aRet.appendAscii("'}");
+ aRet.append("'}");
} break;
case DataType::TIME:
{
@@ -193,10 +193,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
bOk = _rVal >>= aTime;
OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!");
if (bQuote)
- aRet.appendAscii("{t '");
+ aRet.append("{t '");
aRet.append(DBTypeConversion::toTimeString(aTime));
if (bQuote)
- aRet.appendAscii("'}");
+ aRet.append("'}");
} break;
}
}
@@ -206,7 +206,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
}
}
else
- aRet.appendAscii(" NULL ");
+ aRet.append(" NULL ");
return aRet.makeStringAndClear();
}
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 8c6a3b6..6b3b8d9 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -141,8 +141,8 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
OUString aDot( "." );
if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
- aSql.appendAscii("UNIQUE ");
- aSql.appendAscii("INDEX ");
+ aSql.append("UNIQUE ");
+ aSql.append("INDEX ");
OUString aCatalog,aSchema,aTable;
@@ -153,9 +153,9 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
if (!_rForName.isEmpty() )
{
aSql.append( ::dbtools::quoteName( aQuote, _rForName ) );
- aSql.appendAscii(" ON ");
+ aSql.append(" ON ");
aSql.append(aComposedName);
- aSql.appendAscii(" ( ");
+ aSql.append(" ( ");
Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
@@ -176,7 +176,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
:
" DESC");
}
- aSql.appendAscii(",");
+ aSql.append(",");
}
aSql[aSql.getLength() - 1] = ')';
}
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 30ba628..f24a9f2 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -157,19 +157,19 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
// if we're here, we belong to a table which is not new, i.e. already exists in the database.
// In this case, really append the new index.
OUStringBuffer aSql;
- aSql.appendAscii("ALTER TABLE ");
+ aSql.append("ALTER TABLE ");
OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( );
aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true ));
- aSql.appendAscii(" ADD ");
+ aSql.append(" ADD ");
if ( nKeyType == KeyType::PRIMARY )
{
- aSql.appendAscii(" PRIMARY KEY (");
+ aSql.append(" PRIMARY KEY (");
}
else if ( nKeyType == KeyType::FOREIGN )
{
- aSql.appendAscii(" FOREIGN KEY (");
+ aSql.append(" FOREIGN KEY (");
}
else
throw SQLException();
@@ -180,28 +180,28 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
for(sal_Int32 i = 0 ; i < xColumns->getCount() ; ++i)
{
if ( i > 0 )
- aSql.appendAscii(",");
+ aSql.append(",");
xColProp.set(xColumns->getByIndex(i), css::uno::UNO_QUERY);
aSql.append( ::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))) );
}
- aSql.appendAscii(")");
+ aSql.append(")");
if ( nKeyType == KeyType::FOREIGN )
{
- aSql.appendAscii(" REFERENCES ");
+ aSql.append(" REFERENCES ");
aSql.append(::dbtools::quoteTableName(m_pTable->getConnection()->getMetaData(),sReferencedName,::dbtools::eInTableDefinitions));
- aSql.appendAscii(" (");
+ aSql.append(" (");
for(sal_Int32 i=0;i<xColumns->getCount();++i)
{
if ( i > 0 )
- aSql.appendAscii(",");
+ aSql.append(",");
xColumns->getByIndex(i) >>= xColProp;
aSql.append(::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_RELATEDCOLUMN)))));
}
- aSql.appendAscii(")");
+ aSql.append(")");
aSql.append(getKeyRuleString(true ,nUpdateRule));
aSql.append(getKeyRuleString(false ,nDeleteRule));
}
@@ -273,7 +273,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
else
{
OUStringBuffer aSql;
- aSql.appendAscii("ALTER TABLE ");
+ aSql.append("ALTER TABLE ");
aSql.append( composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable,::dbtools::eInTableDefinitions, false, false, true ));
@@ -285,7 +285,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
}
if ( KeyType::PRIMARY == nKeyType )
{
- aSql.appendAscii(" DROP PRIMARY KEY");
+ aSql.append(" DROP PRIMARY KEY");
}
else
{
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 92854f8..0d8e5c0 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -105,7 +105,7 @@ namespace dbtools
{
css::util::Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
OUStringBuffer aTemp(toDateString(aDate));
- aTemp.appendAscii(" ");
+ aTemp.append(" ");
css::util::Time const aTime(_rDateTime.NanoSeconds, _rDateTime.Seconds,
_rDateTime.Minutes, _rDateTime.Hours, _rDateTime.IsUTC);
aTemp.append( toTimeString(aTime) );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a3feae5..43e5244 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -830,7 +830,7 @@ static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _
if ( !_rSchema.isEmpty() && aNameComps.bSchemas )
{
aComposedName.append( _bQuote ? quoteName( sQuoteString, _rSchema ) : _rSchema );
- aComposedName.appendAscii( "." );
+ aComposedName.append( "." );
}
aComposedName.append( _bQuote ? quoteName( sQuoteString, _rName ) : _rName );
@@ -1933,9 +1933,9 @@ void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bV
case BooleanComparisonMode::IS_LITERAL:
_out_rSQLPredicate.append( _rExpression );
if ( _bValue )
- _out_rSQLPredicate.appendAscii( " IS TRUE" );
+ _out_rSQLPredicate.append( " IS TRUE" );
else
- _out_rSQLPredicate.appendAscii( " IS FALSE" );
+ _out_rSQLPredicate.append( " IS FALSE" );
break;
case BooleanComparisonMode::EQUAL_LITERAL:
@@ -1946,16 +1946,16 @@ void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bV
case BooleanComparisonMode::ACCESS_COMPAT:
if ( _bValue )
{
- _out_rSQLPredicate.appendAscii( " NOT ( ( " );
+ _out_rSQLPredicate.append( " NOT ( ( " );
_out_rSQLPredicate.append( _rExpression );
- _out_rSQLPredicate.appendAscii( " = 0 ) OR ( " );
+ _out_rSQLPredicate.append( " = 0 ) OR ( " );
_out_rSQLPredicate.append( _rExpression );
- _out_rSQLPredicate.appendAscii( " IS NULL ) )" );
+ _out_rSQLPredicate.append( " IS NULL ) )" );
}
else
{
_out_rSQLPredicate.append( _rExpression );
- _out_rSQLPredicate.appendAscii( " = 0" );
+ _out_rSQLPredicate.append( " = 0" );
}
break;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ce7fc96..7f5b680 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -126,7 +126,7 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const
if ( nParenPos == -1 )
{
aSql.append(sTypeName);
- aSql.appendAscii("(");
+ aSql.append("(");
}
else
{
@@ -137,13 +137,13 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const
{
aSql.append(nPrecision);
if ( (nScale > 0) || (!_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1) )
- aSql.appendAscii(",");
+ aSql.append(",");
}
if ( (nScale > 0) || ( !_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1 ) || nDataType == DataType::TIMESTAMP )
aSql.append(nScale);
if ( nParenPos == -1 )
- aSql.appendAscii(")");
+ aSql.append(")");
else
{
nParenPos = sTypeName.indexOf(')',nParenPos);
@@ -183,7 +183,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
if ( xPropInfo.is() && xPropInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) )
xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) >>= sAutoIncrementValue;
- aSql.appendAscii(" ");
+ aSql.append(" ");
aSql.append(createStandardTypePart(xColProp, _xConnection, _sCreatePattern));
@@ -192,7 +192,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty())
{
- aSql.appendAscii(" ");
+ aSql.append(" ");
aSql.append(sAutoIncrementValue);
}
@@ -238,7 +238,7 @@ OUString createStandardCreateStatement(const Reference< XPropertySet >& descript
if ( (xColumns->getByIndex(i) >>= xColProp) && xColProp.is() )
{
aSql.append(createStandardColumnPart(xColProp,_xConnection,_pHelper,_sCreatePattern));
- aSql.appendAscii(",");
+ aSql.append(",");
}
}
return aSql.makeStringAndClear();
@@ -366,7 +366,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
if ( aSql[aSql.getLength() - 1] == ',' )
aSql[aSql.getLength() - 1] = ')';
else
- aSql.appendAscii(")");
+ aSql.append(")");
}
return aSql.makeStringAndClear();
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index ff1f03e..cadb359 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -109,12 +109,12 @@ namespace dbtools
{
io_appendTo.insert( 0, '(' );
io_appendTo.insert( 1, ' ' );
- io_appendTo.appendAscii( " ) AND " );
+ io_appendTo.append( " ) AND " );
}
- io_appendTo.appendAscii( "( " );
+ io_appendTo.append( "( " );
io_appendTo.append( i_component );
- io_appendTo.appendAscii( " )" );
+ io_appendTo.append( " )" );
}
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 1f94a59..06f16ac 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -389,9 +389,9 @@ namespace dbtools
if ( !sAdditionalFilter.isEmpty() )
sAdditionalFilter.append(" AND ");
- sAdditionalFilter.appendAscii("( ",((sal_Int32)(sizeof("( ")-1)));
+ sAdditionalFilter.append("( ");
sAdditionalFilter.append(*aComponent);
- sAdditionalFilter.appendAscii(" )",((sal_Int32)(sizeof(" )")-1)));
+ sAdditionalFilter.append(" )");
}
// now set this filter at the 's filter manager
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 58ad866..6c5a8e1 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -237,7 +237,7 @@ namespace connectivity
{
OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
- aMessage.append( getMessagePrefix() ).appendAscii( " " ).append( sResMessage );
+ aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
}
return aMessage.makeStringAndClear();
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index c8f182d..bf77aa3 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -30,14 +30,14 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
OUStringBuffer buf;
const ISC_STATUS* pStatus = reinterpret_cast<const ISC_STATUS*>(&rStatusVector);
- buf.appendAscii("firebird_sdbc error:");
+ buf.append("firebird_sdbc error:");
try
{
char msg[512]; // Size is based on suggestion in docs.
while(fb_interpret(msg, sizeof(msg), &pStatus))
{
// TODO: verify encoding
- buf.appendAscii("\n*");
+ buf.append("\n*");
buf.append(OUString(msg, strlen(msg), RTL_TEXTENCODING_UTF8));
}
}
@@ -45,7 +45,7 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
{
SAL_WARN("connectivity.firebird", "ignore fb_interpret exception");
}
- buf.appendAscii("\ncaused by\n'").append(rCause).appendAscii("'\n");
+ buf.append("\ncaused by\n'").append(rCause).append("'\n");
OUString error = buf.makeStringAndClear();
SAL_WARN("connectivity.firebird", error);
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 16b5378..89bf6b5 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -293,9 +293,9 @@ namespace connectivity { namespace hsqldb
// get the table information
OUStringBuffer sSQL;
- sSQL.appendAscii( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" );
+ sSQL.append( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" );
HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true );
- sSQL.appendAscii( " AND TABLE_TYPE = 'TABLE'" );
+ sSQL.append( " AND TABLE_TYPE = 'TABLE'" );
Reference< XStatement > xStatement( xMe->createStatement(), UNO_QUERY_THROW );
Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), UNO_QUERY_THROW );
@@ -329,10 +329,10 @@ namespace connectivity { namespace hsqldb
// assemble the image URL
OUStringBuffer aImageURL;
// load the graphic from the global graphic repository
- aImageURL.appendAscii( "private:graphicrepository/" );
+ aImageURL.append( "private:graphicrepository/" );
// the relative path within the images.zip
- aImageURL.appendAscii( "database/" );
- aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
+ aImageURL.append( "database/" );
+ aImageURL.append( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
// the name of the graphic to use
OUString sImageURL( aImageURL.makeStringAndClear() );
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 02dfb05..bd6cf36 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -143,9 +143,9 @@ namespace connectivity
OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext )
{
OUStringBuffer aConfigPath;
- aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
+ aConfigPath.append( "/org.openoffice.Office.DataAccess/DriverSettings/" );
aConfigPath.append ( ODriverDelegator::getImplementationName_Static() );
- aConfigPath.appendAscii( "/PermittedJavaMethods" );
+ aConfigPath.append( "/PermittedJavaMethods" );
::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext(
_rxContext, aConfigPath.makeStringAndClear() ) );
@@ -882,9 +882,9 @@ namespace connectivity
if ( xStatement.is() )
{
OUStringBuffer aStatement;
- aStatement.appendAscii( "SET DATABASE COLLATION \"" );
+ aStatement.append( "SET DATABASE COLLATION \"" );
aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xContext ) ) );
- aStatement.appendAscii( "\"" );
+ aStatement.append( "\"" );
xStatement->execute( aStatement.makeStringAndClear() );
}
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 49cfdfd..9794aee 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -26,24 +26,24 @@ namespace connectivity { namespace hsqldb
void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
const OUString& _rSchema, const OUString& _rName, bool _bShortForm )
{
- _inout_rBuffer.appendAscii( " WHERE " );
+ _inout_rBuffer.append( " WHERE " );
if ( !_rCatalog.isEmpty() )
{
_inout_rBuffer.appendAscii( _bShortForm ? "TABLE_CAT" : "TABLE_CATALOG" );
- _inout_rBuffer.appendAscii( " = '" );
+ _inout_rBuffer.append( " = '" );
_inout_rBuffer.append ( _rCatalog );
- _inout_rBuffer.appendAscii( "' AND " );
+ _inout_rBuffer.append( "' AND " );
}
if ( !_rSchema.isEmpty() )
{
_inout_rBuffer.appendAscii( _bShortForm ? "TABLE_SCHEM" : "TABLE_SCHEMA" );
- _inout_rBuffer.appendAscii( " = '" );
+ _inout_rBuffer.append( " = '" );
_inout_rBuffer.append ( _rSchema );
- _inout_rBuffer.appendAscii( "' AND " );
+ _inout_rBuffer.append( "' AND " );
}
- _inout_rBuffer.appendAscii( "TABLE_NAME = '" );
+ _inout_rBuffer.append( "TABLE_NAME = '" );
_inout_rBuffer.append ( _rName );
- _inout_rBuffer.appendAscii( "'" );
+ _inout_rBuffer.append( "'" );
}
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 8c2b987..f4f6442 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -94,9 +94,9 @@ namespace connectivity { namespace hsqldb
// create a statement which can be used to re-create the original view, in case
// dropping it succeeds, but creating it with a new statement fails
OUStringBuffer aRestoreCommand;
- aRestoreCommand.appendAscii( "CREATE VIEW " );
+ aRestoreCommand.append( "CREATE VIEW " );
aRestoreCommand.append ( sQualifiedName );
- aRestoreCommand.appendAscii( " AS " );
+ aRestoreCommand.append( " AS " );
aRestoreCommand.append ( impl_getCommand_throwSQLException() );
OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
@@ -105,15 +105,15 @@ namespace connectivity { namespace hsqldb
{
// drop the existing view
OUStringBuffer aCommand;
- aCommand.appendAscii( "DROP VIEW " );
+ aCommand.append( "DROP VIEW " );
aCommand.append ( sQualifiedName );
xStatement->execute( aCommand.makeStringAndClear() );
bDropSucceeded = true;
// create a new one with the same name
- aCommand.appendAscii( "CREATE VIEW " );
+ aCommand.append( "CREATE VIEW " );
aCommand.append ( sQualifiedName );
- aCommand.appendAscii( " AS " );
+ aCommand.append( " AS " );
aCommand.append ( _rNewCommand );
xStatement->execute( aCommand.makeStringAndClear() );
}
@@ -156,7 +156,7 @@ namespace connectivity { namespace hsqldb
OUString HView::impl_getCommand() const
{
OUStringBuffer aCommand;
- aCommand.appendAscii( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
+ aCommand.append( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false );
::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 0d6ac6a..3972e5b 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -314,8 +314,8 @@ void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeExcepti
OUString MacabDriver::impl_getConfigurationSettingsPath()
{
OUStringBuffer aPath;
- aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
- aPath.appendAscii( "com.sun.star.comp.sdbc.macab.Driver" );
+ aPath.append( "/org.openoffice.Office.DataAccess/DriverSettings/" );
+ aPath.append( "com.sun.star.comp.sdbc.macab.Driver" );
return aPath.makeStringAndClear();
}
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 25949eb..a631f6c 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -213,9 +213,9 @@ void OTables::addComment(const Reference< XPropertySet >& descriptor,OUStringBuf
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sDesc;
if ( !sDesc.isEmpty() )
{
- _rOut.appendAscii(" COMMENT '");
+ _rOut.append(" COMMENT '");
_rOut.append(sDesc);
- _rOut.appendAscii("'");
+ _rOut.append("'");
}
}
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index a52608a..9b05604 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -1309,53 +1309,53 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException,
OUStringBuffer aValue;
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_STRING_FUNCTIONS,nValue,*this);
if(nValue & SQL_FN_STR_ASCII)
- aValue.appendAscii("ASCII,");
+ aValue.append("ASCII,");
if(nValue & SQL_FN_STR_BIT_LENGTH)
- aValue.appendAscii("BIT_LENGTH,");
+ aValue.append("BIT_LENGTH,");
if(nValue & SQL_FN_STR_CHAR)
- aValue.appendAscii("CHAR,");
+ aValue.append("CHAR,");
if(nValue & SQL_FN_STR_CHAR_LENGTH)
- aValue.appendAscii("CHAR_LENGTH,");
+ aValue.append("CHAR_LENGTH,");
if(nValue & SQL_FN_STR_CHARACTER_LENGTH)
- aValue.appendAscii("CHARACTER_LENGTH,");
+ aValue.append("CHARACTER_LENGTH,");
if(nValue & SQL_FN_STR_CONCAT)
- aValue.appendAscii("CONCAT,");
+ aValue.append("CONCAT,");
if(nValue & SQL_FN_STR_DIFFERENCE)
- aValue.appendAscii("DIFFERENCE,");
+ aValue.append("DIFFERENCE,");
if(nValue & SQL_FN_STR_INSERT)
- aValue.appendAscii("INSERT,");
+ aValue.append("INSERT,");
if(nValue & SQL_FN_STR_LCASE)
- aValue.appendAscii("LCASE,");
+ aValue.append("LCASE,");
if(nValue & SQL_FN_STR_LEFT)
- aValue.appendAscii("LEFT,");
+ aValue.append("LEFT,");
if(nValue & SQL_FN_STR_LENGTH)
- aValue.appendAscii("LENGTH,");
+ aValue.append("LENGTH,");
if(nValue & SQL_FN_STR_LOCATE)
- aValue.appendAscii("LOCATE,");
+ aValue.append("LOCATE,");
if(nValue & SQL_FN_STR_LOCATE_2)
- aValue.appendAscii("LOCATE_2,");
+ aValue.append("LOCATE_2,");
if(nValue & SQL_FN_STR_LTRIM)
- aValue.appendAscii("LTRIM,");
+ aValue.append("LTRIM,");
if(nValue & SQL_FN_STR_OCTET_LENGTH)
- aValue.appendAscii("OCTET_LENGTH,");
+ aValue.append("OCTET_LENGTH,");
if(nValue & SQL_FN_STR_POSITION)
- aValue.appendAscii("POSITION,");
+ aValue.append("POSITION,");
if(nValue & SQL_FN_STR_REPEAT)
- aValue.appendAscii("REPEAT,");
+ aValue.append("REPEAT,");
if(nValue & SQL_FN_STR_REPLACE)
- aValue.appendAscii("REPLACE,");
+ aValue.append("REPLACE,");
if(nValue & SQL_FN_STR_RIGHT)
- aValue.appendAscii("RIGHT,");
+ aValue.append("RIGHT,");
if(nValue & SQL_FN_STR_RTRIM)
- aValue.appendAscii("RTRIM,");
+ aValue.append("RTRIM,");
if(nValue & SQL_FN_STR_SOUNDEX)
- aValue.appendAscii("SOUNDEX,");
+ aValue.append("SOUNDEX,");
if(nValue & SQL_FN_STR_SPACE)
- aValue.appendAscii("SPACE,");
+ aValue.append("SPACE,");
if(nValue & SQL_FN_STR_SUBSTRING)
- aValue.appendAscii("SUBSTRING,");
+ aValue.append("SUBSTRING,");
if(nValue & SQL_FN_STR_UCASE)
- aValue.appendAscii("UCASE,");
+ aValue.append("UCASE,");
if ( !aValue.isEmpty() )
@@ -1371,47 +1371,47 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TIMEDATE_FUNCTIONS,nValue,*this);
if(nValue & SQL_FN_TD_CURRENT_DATE)
- aValue.appendAscii("CURRENT_DATE,");
+ aValue.append("CURRENT_DATE,");
if(nValue & SQL_FN_TD_CURRENT_TIME)
- aValue.appendAscii("CURRENT_TIME,");
+ aValue.append("CURRENT_TIME,");
if(nValue & SQL_FN_TD_CURRENT_TIMESTAMP)
- aValue.appendAscii("CURRENT_TIMESTAMP,");
+ aValue.append("CURRENT_TIMESTAMP,");
if(nValue & SQL_FN_TD_CURDATE)
- aValue.appendAscii("CURDATE,");
+ aValue.append("CURDATE,");
if(nValue & SQL_FN_TD_CURTIME)
- aValue.appendAscii("CURTIME,");
+ aValue.append("CURTIME,");
if(nValue & SQL_FN_TD_DAYNAME)
- aValue.appendAscii("DAYNAME,");
+ aValue.append("DAYNAME,");
if(nValue & SQL_FN_TD_DAYOFMONTH)
- aValue.appendAscii("DAYOFMONTH,");
+ aValue.append("DAYOFMONTH,");
if(nValue & SQL_FN_TD_DAYOFWEEK)
- aValue.appendAscii("DAYOFWEEK,");
+ aValue.append("DAYOFWEEK,");
if(nValue & SQL_FN_TD_DAYOFYEAR)
- aValue.appendAscii("DAYOFYEAR,");
+ aValue.append("DAYOFYEAR,");
if(nValue & SQL_FN_TD_EXTRACT)
- aValue.appendAscii("EXTRACT,");
+ aValue.append("EXTRACT,");
if(nValue & SQL_FN_TD_HOUR)
- aValue.appendAscii("HOUR,");
+ aValue.append("HOUR,");
if(nValue & SQL_FN_TD_MINUTE)
- aValue.appendAscii("MINUTE,");
+ aValue.append("MINUTE,");
if(nValue & SQL_FN_TD_MONTH)
- aValue.appendAscii("MONTH,");
+ aValue.append("MONTH,");
if(nValue & SQL_FN_TD_MONTHNAME)
- aValue.appendAscii("MONTHNAME,");
+ aValue.append("MONTHNAME,");
if(nValue & SQL_FN_TD_NOW)
- aValue.appendAscii("NOW,");
+ aValue.append("NOW,");
if(nValue & SQL_FN_TD_QUARTER)
- aValue.appendAscii("QUARTER,");
+ aValue.append("QUARTER,");
if(nValue & SQL_FN_TD_SECOND)
- aValue.appendAscii("SECOND,");
+ aValue.append("SECOND,");
if(nValue & SQL_FN_TD_TIMESTAMPADD)
- aValue.appendAscii("TIMESTAMPADD,");
+ aValue.append("TIMESTAMPADD,");
if(nValue & SQL_FN_TD_TIMESTAMPDIFF)
- aValue.appendAscii("TIMESTAMPDIFF,");
+ aValue.append("TIMESTAMPDIFF,");
if(nValue & SQL_FN_TD_WEEK)
- aValue.appendAscii("WEEK,");
+ aValue.append("WEEK,");
if(nValue & SQL_FN_TD_YEAR)
- aValue.appendAscii("YEAR,");
+ aValue.append("YEAR,");
if ( !aValue.isEmpty() )
aValue.setLength(aValue.getLength()-1);
@@ -1426,11 +1426,11 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException,
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SYSTEM_FUNCTIONS,nValue,*this);
if(nValue & SQL_FN_SYS_DBNAME)
- aValue.appendAscii("DBNAME,");
+ aValue.append("DBNAME,");
if(nValue & SQL_FN_SYS_IFNULL)
- aValue.appendAscii("IFNULL,");
+ aValue.append("IFNULL,");
if(nValue & SQL_FN_SYS_USERNAME)
- aValue.appendAscii("USERNAME,");
+ aValue.append("USERNAME,");
if ( !aValue.isEmpty() )
aValue.setLength(aValue.getLength()-1);
@@ -1445,53 +1445,53 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException,
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NUMERIC_FUNCTIONS,nValue,*this);
if(nValue & SQL_FN_NUM_ABS)
- aValue.appendAscii("ABS,");
+ aValue.append("ABS,");
if(nValue & SQL_FN_NUM_ACOS)
- aValue.appendAscii("ACOS,");
+ aValue.append("ACOS,");
if(nValue & SQL_FN_NUM_ASIN)
- aValue.appendAscii("ASIN,");
+ aValue.append("ASIN,");
if(nValue & SQL_FN_NUM_ATAN)
- aValue.appendAscii("ATAN,");
+ aValue.append("ATAN,");
if(nValue & SQL_FN_NUM_ATAN2)
- aValue.appendAscii("ATAN2,");
+ aValue.append("ATAN2,");
if(nValue & SQL_FN_NUM_CEILING)
- aValue.appendAscii("CEILING,");
+ aValue.append("CEILING,");
if(nValue & SQL_FN_NUM_COS)
- aValue.appendAscii("COS,");
+ aValue.append("COS,");
if(nValue & SQL_FN_NUM_COT)
- aValue.appendAscii("COT,");
+ aValue.append("COT,");
if(nValue & SQL_FN_NUM_DEGREES)
- aValue.appendAscii("DEGREES,");
+ aValue.append("DEGREES,");
if(nValue & SQL_FN_NUM_EXP)
- aValue.appendAscii("EXP,");
+ aValue.append("EXP,");
if(nValue & SQL_FN_NUM_FLOOR)
- aValue.appendAscii("FLOOR,");
+ aValue.append("FLOOR,");
if(nValue & SQL_FN_NUM_LOG)
- aValue.appendAscii("LOGF,");
+ aValue.append("LOGF,");
if(nValue & SQL_FN_NUM_LOG10)
- aValue.appendAscii("LOG10,");
+ aValue.append("LOG10,");
if(nValue & SQL_FN_NUM_MOD)
- aValue.appendAscii("MOD,");
+ aValue.append("MOD,");
if(nValue & SQL_FN_NUM_PI)
- aValue.appendAscii("PI,");
+ aValue.append("PI,");
if(nValue & SQL_FN_NUM_POWER)
- aValue.appendAscii("POWER,");
+ aValue.append("POWER,");
if(nValue & SQL_FN_NUM_RADIANS)
- aValue.appendAscii("RADIANS,");
+ aValue.append("RADIANS,");
if(nValue & SQL_FN_NUM_RAND)
- aValue.appendAscii("RAND,");
+ aValue.append("RAND,");
if(nValue & SQL_FN_NUM_ROUND)
- aValue.appendAscii("ROUND,");
+ aValue.append("ROUND,");
if(nValue & SQL_FN_NUM_SIGN)
- aValue.appendAscii("SIGN,");
+ aValue.append("SIGN,");
if(nValue & SQL_FN_NUM_SIN)
- aValue.appendAscii("SIN,");
+ aValue.append("SIN,");
if(nValue & SQL_FN_NUM_SQRT)
- aValue.appendAscii("SQRT,");
+ aValue.append("SQRT,");
if(nValue & SQL_FN_NUM_TAN)
- aValue.appendAscii("TAN,");
+ aValue.append("TAN,");
if(nValue & SQL_FN_NUM_TRUNCATE)
- aValue.appendAscii("TRUNCATE,");
+ aValue.append("TRUNCATE,");
if ( !aValue.isEmpty() )
aValue.setLength(aValue.getLength()-1);
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 3a003b0..db11fc9 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -635,9 +635,9 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
default:
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_resultset: Invalid property handle (" );
+ buf.append( "pq_resultset: Invalid property handle (" );
buf.append( nHandle );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
}
}
@@ -672,11 +672,11 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run
if( index < 1 || index > m_fieldCount )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_resultset: index out of range (" );
+ buf.append( "pq_resultset: index out of range (" );
buf.append( index );
- buf.appendAscii( ", allowed range is 1 to " );
+ buf.append( ", allowed range is 1 to " );
buf.append( m_fieldCount );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() );
}
@@ -685,14 +685,14 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run
void BaseResultSet::checkRowIndex( bool mustBeOnValidRow )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "pq_baseresultset: row index out of range, allowed is " );
+ buf.append( "pq_baseresultset: row index out of range, allowed is " );
if( mustBeOnValidRow )
{
if( m_row < 0 || m_row >= m_rowCount )
{
- buf.appendAscii( "0 to " );
+ buf.append( "0 to " );
buf.append( ((sal_Int32)(m_rowCount -1)) );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( m_row );
throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
}
@@ -701,9 +701,9 @@ void BaseResultSet::checkRowIndex( bool mustBeOnValidRow )
{
if( m_row < -1 || m_row > m_rowCount )
{
- buf.appendAscii( "-1 to " );
+ buf.append( "-1 to " );
buf.append( m_rowCount );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( m_row );
throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 15b00b3..3ccf92a 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -515,7 +515,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
if( aArguments.getLength() != 2 )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_driver: expected 2 arguments, got " );
+ buf.append( "pq_driver: expected 2 arguments, got " );
buf.append( aArguments.getLength( ) );
throw IllegalArgumentException(buf.makeStringAndClear(), Reference< XInterface > () , 0 );
}
@@ -523,7 +523,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
if( ! (aArguments[0] >>= url) )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_driver: expected string as first argument, got " );
+ buf.append( "pq_driver: expected string as first argument, got " );
buf.append( aArguments[0].getValueType().getTypeName() );
throw IllegalArgumentException( buf.makeStringAndClear() , *this, 0 );
}
@@ -559,9 +559,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
else
errorMessage = "#no error message#";
OUStringBuffer buf( 128 );
- buf.appendAscii( "Error in database URL '" );
+ buf.append( "Error in database URL '" );
buf.append( url );
- buf.appendAscii( "':\n" );
+ buf.append( "':\n" );
buf.append( errorMessage );
// HY092 is "Invalid attribute/option identifier."
// Just the most likely error; the error might be HY024 "Invalid attribute value".
@@ -591,9 +591,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
const char * error = PQerrorMessage( m_settings.pConnection );
OUString errorMessage( error, strlen( error) , RTL_TEXTENCODING_ASCII_US );
- buf.appendAscii( "Couldn't establish database connection to '" );
+ buf.append( "Couldn't establish database connection to '" );
buf.append( url );
- buf.appendAscii( "'\n" );
+ buf.append( "'\n" );
buf.append( errorMessage );
PQfinish( m_settings.pConnection );
m_settings.pConnection = 0;
@@ -609,9 +609,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
if( isLog( &m_settings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "connection to '" );
+ buf.append( "connection to '" );
buf.append( url );
- buf.appendAscii( "' successfully opened" );
+ buf.append( "' successfully opened" );
log( &m_settings, LogLevel::INFO, buf.makeStringAndClear() );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 366fb61..701bad7 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1138,9 +1138,9 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc
if( isLog( m_pSettings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "DatabaseMetaData::getTables got called with " );
+ buf.append( "DatabaseMetaData::getTables got called with " );
buf.append( schemaPattern );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( tableNamePattern );
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
@@ -1425,8 +1425,8 @@ static void columnMetaData2DatabaseTypeDescription(
{
oidMap[row->getInt(12)] = DatabaseTypeDescription();
if( domains )
- queryBuf.appendAscii( " OR " );
- queryBuf.appendAscii( "oid = " );
+ queryBuf.append( " OR " );
+ queryBuf.append( "oid = " );
queryBuf.append( row->getInt(12 ) );
domains ++;
}
@@ -1464,11 +1464,11 @@ static void columnMetaData2DatabaseTypeDescription(
if( isLog( m_pSettings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "DatabaseMetaData::getColumns got called with " );
+ buf.append( "DatabaseMetaData::getColumns got called with " );
buf.append( schemaPattern );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( tableNamePattern );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( columnNamePattern );
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
@@ -1647,11 +1647,11 @@ static void columnMetaData2DatabaseTypeDescription(
if( isLog( m_pSettings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "DatabaseMetaData::getColumnPrivileges got called with " );
+ buf.append( "DatabaseMetaData::getColumnPrivileges got called with " );
buf.append( schema );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( table );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( columnNamePattern );
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
@@ -1676,9 +1676,9 @@ static void columnMetaData2DatabaseTypeDescription(
if( isLog( m_pSettings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "DatabaseMetaData::getTablePrivileges got called with " );
+ buf.append( "DatabaseMetaData::getTablePrivileges got called with " );
buf.append( schemaPattern );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( tableNamePattern );
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
@@ -1734,9 +1734,9 @@ static void columnMetaData2DatabaseTypeDescription(
if( isLog( m_pSettings, LogLevel::INFO ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "DatabaseMetaData::getPrimaryKeys got called with " );
+ buf.append( "DatabaseMetaData::getPrimaryKeys got called with " );
buf.append( schema );
- buf.appendAscii( "." );
+ buf.append( "." );
buf.append( table );
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 57804c0..f11ada3 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -222,13 +222,13 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex )
if( parameterIndex < 1 || parameterIndex > (sal_Int32) m_vars.size() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "pq_preparedstatement: parameter index out of range (expected 1 to " );
+ buf.append( "pq_preparedstatement: parameter index out of range (expected 1 to " );
buf.append( (sal_Int32 ) m_vars.size() );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( parameterIndex );
- buf.appendAscii( ", statement '" );
+ buf.append( ", statement '" );
buf.append( OStringToOUString( m_stmt, m_pSettings->encoding ) );
- buf.appendAscii( "')" );
+ buf.append( "')" );
throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () );
}
}
@@ -315,18 +315,18 @@ void PreparedStatement::raiseSQLException(
throw( SQLException )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_driver: ");
+ buf.append( "pq_driver: ");
if( errorType )
{
- buf.appendAscii( "[" );
+ buf.append( "[" );
buf.appendAscii( errorType );
- buf.appendAscii( "]" );
+ buf.append( "]" );
}
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
- buf.appendAscii( " (caused by statement '" );
+ buf.append( " (caused by statement '" );
buf.appendAscii( m_executedStatement.getStr() );
- buf.appendAscii( "')" );
+ buf.append( "')" );
OUString error = buf.makeStringAndClear();
log( m_pSettings, LogLevel::ERROR, error );
throw SQLException( error, *this, OUString(), 1, Any() );
@@ -800,9 +800,9 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
default:
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_statement: Invalid property handle (" );
+ buf.append( "pq_statement: Invalid property handle (" );
buf.append( nHandle );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 461241c..ee82f30 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -161,13 +161,13 @@ void ResultSetMetaData::checkForTypes()
extractConnectionFromStatement( m_origin->getStatement() )->createStatement();
DisposeGuard guard( stmt );
OUStringBuffer buf(128);
- buf.appendAscii( "SELECT oid, typname, typtype FROM pg_type WHERE ");
+ buf.append( "SELECT oid, typname, typtype FROM pg_type WHERE ");
for( int i = 0 ; i < m_colCount ; i ++ )
{
if( i > 0 )
- buf.appendAscii( " OR " );
+ buf.append( " OR " );
int oid = m_colDesc[i].typeOid;
- buf.appendAscii( "oid=" );
+ buf.append( "oid=" );
buf.append( (sal_Int32) oid );
}
Reference< XResultSet > rs = stmt->executeQuery( buf.makeStringAndClear() );
@@ -459,9 +459,9 @@ void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_resultsetmetadata: index out of range (expected 1 to " );
+ buf.append( "pq_resultsetmetadata: index out of range (expected 1 to " );
buf.append( m_colCount );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( columnIndex );
throw SQLException(
buf.makeStringAndClear(), *this, OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index dc34aa7..548aee6 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -202,9 +202,9 @@ void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_sequenceresultsetmetadata: index out of range (expected 1 to " );
+ buf.append( "pq_sequenceresultsetmetadata: index out of range (expected 1 to " );
buf.append( m_colCount );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( columnIndex );
throw SQLException(
buf.makeStringAndClear(), *this, OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 52eb1f2..e37e7f9 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -246,18 +246,18 @@ void Statement::raiseSQLException(
throw( SQLException )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_driver: ");
+ buf.append( "pq_driver: ");
if( errorType )
{
- buf.appendAscii( "[" );
+ buf.append( "[" );
buf.appendAscii( errorType );
- buf.appendAscii( "]" );
+ buf.append( "]" );
}
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
- buf.appendAscii( " (caused by statement '" );
+ buf.append( " (caused by statement '" );
buf.append( sql );
- buf.appendAscii( "')" );
+ buf.append( "')" );
OUString error = buf.makeStringAndClear();
log( m_pSettings, LogLevel::ERROR, error );
throw SQLException( error, *this, OUString(), 1, Any() );
@@ -297,18 +297,18 @@ static void raiseSQLException(
throw( SQLException )
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_driver: ");
+ buf.append( "pq_driver: ");
if( errorType )
{
- buf.appendAscii( "[" );
+ buf.append( "[" );
buf.appendAscii( errorType );
- buf.appendAscii( "]" );
+ buf.append( "]" );
}
buf.append(
OUString( errorMsg, strlen(errorMsg) , pSettings->encoding ) );
- buf.appendAscii( " (caused by statement '" );
+ buf.append( " (caused by statement '" );
buf.append( OStringToOUString( sql, pSettings->encoding ) );
- buf.appendAscii( "')" );
+ buf.append( "')" );
OUString error = buf.makeStringAndClear();
log( pSettings, LogLevel::ERROR, error );
throw SQLException( error, owner, OUString(), 1, Any() );
@@ -939,9 +939,9 @@ sal_Bool Statement::convertFastPropertyValue(
default:
{
OUStringBuffer buf(128);
- buf.appendAscii( "pq_statement: Invalid property handle (" );
+ buf.append( "pq_statement: Invalid property handle (" );
buf.append( nHandle );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 37eec4e..450a9be 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -646,11 +646,11 @@ com::sun::star::uno::Sequence< Any > parseArray( const OUString & str ) throw( S
{
OUStringBuffer buf;
- buf.appendAscii( "error during array parsing, didn't expect a } at position " );
+ buf.append( "error during array parsing, didn't expect a } at position " );
buf.append( (sal_Int32) i );
- buf.appendAscii( " ('" );
+ buf.append( " ('" );
buf.append( str );
- buf.appendAscii( "')" );
+ buf.append( "')" );
throw SQLException(
buf.makeStringAndClear(),
Reference< XInterface > (), OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 95eb19b..0c8721c 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -353,18 +353,18 @@ void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, s
if( m_row < 0 || m_row >= m_rowCount )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "deleteRow cannot be called on invalid row (" );
+ buf.append( "deleteRow cannot be called on invalid row (" );
buf.append( m_row );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw SQLException( buf.makeStringAndClear() , *this, OUString(), 0, Any() );
}
Reference< XStatement > stmt = extractConnectionFromStatement(m_owner)->createStatement();
DisposeGuard dispGuard( stmt );
OUStringBuffer buf( 128 );
- buf.appendAscii( "DELETE FROM " );
+ buf.append( "DELETE FROM " );
bufferQuoteQualifiedIdentifier( buf, m_schema, m_table, *m_ppSettings );
- buf.appendAscii( " " );
+ buf.append( " " );
buf.append( buildWhereClause() );
stmt->executeUpdate( buf.makeStringAndClear() );
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 5e1d991..7473bc7 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -102,9 +102,9 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public(
if( -1 == nHandle )
{
OUStringBuffer buf(128);
- buf.appendAscii( "Unknown property '" );
+ buf.append( "Unknown property '" );
buf.append( name );
- buf.appendAscii( "' in " );
+ buf.append( "' in " );
buf.append( m_implName );
throw com::sun::star::uno::RuntimeException( buf.makeStringAndClear() , *this );
}
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 33a1c27..333192d 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -517,11 +517,11 @@ void Columns::dropByIndex( sal_Int32 index )
if( index < 0 || index >= m_values.getLength() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "COLUMNS: Index out of range (allowed 0 to " );
+ buf.append( "COLUMNS: Index out of range (allowed 0 to " );
buf.append((sal_Int32)(m_values.getLength() -1) );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( index );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw com::sun::star::lang::IndexOutOfBoundsException(
buf.makeStringAndClear(), *this );
}
@@ -533,9 +533,9 @@ void Columns::dropByIndex( sal_Int32 index )
set->getPropertyValue( st.NAME ) >>= name;
OUStringBuffer update( 128 );
- update.appendAscii( "ALTER TABLE ONLY");
+ update.append( "ALTER TABLE ONLY");
bufferQuoteQualifiedIdentifier( update, m_schemaName, m_tableName, m_pSettings );
- update.appendAscii( "DROP COLUMN" );
+ update.append( "DROP COLUMN" );
bufferQuoteIdentifier( update, name, m_pSettings );
Reference< XStatement > stmt = m_origin->createStatement( );
DisposeGuard disposeIt( stmt );
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index c597fc7..fc4969e 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -165,11 +165,11 @@ Any Container::getByName( const OUString& aName )
if( ii == m_name2index.end() )
{
OUStringBuffer buf(128);
- buf.appendAscii( "Element " );
+ buf.append( "Element " );
buf.append( aName );
- buf.appendAscii( " unknown in " );
+ buf.append( " unknown in " );
buf.append( m_type );
- buf.appendAscii( "-Container" );
+ buf.append( "-Container" );
throw NoSuchElementException( buf.makeStringAndClear() , *this );
}
OSL_ASSERT( ii->second >= 0 && ii->second < m_values.getLength() );
@@ -217,11 +217,11 @@ Any Container::getByIndex( sal_Int32 Index )
if( Index < 0 || Index >= m_values.getLength() )
{
OUStringBuffer buf(128);
- buf.appendAscii( "Index " );
+ buf.append( "Index " );
buf.append( Index );
- buf.appendAscii(" out of range for " );
+ buf.append(" out of range for " );
buf.append( m_type );
- buf.appendAscii("-Container, expected 0 <= x <= " );
+ buf.append("-Container, expected 0 <= x <= " );
buf.append( (sal_Int32 ) (m_values.getLength() -1));
throw IndexOutOfBoundsException( buf.makeStringAndClear(), *this );
}
@@ -329,15 +329,15 @@ void Container::dropByName( const OUString& elementName )
if( ii == m_name2index.end() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "Column " );
+ buf.append( "Column " );
buf.append( elementName );
- buf.appendAscii( " is unknown in " );
+ buf.append( " is unknown in " );
buf.append( m_type );
// buf.appendAscii( " " );
// buf.append( m_schemaName );
// buf.appendAscii( "." );
// buf.append( m_tableName );
- buf.appendAscii( " container, so it can't be dropped" );
+ buf.append( " container, so it can't be dropped" );
throw com::sun::star::container::NoSuchElementException(
buf.makeStringAndClear(), *this );
}
@@ -353,11 +353,11 @@ void Container::dropByIndex( sal_Int32 index )
if( index < 0 || index >= m_values.getLength() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "Index out of range (allowed 0 to " );
+ buf.append( "Index out of range (allowed 0 to " );
buf.append((sal_Int32)(m_values.getLength() -1) );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( index );
- buf.appendAscii( ") in " );
+ buf.append( ") in " );
buf.append( m_type );
throw com::sun::star::lang::IndexOutOfBoundsException(
buf.makeStringAndClear(), *this );
@@ -408,11 +408,11 @@ void Container::append(
if( hasByName( name ) )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "a ");
+ buf.append( "a ");
buf.append( m_type );
- buf.appendAscii( " with name " );
+ buf.append( " with name " );
buf.append( name );
- buf.appendAscii( " already exists in this container" );
+ buf.append( " already exists in this container" );
throw com::sun::star::container::ElementExistException(
buf.makeStringAndClear() , *this );
}
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index d3951f8..5bc09af 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -259,11 +259,11 @@ void Indexes::dropByIndex( sal_Int32 index )
if( index < 0 || index >= m_values.getLength() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "Indexes: Index out of range (allowed 0 to " );
+ buf.append( "Indexes: Index out of range (allowed 0 to " );
buf.append( (sal_Int32) (m_values.getLength() -1) );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( index );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw com::sun::star::lang::IndexOutOfBoundsException(
buf.makeStringAndClear(), *this );
}
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index 6d7cf0b..6b8f2f5 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -157,9 +157,9 @@ void Users::dropByName( const OUString& elementName )
if( ii == m_name2index.end() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "User " );
+ buf.append( "User " );
buf.append( elementName );
- buf.appendAscii( " is unknown, so it can't be dropped" );
+ buf.append( " is unknown, so it can't be dropped" );
throw com::sun::star::container::NoSuchElementException(
buf.makeStringAndClear(), *this );
}
@@ -176,11 +176,11 @@ void Users::dropByIndex( sal_Int32 index )
if( index < 0 || index >= m_values.getLength() )
{
OUStringBuffer buf( 128 );
- buf.appendAscii( "USERS: Index out of range (allowed 0 to " );
+ buf.append( "USERS: Index out of range (allowed 0 to " );
buf.append( (sal_Int32) (m_values.getLength() -1) );
- buf.appendAscii( ", got " );
+ buf.append( ", got " );
buf.append( index );
- buf.appendAscii( ")" );
+ buf.append( ")" );
throw com::sun::star::lang::IndexOutOfBoundsException(
buf.makeStringAndClear(), *this );
}
@@ -191,7 +191,7 @@ void Users::dropByIndex( sal_Int32 index )
set->getPropertyValue( getStatics().NAME ) >>= name;
OUStringBuffer update( 128 );
- update.appendAscii( "DROP USER " );
+ update.append( "DROP USER " );
bufferQuoteIdentifier( update, name, m_pSettings );
Reference< XStatement > stmt = m_origin->createStatement( );
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index e2e0aaf..e090562 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list