[Libreoffice-commits] core.git: basic/source canvas/source chart2/source compilerplugins/clang configmgr/qa connectivity/source cppu/qa cui/source dbaccess/source desktop/source drawinglayer/source editeng/source embeddedobj/source extensions/source forms/source fpicker/source framework/inc framework/source i18npool/source include/svl javaunohelper/source reportdesign/source sc/qa scripting/source sc/source sdext/source sd/qa sd/source sfx2/source slideshow/source sot/source starmath/source stoc/source svl/qa svl/source svtools/source svx/source sw/inc sw/qa sw/source toolkit/source ucbhelper/source ucb/source unotools/source vcl/qa vcl/source vcl/unx xmlhelp/source xmloff/source xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 31 08:56:56 UTC 2017
basic/source/classes/errobject.cxx | 2
basic/source/classes/sb.cxx | 6
basic/source/classes/sbunoobj.cxx | 12
basic/source/runtime/runtime.cxx | 2
basic/source/runtime/stdobj1.cxx | 6
canvas/source/factory/cf_service.cxx | 4
chart2/source/controller/main/ConfigurationAccess.cxx | 2
chart2/source/model/main/ChartModel.cxx | 2
compilerplugins/clang/stringconstant.cxx | 61 ++--
compilerplugins/clang/test/stringconstant.cxx | 11
configmgr/qa/unit/test.cxx | 4
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/cpool/ZPoolCollection.cxx | 2
connectivity/source/drivers/calc/CTables.cxx | 2
connectivity/source/drivers/dbase/DDriver.cxx | 16 -
connectivity/source/drivers/dbase/DTables.cxx | 2
connectivity/source/drivers/file/FDriver.cxx | 32 +-
connectivity/source/drivers/flat/EDriver.cxx | 28 +-
connectivity/source/drivers/flat/ETables.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 20 -
connectivity/source/drivers/jdbc/JDriver.cxx | 68 ++---
connectivity/source/drivers/mysql/YDriver.cxx | 36 +-
connectivity/source/drivers/odbc/ODriver.cxx | 48 +--
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 14 -
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 18 -
connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx | 2
connectivity/source/drivers/postgresql/pq_statement.cxx | 18 -
connectivity/source/drivers/postgresql/pq_tools.cxx | 4
connectivity/source/parse/sqliterator.cxx | 6
connectivity/source/parse/sqlnode.cxx | 54 ++--
cppu/qa/cppumaker/test_cppumaker.cxx | 4
cui/source/customize/cfg.cxx | 8
cui/source/options/cfgchart.cxx | 2
cui/source/options/optgdlg.cxx | 10
cui/source/options/optpath.cxx | 2
cui/source/tabpages/macroass.cxx | 4
cui/source/tabpages/numpages.cxx | 3
dbaccess/source/filter/xml/dbloader2.cxx | 4
dbaccess/source/ui/app/AppControllerGen.cxx | 6
dbaccess/source/ui/browser/dbloader.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 10
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 12
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/admincontrols.cxx | 2
dbaccess/source/ui/dlg/dbadmin.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 2
dbaccess/source/ui/misc/RowSetDrop.cxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 6
dbaccess/source/ui/misc/UITools.cxx | 4
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 12
desktop/source/app/check_ext_deps.cxx | 4
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 4
desktop/source/lib/init.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2
drawinglayer/source/tools/converters.cxx | 6
editeng/source/misc/acorrcfg.cxx | 4
editeng/source/uno/unonrule.cxx | 28 +-
embeddedobj/source/commonembedding/visobj.cxx | 4
embeddedobj/source/general/docholder.cxx | 2
embeddedobj/source/msole/oleembed.cxx | 2
embeddedobj/source/msole/olevisual.cxx | 8
extensions/source/abpilot/admininvokationimpl.cxx | 6
extensions/source/abpilot/unodialogabp.cxx | 2
extensions/source/config/ldap/ldapuserprofilebe.cxx | 2
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/pcrunodialogs.cxx | 6
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
forms/source/misc/limitedformats.cxx | 4
forms/source/xforms/submission/replace.cxx | 4
fpicker/source/office/iodlg.cxx | 2
framework/inc/properties.h | 10
framework/source/dispatch/dispatchinformationprovider.cxx | 2
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 10
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwi/uielement/constitemcontainer.cxx | 6
framework/source/fwi/uielement/rootitemcontainer.cxx | 6
framework/source/helper/uiconfigelementwrapperbase.cxx | 16 -
framework/source/helper/uielementwrapperbase.cxx | 6
framework/source/services/sessionlistener.cxx | 4
framework/source/uifactory/uicontrollerfactory.cxx | 12
i18npool/source/calendar/calendar_gregorian.cxx | 2
i18npool/source/characterclassification/characterclassificationImpl.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
i18npool/source/indexentry/indexentrysupplier_default.cxx | 2
i18npool/source/localedata/localedata.cxx | 3
i18npool/source/textconversion/textconversion_ko.cxx | 4
include/svl/style.hxx | 2
javaunohelper/source/vm.cxx | 8
reportdesign/source/core/api/ReportDefinition.cxx | 4
reportdesign/source/filter/xml/xmlfilter.cxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 4
reportdesign/source/ui/misc/UITools.cxx | 2
reportdesign/source/ui/report/DesignView.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 4
reportdesign/source/ui/report/propbrw.cxx | 6
sc/qa/extras/sccellrangeobj.cxx | 4
sc/qa/extras/sctablesheetobj.cxx | 4
sc/qa/unit/helper/qahelper.cxx | 6
sc/qa/unit/subsequent_export-test.cxx | 2
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/qa/unit/ucalc_pivottable.cxx | 2
sc/source/core/data/docpool.cxx | 5
sc/source/core/data/documen2.cxx | 3
sc/source/core/data/documen5.cxx | 8
sc/source/core/tool/addincfg.cxx | 2
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/calcconfig.cxx | 4
sc/source/core/tool/defaultsoptions.cxx | 2
sc/source/core/tool/filtopt.cxx | 2
sc/source/core/tool/formulaopt.cxx | 2
sc/source/core/tool/inputopt.cxx | 2
sc/source/core/tool/printopt.cxx | 2
sc/source/filter/excel/xelink.cxx | 2
sc/source/filter/html/htmlpars.cxx | 4
sc/source/ui/app/msgpool.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 3
sc/source/ui/drawfunc/fuins2.cxx | 8
sc/source/ui/undo/undoutil.cxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 4
sc/source/ui/unoobj/appluno.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 12
sc/source/ui/unoobj/chartuno.cxx | 10
sc/source/ui/unoobj/dapiuno.cxx | 12
sc/source/ui/unoobj/datauno.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 10
sc/source/ui/unoobj/eventuno.cxx | 4
sc/source/ui/unoobj/fielduno.cxx | 4
sc/source/ui/unoobj/fmtuno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 12
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 2
sc/source/ui/vba/vbachart.cxx | 2
sc/source/ui/vba/vbachartobject.cxx | 4
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/view/tabvwshb.cxx | 2
scripting/source/basprov/basscript.cxx | 2
sd/qa/unit/sdmodeltestbase.hxx | 6
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/ppt/pptin.cxx | 4
sdext/source/minimizer/configurationaccess.cxx | 4
sdext/source/pdfimport/wrapper/wrapper.cxx | 6
sdext/source/presenter/PresenterAccessibility.cxx | 6
sdext/source/presenter/PresenterHelpView.cxx | 2
sdext/source/presenter/PresenterScreen.cxx | 6
sdext/source/presenter/PresenterSlideSorter.cxx | 2
sdext/source/presenter/PresenterTheme.cxx | 4
sdext/source/presenter/PresenterToolBar.cxx | 2
sdext/source/presenter/PresenterWindowManager.cxx | 4
sfx2/source/appl/imestatuswindow.cxx | 2
sfx2/source/appl/impldde.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 12
sfx2/source/doc/DocumentMetadataAccess.cxx | 4
sfx2/source/doc/docfile.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 4
sfx2/source/sidebar/ResourceManager.cxx | 12
slideshow/source/engine/animationnodes/basenode.cxx | 2
slideshow/source/engine/slide/targetpropertiescreator.cxx | 2
sot/source/sdstor/stgole.cxx | 4
starmath/source/cfgitem.cxx | 2
starmath/source/format.cxx | 8
starmath/source/node.cxx | 4
stoc/source/javavm/javavm.cxx | 8
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 6
svl/source/items/srchitem.cxx | 4
svl/source/misc/documentlockfile.cxx | 2
svl/source/misc/sharecontrolfile.cxx | 2
svl/source/passwordcontainer/passwordcontainer.cxx | 2
svl/source/passwordcontainer/syscreds.cxx | 3
svtools/source/config/apearcfg.cxx | 2
svtools/source/config/extcolorcfg.cxx | 2
svtools/source/config/fontsubstconfig.cxx | 2
svtools/source/config/helpopt.cxx | 2
svtools/source/config/menuoptions.cxx | 2
svtools/source/config/optionsdrawinglayer.cxx | 2
svtools/source/config/slidesorterbaropt.cxx | 2
svtools/source/config/toolpanelopt.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 2
svtools/source/misc/embedhlp.cxx | 2
svtools/source/uno/addrtempuno.cxx | 10
svx/source/dialog/imapwnd.cxx | 2
svx/source/form/fmPropBrw.cxx | 8
svx/source/form/fmshimp.cxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 4
svx/source/tbxctrls/extrusioncontrols.cxx | 8
svx/source/tbxctrls/fontworkgallery.cxx | 4
svx/source/tbxctrls/tbunocontroller.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 10
sw/inc/PostItMgr.hxx | 2
sw/qa/core/uwriter.cxx | 12
sw/qa/extras/mailmerge/mailmerge.cxx | 22 -
sw/qa/extras/uiwriter/uiwriter.cxx | 24 -
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/crsr/bookmrk.cxx | 2
sw/source/core/doc/number.cxx | 4
sw/source/core/ole/ndole.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2
sw/source/filter/basflt/fltini.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 6
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/filter/xml/xmlexp.cxx | 20 -
sw/source/filter/xml/xmlimp.cxx | 10
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/fldui/javaedit.cxx | 2
sw/source/uibase/app/applab.cxx | 3
sw/source/uibase/dbui/mailmergehelper.cxx | 2
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 4
sw/source/uibase/table/tablemgr.cxx | 8
sw/source/uibase/utlui/glbltree.cxx | 3
toolkit/source/awt/vclxprinter.cxx | 4
ucb/source/core/ucbcmds.cxx | 84 +++---
ucb/source/ucp/cmis/cmis_content.cxx | 68 ++---
ucb/source/ucp/cmis/cmis_repo_content.cxx | 18 -
ucb/source/ucp/ext/ucpext_content.cxx | 26 -
ucb/source/ucp/file/bc.cxx | 10
ucb/source/ucp/file/filglob.cxx | 8
ucb/source/ucp/file/filtask.cxx | 6
ucb/source/ucp/file/prov.cxx | 6
ucb/source/ucp/ftp/ftpcontent.cxx | 2
ucb/source/ucp/ftp/ftpcontentcaps.cxx | 33 +-
ucb/source/ucp/gio/gio_content.cxx | 44 +--
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 32 +-
ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx | 131 ++++------
ucb/source/ucp/package/pkgcontent.cxx | 44 +--
ucb/source/ucp/package/pkgcontentcaps.cxx | 97 +++----
ucb/source/ucp/tdoc/tdoc_content.cxx | 42 +--
ucb/source/ucp/tdoc/tdoc_contentcaps.cxx | 116 ++++----
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 50 +--
ucbhelper/source/provider/resultset.cxx | 4
unotools/source/config/cmdoptions.cxx | 2
unotools/source/config/compatibility.cxx | 2
unotools/source/config/configmgr.cxx | 6
unotools/source/config/dynamicmenuoptions.cxx | 2
unotools/source/config/extendedsecurityoptions.cxx | 2
unotools/source/config/fontoptions.cxx | 2
unotools/source/config/lingucfg.cxx | 2
unotools/source/config/misccfg.cxx | 2
unotools/source/config/moduleoptions.cxx | 2
unotools/source/config/printwarningoptions.cxx | 2
unotools/source/config/saveopt.cxx | 4
unotools/source/config/searchopt.cxx | 2
unotools/source/config/securityoptions.cxx | 2
unotools/source/config/syslocaleoptions.cxx | 2
vcl/qa/cppunit/BitmapTest.cxx | 4
vcl/source/filter/wmf/enhwmf.cxx | 2
vcl/source/font/PhysicalFontCollection.cxx | 4
vcl/source/gdi/configsettings.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 9
vcl/unx/generic/dtrans/config.cxx | 2
xmlhelp/source/treeview/tvfactory.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 14 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 10
xmloff/source/forms/layerexport.cxx | 5
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 3
267 files changed, 1118 insertions(+), 1152 deletions(-)
New commits:
commit 1c3e84d8192218befebcddae2ed9842d081dc6c7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jan 30 16:38:54 2017 +0200
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor
when calling constructors like this:
Foo(OUString("xxx"), 1)
Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36
Reviewed-on: https://gerrit.libreoffice.org/33698
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 7f90e16..baad838 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -192,7 +192,7 @@ SbxErrObject::getUnoErrObject()
SbxVariableRef const &
SbxErrObject::getErrObject()
{
- static SbxVariableRef pGlobErr = new SbxErrObject( OUString("Err"), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
+ static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
return pGlobErr;
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 66c1a94..168842b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -445,7 +445,7 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass )
}
else if( rClass.equalsIgnoreAsciiCase( "Collection" ) )
{
- return new BasicCollection( OUString("Collection"));
+ return new BasicCollection( "Collection" );
}
else if( rClass.equalsIgnoreAsciiCase( "FileSystemObject" ) )
{
@@ -915,7 +915,7 @@ SbModule* SbClassFactory::FindClass( const OUString& rClassName )
}
StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic )
- : SbxObject( OUString("StarBASIC") ), bDocBasic( bIsDocBasic )
+ : SbxObject("StarBASIC"), bDocBasic( bIsDocBasic )
{
SetParent( p );
pLibInfo = nullptr;
@@ -937,7 +937,7 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic )
GetSbData()->pUnoFac = new SbUnoFactory;
AddFactory( GetSbData()->pUnoFac );
}
- pRtl = new SbiStdObject(OUString(RTLNAME), this );
+ pRtl = new SbiStdObject(RTLNAME, this );
// Search via StarBasic is always global
SetFlag( SbxFlagBits::GlobalSearch );
pVBAGlobals = nullptr;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b857726..dd3ea51 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3051,7 +3051,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, bool
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
// Create a SbUnoObject out of it and return it
- SbUnoObjectRef xUnoObj = new SbUnoObject( OUString( "ProcessServiceManager" ), Any(xFactory) );
+ SbUnoObjectRef xUnoObj = new SbUnoObject( "ProcessServiceManager", Any(xFactory) );
refVar->PutObject( xUnoObj.get() );
}
@@ -3759,7 +3759,7 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName )
SbUnoSingleton::SbUnoSingleton( const OUString& aName_ )
: SbxObject( aName_ )
{
- SbxVariableRef xGetMethodRef = new SbxMethod( OUString( "get" ), SbxOBJECT );
+ SbxVariableRef xGetMethodRef = new SbxMethod( "get", SbxOBJECT );
QuickInsert( xGetMethodRef.get() );
}
@@ -4130,7 +4130,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite
Any aContextAny( comphelper::getProcessComponentContext() );
- SbUnoObjectRef xUnoObj = new SbUnoObject( OUString( "DefaultContext" ), aContextAny );
+ SbUnoObjectRef xUnoObj = new SbUnoObject( "DefaultContext", aContextAny );
refVar->PutObject( xUnoObj.get() );
}
@@ -4775,15 +4775,15 @@ void SbUnoStructRefObject::implCreateDbgProperties()
Property aProp;
// Id == -1: display the implemented interfaces corresponding the ClassProvider
- SbxVariableRef xVarRef = new SbUnoProperty( OUString(ID_DBG_SUPPORTEDINTERFACES), SbxSTRING, SbxSTRING, aProp, -1, false, false );
+ SbxVariableRef xVarRef = new SbUnoProperty( ID_DBG_SUPPORTEDINTERFACES, SbxSTRING, SbxSTRING, aProp, -1, false, false );
QuickInsert( xVarRef.get() );
// Id == -2: output the properties
- xVarRef = new SbUnoProperty( OUString(ID_DBG_PROPERTIES), SbxSTRING, SbxSTRING, aProp, -2, false, false );
+ xVarRef = new SbUnoProperty( ID_DBG_PROPERTIES, SbxSTRING, SbxSTRING, aProp, -2, false, false );
QuickInsert( xVarRef.get() );
// Id == -3: output the Methods
- xVarRef = new SbUnoProperty( OUString(ID_DBG_METHODS), SbxSTRING, SbxSTRING, aProp, -3, false, false );
+ xVarRef = new SbUnoProperty( ID_DBG_METHODS, SbxSTRING, SbxSTRING, aProp, -3, false, false );
QuickInsert( xVarRef.get() );
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index e4febca..139d154 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1924,7 +1924,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
}
else if( rItem.m_aObjClass.equalsIgnoreAsciiCase( pCollectionStr ) )
{
- BasicCollection* pNewCollection = new BasicCollection( OUString(pCollectionStr) );
+ BasicCollection* pNewCollection = new BasicCollection( pCollectionStr );
pNewCollection->SetName( rItem.m_aObjName );
pNewCollection->SetParent( rItem.m_pObjParent );
refVar->PutObject( pNewCollection );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 3635a47..8284a1a 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -108,7 +108,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite )
SbStdPicture::SbStdPicture() :
- SbxObject( OUString("Picture"))
+ SbxObject( "Picture" )
{
// Properties
SbxVariable* p = Make( "Type", SbxClassType::Property, SbxVARIANT );
@@ -212,7 +212,7 @@ void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite )
SbStdFont::SbStdFont()
- : SbxObject( OUString("Font") )
+ : SbxObject( "Font" )
, bBold(false)
, bItalic(false)
, bStrikeThrough(false)
@@ -370,7 +370,7 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool )
SbStdClipboard::SbStdClipboard() :
- SbxObject( OUString("Clipboard") )
+ SbxObject( "Clipboard" )
{
SbxVariable* p = Find( "Name", SbxClassType::Property );
assert(p && "No Name Property");
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index f727850..7604137 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -131,7 +131,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
Any propValue(
makeAny( beans::PropertyValue(
- OUString("nodepath"), -1,
+ "nodepath", -1,
makeAny( OUString("/org.openoffice.Office.Canvas") ),
beans::PropertyState_DIRECT_VALUE ) ) );
@@ -143,7 +143,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
propValue = makeAny(
beans::PropertyValue(
- OUString("nodepath"), -1,
+ "nodepath", -1,
makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
beans::PropertyState_DIRECT_VALUE ) );
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index b95c8da..3ae27a6 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -53,7 +53,7 @@ public:
};
CalcConfigItem::CalcConfigItem()
- : ConfigItem( OUString( "Office.Calc/Layout" ))
+ : ConfigItem( "Office.Calc/Layout" )
{
}
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 738c880..dadecb7 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -739,7 +739,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
//create data
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- OUString( "CellRangeRepresentation" ), -1,
+ "CellRangeRepresentation", -1,
uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
"HasCategories",
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index 8b00e84..32382461 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -152,6 +152,10 @@ private:
CallExpr const * expr, unsigned arg, FunctionDecl const * callee,
bool explicitFunctionalCastNotation);
+ void handleOUStringCtor(
+ Expr const * expr, Expr const * argExpr, FunctionDecl const * callee,
+ bool explicitFunctionalCastNotation);
+
void handleFunArgOstring(
CallExpr const * expr, unsigned arg, FunctionDecl const * callee);
@@ -1054,37 +1058,33 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
return true;
}
-
- // Now check for calls to one of our exception classes where an unnecessary OUString
- // constructor is used for the first parameter.
- if (isInUnoIncludeFile(expr->getConstructor()->getCanonicalDecl())) {
- return true;
- }
- if (!expr->getConstructor()->getParent()->getName().endswith("Exception")) {
- return true;
- }
- if (expr->getNumArgs() == 0) {
- return true;
- }
- MaterializeTemporaryExpr const * subExpr1 = dyn_cast<MaterializeTemporaryExpr>(expr->getArg(0));
- if (!subExpr1) {
- return true;
- }
- if (!loplugin::TypeCheck(subExpr1->getType()).Class("OUString").Namespace("rtl").GlobalNamespace()) {
+ std::string file(compiler.getSourceManager().getFilename(
+ compiler.getSourceManager().getSpellingLoc(expr->getLocStart())));
+ if (file == SRCDIR "/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx")
+ {
return true;
}
- ImplicitCastExpr const * subExpr2 = dyn_cast<ImplicitCastExpr>(subExpr1->GetTemporaryExpr());
- if (!subExpr2) {
+ if (isInUnoIncludeFile(expr->getLocStart())) {
return true;
}
- CXXFunctionalCastExpr const * subExpr3 = dyn_cast<CXXFunctionalCastExpr>(subExpr2->getSubExpr());
- if (!subExpr3) {
- return true;
+ auto consDecl = expr->getConstructor();
+ for (unsigned i = 0; i != consDecl->getNumParams(); ++i) {
+ auto t = consDecl->getParamDecl(i)->getType();
+ if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
+ .LvalueReference().Const().NotSubstTemplateTypeParmType()
+ .Class("OUString").Namespace("rtl").GlobalNamespace())
+ {
+ auto argExpr = expr->getArg(i);
+ if (argExpr && i <= consDecl->getNumParams())
+ {
+ if (!hasOverloads(consDecl, expr->getNumArgs()))
+ {
+ handleOUStringCtor(expr, argExpr, consDecl, true);
+ }
+ }
+ }
}
- report(DiagnosticsEngine::Warning,
- "no need to use an explicit OUString constructor here",
- subExpr3->getLocStart())
- << subExpr3->getSourceRange();
+
return true;
}
@@ -1592,7 +1592,14 @@ void StringConstant::handleOUStringCtor(
CallExpr const * expr, unsigned arg, FunctionDecl const * callee,
bool explicitFunctionalCastNotation)
{
- auto e0 = expr->getArg(arg)->IgnoreParenImpCasts();
+ handleOUStringCtor(expr, expr->getArg(arg), callee, explicitFunctionalCastNotation);
+}
+
+void StringConstant::handleOUStringCtor(
+ Expr const * expr, Expr const * argExpr, FunctionDecl const * callee,
+ bool explicitFunctionalCastNotation)
+{
+ auto e0 = argExpr->IgnoreParenImpCasts();
auto e1 = dyn_cast<CXXFunctionalCastExpr>(e0);
if (e1 == nullptr) {
if (explicitFunctionalCastNotation) {
diff --git a/compilerplugins/clang/test/stringconstant.cxx b/compilerplugins/clang/test/stringconstant.cxx
index 0fd8c3b..f2cf48c 100644
--- a/compilerplugins/clang/test/stringconstant.cxx
+++ b/compilerplugins/clang/test/stringconstant.cxx
@@ -14,6 +14,12 @@
#include "com/sun/star/uno/Reference.hxx"
#include "rtl/strbuf.hxx"
+extern void foo(OUString const &); // expected-error {{extern prototype in main file without definition}}
+
+struct Foo {
+ Foo(OUString const &, int) {}
+};
+
int main() {
char const s1[] = "foo";
char const * const s2 = "foo";
@@ -47,6 +53,11 @@ int main() {
sb.insert(0, "foo", std::strlen("foo")); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}}
sb.insert(0, s1, 3/*std::strlen(s1)*/); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}}
sb.insert(0, s2, 3/*std::strlen(s2)*/); // expected-error {{rewrite call of 'rtl::OStringBuffer::insert' with string constant and matching length arguments as call of 'rtl::OStringBuffer::insert', and turn the non-array string constant into an array [loplugin:stringconstant]}}
+
+ foo(OUString("xxx")); // expected-error {{in call of 'foo', replace 'OUString' constructed from a string literal directly with the string literal [loplugin:stringconstant}}
+ Foo aFoo(OUString("xxx"), 1); // expected-error {{in call of 'Foo::Foo', replace 'OUString' constructed from a string literal directly with the string literal}}
+ (void)aFoo;
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index cd4614a..682f99f 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -450,7 +450,7 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- OUString("nodepath"),
+ "nodepath",
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
@@ -463,7 +463,7 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- OUString("nodepath"),
+ "nodepath",
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess",
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1848289..ba73d0d 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -927,7 +927,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr
throw SQLException(
sMessage,
nullptr,
- OUString( "22018" ),
+ "22018",
22018,
Any()
);
@@ -953,7 +953,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
throw SQLException(
sMessage,
nullptr,
- OUString( "22001" ),
+ "22001",
22001,
Any()
);
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 1f2466c..ae8b81b 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -159,7 +159,7 @@ namespace param
sal_Int32 nProperties( aProperties.getLength() );
aProperties.realloc( nProperties + 1 );
aProperties[ nProperties ] = Property(
- OUString( "Value" ),
+ "Value",
PROPERTY_ID_VALUE,
::cppu::UnoType< Any >::get(),
PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index e9983a1..1f30e6b 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -321,7 +321,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
Sequence< Any > args(1);
args[0] = makeAny(
NamedValue(
- OUString("nodepath"),
+ "nodepath",
makeAny(_rPath)));
Reference< XInterface > xInterface(
_rxConfProvider->createInstanceWithArguments(
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 5eb8888..04d38c1 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
{
OCalcTable* pTable = new OCalcTable(this, static_cast<OCalcConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
- _rName,OUString("TABLE"));
+ _rName,"TABLE");
sdbcx::ObjectType xRet = pTable;
pTable->construct();
return xRet;
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 21ecbe0..6e920ab 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -85,24 +85,24 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("CharSet")
- ,OUString("CharSet of the database.")
+ "CharSet"
+ ,"CharSet of the database."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ShowDeleted")
- ,OUString("Display inactive records.")
+ "ShowDeleted"
+ ,"Display inactive records."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("EnableSQL92Check")
- ,OUString("Use SQL92 naming constraints.")
+ "EnableSQL92Check"
+ ,"Use SQL92 naming constraints."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index a2a5add..787226e 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
{
ODbaseTable* pRet = new ODbaseTable(this, static_cast<ODbaseConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
- _rName,OUString("TABLE"));
+ _rName,"TABLE");
sdbcx::ObjectType xRet = pRet;
pRet->construct();
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index a0a1427..ad77694 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -120,43 +120,43 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("CharSet")
- ,OUString("CharSet of the database.")
+ "CharSet"
+ ,"CharSet of the database."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("Extension")
- ,OUString("Extension of the file format.")
+ "Extension"
+ ,"Extension of the file format."
,false
- ,OUString(".*")
+ ,".*"
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ShowDeleted")
- ,OUString("Display inactive records.")
+ "ShowDeleted"
+ ,"Display inactive records."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("EnableSQL92Check")
- ,OUString("Use SQL92 naming constraints.")
+ "EnableSQL92Check"
+ ,"Use SQL92 naming constraints."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("UseRelativePath")
- ,OUString("Handle the connection url as relative path.")
+ "UseRelativePath"
+ ,"Handle the connection url as relative path."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("URL")
- ,OUString("The URL of the database document which is used to create an absolute path.")
+ "URL"
+ ,"The URL of the database document which is used to create an absolute path."
,false
,OUString()
,Sequence< OUString >())
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 1219f46..3eea391 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -88,38 +88,38 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("FieldDelimiter")
- ,OUString("Field separator.")
+ "FieldDelimiter"
+ ,"Field separator."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("HeaderLine")
- ,OUString("Text contains headers.")
+ "HeaderLine"
+ ,"Text contains headers."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("StringDelimiter")
- ,OUString("Text separator.")
+ "StringDelimiter"
+ ,"Text separator."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("DecimalDelimiter")
- ,OUString("Decimal separator.")
+ "DecimalDelimiter"
+ ,"Decimal separator."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ThousandDelimiter")
- ,OUString("Thousands separator.")
+ "ThousandDelimiter"
+ ,"Thousands separator."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ),
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index f0ce815..5c9782c 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName)
{
OFlatTable* pRet = new OFlatTable(this, static_cast<OFlatConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
- _rName,OUString("TABLE"));
+ _rName,"TABLE");
sdbcx::ObjectType xRet = pRet;
pRet->construct();
return xRet;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index ba542ff..abcd6d2 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -246,7 +246,7 @@ namespace connectivity
// security: permitted Java classes
NamedValue aPermittedClasses(
- OUString( "hsqldb.method_class_names" ),
+ "hsqldb.method_class_names",
makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) )
);
aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
@@ -410,24 +410,24 @@ namespace connectivity
return Sequence< DriverPropertyInfo >();
::std::vector< DriverPropertyInfo > aDriverInfo;
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("Storage")
- ,OUString("Defines the storage where the database will be stored.")
+ "Storage"
+ ,"Defines the storage where the database will be stored."
,true
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("URL")
- ,OUString("Defines the url of the data source.")
+ "URL"
+ ,"Defines the url of the data source."
,true
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("AutoRetrievingStatement")
- ,OUString("Defines the statement which will be executed to retrieve auto increment values.")
+ "AutoRetrievingStatement"
+ ,"Defines the statement which will be executed to retrieve auto increment values."
,false
- ,OUString("CALL IDENTITY()")
+ ,"CALL IDENTITY()"
,Sequence< OUString >())
);
return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
@@ -832,13 +832,13 @@ namespace connectivity
Sequence< Any > aArguments(2);
// the path to the node to open
aArguments[0] <<= PropertyValue(
- OUString("nodepath"), 0,
+ "nodepath", 0,
makeAny( OUString("/org.openoffice.Setup/L10N" ) ),
PropertyState_DIRECT_VALUE
);
// the depth: -1 means unlimited
aArguments[1] <<= PropertyValue(
- OUString("depth"), 0,
+ "depth", 0,
makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE
);
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index bb1d453..af83a5c 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -138,92 +138,92 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const
aBooleanValues[1] = "true";
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("JavaDriverClass")
- ,OUString("The JDBC driver class name.")
+ "JavaDriverClass"
+ ,"The JDBC driver class name."
,true
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("JavaDriverClassPath")
- ,OUString("The class path where to look for the JDBC driver.")
+ "JavaDriverClassPath"
+ ,"The class path where to look for the JDBC driver."
,true
- ,OUString( "" )
+ , ""
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("SystemProperties")
- ,OUString("Additional properties to set at java.lang.System before loading the driver.")
+ "SystemProperties"
+ ,"Additional properties to set at java.lang.System before loading the driver."
,true
- ,OUString( "" )
+ , ""
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ParameterNameSubstitution")
- ,OUString("Change named parameters with '?'.")
+ "ParameterNameSubstitution"
+ ,"Change named parameters with '?'."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("IgnoreDriverPrivileges")
- ,OUString("Ignore the privileges from the database driver.")
+ "IgnoreDriverPrivileges"
+ ,"Ignore the privileges from the database driver."
,false
- ,OUString( "false" )
+ , "false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("IsAutoRetrievingEnabled")
- ,OUString("Retrieve generated values.")
+ "IsAutoRetrievingEnabled"
+ ,"Retrieve generated values."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("AutoRetrievingStatement")
- ,OUString("Auto-increment statement.")
+ "AutoRetrievingStatement"
+ ,"Auto-increment statement."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("GenerateASBeforeCorrelationName")
- ,OUString("Generate AS before table correlation names.")
+ "GenerateASBeforeCorrelationName"
+ ,"Generate AS before table correlation names."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("IgnoreCurrency")
- ,OUString("Ignore the currency field from the ResultsetMetaData.")
+ "IgnoreCurrency"
+ ,"Ignore the currency field from the ResultsetMetaData."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("EscapeDateTime")
- ,OUString("Escape date time format.")
+ "EscapeDateTime"
+ ,"Escape date time format."
,false
- ,OUString( "true" )
+ ,"true"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("TypeInfoSettings")
- ,OUString("Defines how the type info of the database metadata should be manipulated.")
+ "TypeInfoSettings"
+ ,"Defines how the type info of the database metadata should be manipulated."
,false
,OUString( )
,Sequence< OUString > ())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ImplicitCatalogRestriction")
- ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.")
+ "ImplicitCatalogRestriction"
+ ,"The catalog which should be used in getTables calls, when the caller passed NULL."
,false
,OUString( )
,Sequence< OUString > ())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ImplicitSchemaRestriction")
- ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.")
+ "ImplicitSchemaRestriction"
+ ,"The schema which should be used in getTables calls, when the caller passed NULL."
,false
,OUString( )
,Sequence< OUString > ())
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 491dd7a..128bb6d 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -170,12 +170,12 @@ namespace connectivity
if ( _eType == T_DRIVERTYPE::Odbc )
{
aProps.push_back( PropertyValue(
- OUString("Silent")
+ "Silent"
,0
,makeAny(true)
,PropertyState_DIRECT_VALUE) );
aProps.push_back( PropertyValue(
- OUString("PreventGetVersionColumns")
+ "PreventGetVersionColumns"
,0
,makeAny(true)
,PropertyState_DIRECT_VALUE) );
@@ -185,7 +185,7 @@ namespace connectivity
if (!jdc)
{
aProps.push_back( PropertyValue(
- OUString("JavaDriverClass")
+ "JavaDriverClass"
,0
,makeAny(OUString("com.mysql.jdbc.Driver"))
,PropertyState_DIRECT_VALUE) );
@@ -194,23 +194,23 @@ namespace connectivity
else
{
aProps.push_back( PropertyValue(
- OUString("PublicConnectionURL")
+ "PublicConnectionURL"
,0
,makeAny(_sUrl)
,PropertyState_DIRECT_VALUE) );
}
aProps.push_back( PropertyValue(
- OUString("IsAutoRetrievingEnabled")
+ "IsAutoRetrievingEnabled"
,0
,makeAny(true)
,PropertyState_DIRECT_VALUE) );
aProps.push_back( PropertyValue(
- OUString("AutoRetrievingStatement")
+ "AutoRetrievingStatement"
,0
,makeAny(OUString("SELECT LAST_INSERT_ID()"))
,PropertyState_DIRECT_VALUE) );
aProps.push_back( PropertyValue(
- OUString("ParameterNameSubstitution")
+ "ParameterNameSubstitution"
,0
,makeAny(true)
,PropertyState_DIRECT_VALUE) );
@@ -335,25 +335,25 @@ namespace connectivity
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("CharSet")
- ,OUString("CharSet of the database.")
+ "CharSet"
+ ,"CharSet of the database."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("SuppressVersionColumns")
- ,OUString("Display version columns (when available).")
+ "SuppressVersionColumns"
+ ,"Display version columns (when available)."
,false
- ,OUString("0")
+ ,"0"
,aBoolean)
);
const T_DRIVERTYPE eType = lcl_getDriverType( url );
if ( eType == T_DRIVERTYPE::Jdbc )
{
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("JavaDriverClass")
- ,OUString("The JDBC driver class name.")
+ "JavaDriverClass"
+ ,"The JDBC driver class name."
,true
,getJavaDriverClass(info)
,Sequence< OUString >())
@@ -362,15 +362,15 @@ namespace connectivity
else if ( eType == T_DRIVERTYPE::Native )
{
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("LocalSocket")
- ,OUString("The file path of a socket to connect to a local MySQL server.")
+ "LocalSocket"
+ ,"The file path of a socket to connect to a local MySQL server."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("NamedPipe")
- ,OUString("The name of a pipe to connect to a local MySQL server.")
+ "NamedPipe"
+ ,"The name of a pipe to connect to a local MySQL server."
,false
,OUString()
,Sequence< OUString >())
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index c22db08..0a166e6 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -124,66 +124,66 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr
aBooleanValues[1] = "true";
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("CharSet")
- ,OUString("CharSet of the database.")
+ "CharSet"
+ ,"CharSet of the database."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("UseCatalog")
- ,OUString("Use catalog for file-based databases.")
+ "UseCatalog"
+ ,"Use catalog for file-based databases."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("SystemDriverSettings")
- ,OUString("Driver settings.")
+ "SystemDriverSettings"
+ ,"Driver settings."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("ParameterNameSubstitution")
- ,OUString("Change named parameters with '?'.")
+ "ParameterNameSubstitution"
+ ,"Change named parameters with '?'."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("IgnoreDriverPrivileges")
- ,OUString("Ignore the privileges from the database driver.")
+ "IgnoreDriverPrivileges"
+ ,"Ignore the privileges from the database driver."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("IsAutoRetrievingEnabled")
- ,OUString("Retrieve generated values.")
+ "IsAutoRetrievingEnabled"
+ ,"Retrieve generated values."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("AutoRetrievingStatement")
- ,OUString("Auto-increment statement.")
+ "AutoRetrievingStatement"
+ ,"Auto-increment statement."
,false
,OUString()
,Sequence< OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("GenerateASBeforeCorrelationName")
- ,OUString("Generate AS before table correlation names.")
+ "GenerateASBeforeCorrelationName"
+ ,"Generate AS before table correlation names."
,false
- ,OUString( "false" )
+ ,"false"
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- OUString("EscapeDateTime")
- ,OUString("Escape date time format.")
+ "EscapeDateTime"
+ ,"Escape date time format."
,false
- ,OUString( "true" )
+ ,"true"
,aBooleanValues)
);
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 5336ef2..19e0309 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -95,25 +95,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper()
// Should really share!
// At least use for the handles the #define'd values in .hxx file...
Property(
- OUString("CursorName"), 0,
+ "CursorName", 0,
::cppu::UnoType<OUString>::get() , 0 ),
Property(
- OUString("EscapeProcessing"), 1,
+ "EscapeProcessing", 1,
cppu::UnoType<bool>::get() , 0 ),
Property(
- OUString("FetchDirection"), 2,
+ "FetchDirection", 2,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("FetchSize"), 3,
+ "FetchSize", 3,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("IsBookmarkable"), 4,
+ "IsBookmarkable", 4,
cppu::UnoType<bool>::get() , 0 ),
Property(
- OUString("ResultSetConcurrency"), 5,
+ "ResultSetConcurrency", 5,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("ResultSetType"), 6,
+ "ResultSetType", 6,
::cppu::UnoType<sal_Int32>::get() , 0 )
};
static_assert( SAL_N_ELEMENTS(aTable) == BASERESULTSET_SIZE, "wrong number of elements" );
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 5633450..fac27fd 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -540,7 +540,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
buf.append( errorMessage );
// HY092 is "Invalid attribute/option identifier."
// Just the most likely error; the error might be HY024 "Invalid attribute value".
- throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() );
+ throw SQLException( buf.makeStringAndClear(), *this, "HY092", 5, Any() );
}
for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != nullptr; ++opt)
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index ee75cde..1ec3b80 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -98,31 +98,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper()
static Property aTable[] =
{
Property(
- OUString("CursorName"), 0,
+ "CursorName", 0,
::cppu::UnoType<OUString>::get() , 0 ),
Property(
- OUString("EscapeProcessing"), 1,
+ "EscapeProcessing", 1,
cppu::UnoType<bool>::get() , 0 ),
Property(
- OUString("FetchDirection"), 2,
+ "FetchDirection", 2,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("FetchSize"), 3,
+ "FetchSize", 3,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("MaxFieldSize"), 4,
+ "MaxFieldSize", 4,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("MaxRows"), 5,
+ "MaxRows", 5,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("QueryTimeOut"), 6,
+ "QueryTimeOut", 6,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("ResultSetConcurrency"), 7,
+ "ResultSetConcurrency", 7,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("ResultSetType"), 8,
+ "ResultSetType", 8,
::cppu::UnoType<sal_Int32>::get() , 0 )
};
static_assert( SAL_N_ELEMENTS(aTable) == PREPARED_STATEMENT_SIZE, "wrong number of elements" );
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
index 0a0b06b..5fb50e7 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
@@ -97,7 +97,7 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( )
// I did not find "IM001" in a specific standard,
// but it seems to be used by other systems (such as ODBC)
// and some parts of LibreOffice special-case it.
- OUString( "IM001" ), 1, Any() );
+ "IM001", 1, Any() );
}
return m_meta;
}
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 26910e3..51a3805 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -116,31 +116,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper()
static Property aTable[] =
{
Property(
- OUString("CursorName"), 0,
+ "CursorName", 0,
::cppu::UnoType<OUString>::get() , 0 ),
Property(
- OUString("EscapeProcessing"), 1,
+ "EscapeProcessing", 1,
cppu::UnoType<bool>::get() , 0 ),
Property(
- OUString("FetchDirection"), 2,
+ "FetchDirection", 2,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("FetchSize"), 3,
+ "FetchSize", 3,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("MaxFieldSize"), 4,
+ "MaxFieldSize", 4,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("MaxRows"), 5,
+ "MaxRows", 5,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("QueryTimeOut"), 6,
+ "QueryTimeOut", 6,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("ResultSetConcurrency"), 7,
+ "ResultSetConcurrency", 7,
::cppu::UnoType<sal_Int32>::get() , 0 ),
Property(
- OUString("ResultSetType"), 8,
+ "ResultSetType", 8,
::cppu::UnoType<sal_Int32>::get() , 0 )
};
static_assert( SAL_N_ELEMENTS(aTable) == STATEMENT_SIZE, "wrong number of elements" );
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index efecdac..48728f5 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -120,7 +120,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect
// We have no good XInterface Reference to pass here, so just give NULL
throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding),
nullptr,
- OUString("22018"),
+ "22018",
-1,
Any());
}
@@ -166,7 +166,7 @@ static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString
// Implementation-defined SQLACCESS error
throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding),
nullptr,
- OUString("22018"),
+ "22018",
-1,
Any());
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 8e88055..18e5324 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1597,8 +1597,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
nullptr,
false,
rTableName,
- OUString("Table"),
- OUString("New Created Table"),
+ "Table",
+ "New Created Table",
rSchemaName,
rCatalogName
);
@@ -1704,7 +1704,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
// did not find a column with this name in any of the tables
OParseColumn* pColumn = new OParseColumn(
aNewColName,
- OUString("VARCHAR"),
+ "VARCHAR",
// TODO: does this match with _nType?
// Or should be fill this from the getTypeInfo of the connection?
OUString(),
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c588e2d..1c237ad 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1033,10 +1033,10 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType)
{
OUString aEmptyString;
OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::set_fct_spec));
- pNewNode->append(new OSQLInternalNode(OUString("{"), SQLNodeType::Punctuation));
+ pNewNode->append(new OSQLInternalNode("{", SQLNodeType::Punctuation));
OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec));
pNewNode->append(pDateNode);
- pNewNode->append(new OSQLInternalNode(OUString("}"), SQLNodeType::Punctuation));
+ pNewNode->append(new OSQLInternalNode("}", SQLNodeType::Punctuation));
switch (nType)
{
@@ -1493,7 +1493,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
OSQLParseNode* pChildNode = _pNode->getChild(i);
if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1)
{
- OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQLNodeType::Punctuation,0);
+ OSQLParseNode* pNewNode = new OSQLParseNode("?" ,SQLNodeType::Punctuation,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
sal_Int32 nChildCount = pChildNode->count();
for(sal_Int32 j=1;j < nChildCount;++j)
@@ -1754,7 +1754,7 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString
{
OSQLParseNode * pCol = removeAt((sal_uInt32)0);
append(new OSQLParseNode(rTableAlias,SQLNodeType::Name));
- append(new OSQLParseNode(OUString("."),SQLNodeType::Punctuation));
+ append(new OSQLParseNode(".",SQLNodeType::Punctuation));
append(pCol);
}
else
@@ -1780,7 +1780,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
{
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term));
pNewNode->append(pLeftLeaf);
- pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND));
+ pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND));
pNewNode->append(pRightLeaf);
return pNewNode;
}
@@ -1789,7 +1789,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
{
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition));
pNewNode->append(pLeftLeaf);
- pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR));
+ pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR));
pNewNode->append(pRightLeaf);
return pNewNode;
}
@@ -1889,7 +1889,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
{
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
- pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND));
+ pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
replaceAndReset(pSearchCondition,pNewNode);
@@ -1909,7 +1909,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
{
OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
- pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR));
+ pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
replaceAndReset(pSearchCondition,pNewNode);
@@ -1947,7 +1947,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
OSQLParseNode* pNot = pComparison->getChild(1);
OSQLParseNode* pNotNot = nullptr;
if(pNot->isRule()) // no NOT token (empty rule)
- pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT);
+ pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT);
else
{
assert(SQL_ISTOKEN(pNot,NOT));
@@ -1965,22 +1965,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
case SQLNodeType::Equal:
assert(pComparison->getNodeType() == SQLNodeType::Equal &&
"OSQLParseNode::negateSearchCondition: unexpected node type!");
- pNewComparison = new OSQLParseNode(OUString("<>"),SQLNodeType::NotEqual,SQL_NOTEQUAL);
+ pNewComparison = new OSQLParseNode("<>",SQLNodeType::NotEqual,SQL_NOTEQUAL);
break;
case SQLNodeType::Less:
- pNewComparison = new OSQLParseNode(OUString(">="),SQLNodeType::GreatEq,SQL_GREATEQ);
+ pNewComparison = new OSQLParseNode(">=",SQLNodeType::GreatEq,SQL_GREATEQ);
break;
case SQLNodeType::Great:
- pNewComparison = new OSQLParseNode(OUString("<="),SQLNodeType::LessEq,SQL_LESSEQ);
+ pNewComparison = new OSQLParseNode("<=",SQLNodeType::LessEq,SQL_LESSEQ);
break;
case SQLNodeType::LessEq:
- pNewComparison = new OSQLParseNode(OUString(">"),SQLNodeType::Great,SQL_GREAT);
+ pNewComparison = new OSQLParseNode(">",SQLNodeType::Great,SQL_GREAT);
break;
case SQLNodeType::GreatEq:
- pNewComparison = new OSQLParseNode(OUString("<"),SQLNodeType::Less,SQL_LESS);
+ pNewComparison = new OSQLParseNode("<",SQLNodeType::Less,SQL_LESS);
break;
case SQLNodeType::NotEqual:
- pNewComparison = new OSQLParseNode(OUString("="),SQLNodeType::Equal,SQL_EQUAL);
+ pNewComparison = new OSQLParseNode("=",SQLNodeType::Equal,SQL_EQUAL);
break;
}
pSearchCondition->replace(pComparison, pNewComparison);
@@ -2000,7 +2000,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
OSQLParseNode* pNot = pPart2->getChild(nNotPos);
OSQLParseNode* pNotNot = nullptr;
if(pNot->isRule()) // no NOT token (empty rule)
- pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT);
+ pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT);
else
{
assert(SQL_ISTOKEN(pNot,NOT));
@@ -2014,7 +2014,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 );
OSQLParseNode* pNotNot = nullptr;
if(pNot->isRule())
- pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT);
+ pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT);
else
pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not));
pSearchCondition->getChild( 1 )->replace(pNot, pNotNot);
@@ -2104,9 +2104,9 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC);
pNewNode = MakeORNode(p1stAnd,p2ndAnd);
OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNode->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation));
+ pNode->append(new OSQLParseNode("(",SQLNodeType::Punctuation));
pNode->append(pNewNode);
- pNode->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation));
+ pNode->append(new OSQLParseNode(")",SQLNodeType::Punctuation));
OSQLParseNode::eraseBraces(p1stAnd);
OSQLParseNode::eraseBraces(p2ndAnd);
replaceAndReset(pSearchCondition,pNode);
@@ -2183,9 +2183,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2200,9 +2200,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2217,9 +2217,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2234,9 +2234,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation));
+ pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index c481b77..580cb0b 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -506,7 +506,7 @@ void Test::testExceptions() {
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
- rtl::OUString("abc"), nullptr, 1,
+ "abc", nullptr, 1,
css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
@@ -516,7 +516,7 @@ void Test::testExceptions() {
e13 = e11;
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
- rtl::OUString("abc"), nullptr, 1,
+ "abc", nullptr, 1,
css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e10ecd7..0c05e23 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1028,9 +1028,7 @@ MenuSaveInData::GetEntries()
{
if ( pRootEntry == nullptr )
{
- pRootEntry = new SvxConfigEntry(
- OUString("MainMenus"),
- OUString(), true);
+ pRootEntry = new SvxConfigEntry( "MainMenus", OUString(), true);
if ( m_xMenuSettings.is() )
{
@@ -3880,9 +3878,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
if ( pRootEntry == nullptr )
{
- pRootEntry.reset( new SvxConfigEntry(
- OUString("MainToolbars"),
- OUString(), true) );
+ pRootEntry.reset( new SvxConfigEntry( "MainToolbars", OUString(), true) );
uno::Sequence< uno::Sequence < beans::PropertyValue > > info =
GetConfigManager()->getUIElementsInfo(
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 474a740..662ce50 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -174,7 +174,7 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
SvxChartOptions::SvxChartOptions() :
- ::utl::ConfigItem( OUString("Office.Chart") ),
+ ::utl::ConfigItem( "Office.Chart" ),
mbIsInitialized( false )
{
maPropertyNames.realloc( 1 );
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f8244f5..3e14eea 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -469,7 +469,7 @@ CanvasSettings::CanvasSettings() :
Any propValue(
makeAny( NamedValue(
- OUString("nodepath"),
+ "nodepath",
makeAny( OUString("/org.openoffice.Office.Canvas") ) ) ) );
mxForceFlagNameAccess.set(
@@ -480,7 +480,7 @@ CanvasSettings::CanvasSettings() :
propValue = makeAny(
NamedValue(
- OUString("nodepath"),
+ "nodepath",
makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) );
Reference<XNameAccess> xNameAccess(
@@ -1170,7 +1170,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
Reference< XNameAccess > theNameAccess;
// find out which locales are currently installed and add them to the listbox
- theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sInstalledLocalesPath))));
+ theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sInstalledLocalesPath))));
theNameAccess.set(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
seqInstalledLanguages = theNameAccess->getElementNames();
@@ -1189,7 +1189,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
// find out whether the user has a specific locale specified
Sequence< Any > theArgs2(1);
- theArgs2[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sUserLocalePath))));
+ theArgs2[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath))));
theNameAccess.set(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW );
if (theNameAccess->hasByName(sUserLocaleKey))
@@ -1370,7 +1370,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
css::configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext()));
Sequence< Any > theArgs(1);
- theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sUserLocalePath))));
+ theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath))));
Reference< XPropertySet >xProp(
theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW );
if ( !m_sUserLocaleValue.equals(aLangString))
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index a9bfaed..eaf355b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -70,7 +70,7 @@ using namespace svx;
#define POSTFIX_USER "_user"
#define POSTFIX_WRITABLE "_writable"
#define VAR_ONE "%1"
-#define IODLG_CONFIGNAME OUString("FilePicker_Save")
+#define IODLG_CONFIGNAME "FilePicker_Save"
// struct OptPath_Impl ---------------------------------------------------
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e2f2411..22b2453 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -342,13 +342,13 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
if( sScriptURI.startsWith( "vnd.sun.star.script:" ) )
{
aTbl.Insert(
- nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) );
+ nEvent, SvxMacro( sScriptURI, SVX_MACRO_LANGUAGE_SF ) );
}
else
{
OSL_ENSURE( false, "SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" );
aTbl.Insert(
- nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
+ nEvent, SvxMacro( sScriptURI, SVX_MACRO_LANGUAGE_STARBASIC ) );
}
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a365cf6..df6aad6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -156,8 +156,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
static vcl::Font& lcl_GetDefaultBulletFont()
{
static bool bInit = false;
- static vcl::Font aDefBulletFont( OUString("StarSymbol"),
- OUString(), Size( 0, 14 ) );
+ static vcl::Font aDefBulletFont( "StarSymbol", OUString(), Size( 0, 14 ) );
if(!bInit)
{
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 4a53e83..a101053 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -340,13 +340,13 @@ bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _rxMod
{
Sequence< Any > aWizardArgs(2);
aWizardArgs[0] <<= PropertyValue(
- OUString("ParentWindow"),
+ "ParentWindow",
0,
makeAny( lcl_getTopMostWindow( m_aContext ) ),
PropertyState_DIRECT_VALUE);
aWizardArgs[1] <<= PropertyValue(
- OUString("InitialSelection"),
+ "InitialSelection",
0,
makeAny( _rxModel ),
PropertyState_DIRECT_VALUE);
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 027b7eb..7220235 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -119,7 +119,7 @@ void OApplicationController::convertToView(const OUString& _sName)
::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) );
Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
if ( !xView.is() )
- throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this,OUString( "S1000" ) ,0,Any());
+ throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any());
getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
}
}
@@ -175,7 +175,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName )
xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent());
}
// the parent window
- aArgs[nArgPos++] <<= PropertyValue( OUString("ParentWindow"),
+ aArgs[nArgPos++] <<= PropertyValue( "ParentWindow",
0,
makeAny(xWindow),
PropertyState_DIRECT_VALUE);
@@ -187,7 +187,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName )
if ( !sInitialSelection.isEmpty() )
{
aArgs[ nArgPos++ ] <<= PropertyValue(
- OUString( "InitialSelection" ), 0,
+ "InitialSelection", 0,
makeAny( sInitialSelection ), PropertyState_DIRECT_VALUE );
}
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 3f0769f..7415e3a 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -254,7 +254,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
try
{
Reference<XInitialization > xIni(xController,UNO_QUERY);
- PropertyValue aFrame(OUString("Frame"),0,makeAny(rFrame),PropertyState_DIRECT_VALUE);
+ PropertyValue aFrame("Frame",0,makeAny(rFrame),PropertyState_DIRECT_VALUE);
Sequence< Any > aInitArgs(m_aArgs.getLength()+1);
Any* pBegin = aInitArgs.getArray();
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index f13aee4..2ab8bf6 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -695,13 +695,13 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
case DataType::BOOLEAN:
{
aCurrentModelType = "CheckBox";
- aInitialValues.push_back( NamedValue( OUString( "VisualEffect" ), makeAny( VisualEffect::FLAT ) ) );
+ aInitialValues.push_back( NamedValue( "VisualEffect", makeAny( VisualEffect::FLAT ) ) );
sDefaultProperty = PROPERTY_DEFAULTSTATE;
sal_Int32 nNullable = ColumnValue::NULLABLE_UNKNOWN;
OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>= nNullable );
aInitialValues.push_back( NamedValue(
- OUString( "TriState" ),
+ "TriState",
makeAny( ColumnValue::NO_NULLS != nNullable )
) );
if ( ColumnValue::NO_NULLS == nNullable )
@@ -711,7 +711,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
case DataType::LONGVARCHAR:
case DataType::CLOB:
- aInitialValues.push_back( NamedValue( OUString( "MultiLine" ), makeAny( true ) ) );
+ aInitialValues.push_back( NamedValue( "MultiLine", makeAny( true ) ) );
SAL_FALLTHROUGH;
case DataType::BINARY:
case DataType::VARBINARY:
@@ -729,8 +729,8 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT;
if ( xSupplier.is() )
- aInitialValues.push_back( NamedValue( OUString("FormatsSupplier"), makeAny( xSupplier ) ) );
- aInitialValues.push_back( NamedValue( OUString("TreatAsNumber"), makeAny( bFormattedIsNumeric ) ) );
+ aInitialValues.push_back( NamedValue( "FormatsSupplier", makeAny( xSupplier ) ) );
+ aInitialValues.push_back( NamedValue( "TreatAsNumber", makeAny( bFormattedIsNumeric ) ) );
aCopyProperties.push_back( static_cast<const OUString&>(PROPERTY_FORMATKEY) );
break;
}
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2490f0e..357b7e2 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -224,7 +224,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
const SfxStringItem* pUser = m_pItemSetHelper->getOutputSet()->GetItem<SfxStringItem>(DSID_USER);
if (pUser && pUser->GetValue().getLength())
aReturn.push_back(
- PropertyValue( OUString("user"), 0,
+ PropertyValue( "user", 0,
makeAny(OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE));
// check if the connection type requires a password
@@ -310,7 +310,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
if (!sPassword.isEmpty())
aReturn.push_back(
- PropertyValue( OUString("password"), 0,
+ PropertyValue( "password", 0,
makeAny(OUString(sPassword)), PropertyState_DIRECT_VALUE));
}
@@ -396,8 +396,8 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
catch (const Exception& e)
{
// wrap the exception into an SQLException
- SQLException aSQLWrapper(e.Message, getORB(), OUString("S1000"), 0, Any());
- throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, makeAny(aSQLWrapper));
+ SQLException aSQLWrapper(e.Message, getORB(), "S1000", 0, Any());
+ throw SQLException(sCurrentActionError, getORB(), "S1000", 0, makeAny(aSQLWrapper));
}
Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL);
@@ -406,7 +406,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER);
sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL);
// will be caught and translated into an SQLContext exception
- throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, Any());
+ throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any());
}
return xDriver;
}
@@ -807,7 +807,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
// here we have a special entry for types from oracle
if ( aTypeSettings.getLength() )
{
- aRelevantSettings.insert(PropertyValue(OUString("TypeInfoSettings"), 0, makeAny(aTypeSettings), PropertyState_DIRECT_VALUE));
+ aRelevantSettings.insert(PropertyValue("TypeInfoSettings", 0, makeAny(aTypeSettings), PropertyState_DIRECT_VALUE));
}
// check which values are still left ('cause they were not present in the original sequence, but are to be set)
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index f4224c7..47d9f13 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -102,7 +102,7 @@ namespace dbaui
if ( !aMetaData.supportsUserAdministration( getORB() ) )
{
OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE));
- throw SQLException(sError,nullptr,OUString("S1000") ,0,Any());
+ throw SQLException(sError,nullptr, "S1000" ,0,Any());
}
}
catch(const SQLException&)
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 46e6e45..6fa3103 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -156,7 +156,7 @@ namespace dbaui
m_aControlDependencies.enableOnRadioCheck( *m_pNamedPipeRadio, *m_pNamedPipe );
m_aControlDependencies.addController( std::shared_ptr<svt::DialogController>(
- new TextResetOperatorController( *m_pHostName, OUString("localhost") )
+ new TextResetOperatorController( *m_pHostName, "localhost" )
) );
// sockets are available on Unix systems only, named pipes only on Windows
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index f840c18..8a7d487 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -435,7 +435,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
};
OSL_ENSURE(SAL_N_ELEMENTS(aItemInfos) == DSID_LAST_ITEM_ID,"Invalid Ids!");
- _rpPool = new SfxItemPool(OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
+ _rpPool = new SfxItemPool("DSAItemPool", DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
aItemInfos, _rpDefaults);
_rpPool->FreezeIdRanges();
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 144e86d..cdd0bc2 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -717,7 +717,7 @@ namespace dbaui
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- FileDialogFlags::NONE, OUString("sdatabase") );
+ FileDialogFlags::NONE, "sdatabase" );
std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index b2aac31..e006693 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -62,7 +62,7 @@ void ORowSetImportExport::initialize()
m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData();
if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() )
- throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,OUString("S1000") ,0,Any());
+ throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any());
sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount();
m_aColumnMapping.reserve(nCount);
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index d7b3864..0b75d81 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -205,7 +205,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId
aTrans.bHtml = SotClipboardFormatId::HTML == _nFormatId;
aTrans.sDefaultTableName = GetTableNameForAppend();
if ( !bOk || !copyTagTable(aTrans,false,_xConnection) )
- m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any()));
+ m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
}
catch(const SQLException&)
{
@@ -217,7 +217,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId
}
}
else
- m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any()));
+ m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
}
void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData
@@ -314,7 +314,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc
else if ( !_rDesc.bError )
pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection);
else
- m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any()));
+ m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 4c95c57..987a4ea 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -818,7 +818,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO)
};
- SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, &pDefaults);
+ SfxItemPool* pPool = new SfxItemPool("GridBrowserProperties", SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, &pDefaults);
pPool->SetDefaultMetric( MapUnit::MapTwip ); // ripped, don't understand why
pPool->FreezeIdRanges(); // the same
@@ -1445,7 +1445,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo
{
OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS));
sError = sError.replaceFirst("#",sNewName);
- throw SQLException(sError,nullptr,OUString("S1000") ,0,Any());
+ throw SQLException(sError,nullptr,"S1000",0,Any());
}
try
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index d0b1943..dac5005 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -90,7 +90,7 @@ LimitBoxController::LimitBoxController(
const uno::Reference< uno::XComponentContext >& rxContext ) :
svt::ToolboxController( rxContext,
uno::Reference< frame::XFrame >(),
- OUString( ".uno:DBLimit" ) ),
+ ".uno:DBLimit" ),
m_pLimitBox( nullptr )
{
}
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 7bbd6a7..7f6c4a6 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -159,42 +159,42 @@ namespace dbaui
aProps.realloc( nProp + 6 );
aProps[ nProp++ ] = Property(
- OUString( "HeaderLine" ),
+ "HeaderLine",
PROPERTY_ID_HEADER_LINE,
::cppu::UnoType< sal_Bool >::get(),
PropertyAttribute::TRANSIENT
);
aProps[ nProp++ ] = Property(
- OUString( "FieldDelimiter" ),
+ "FieldDelimiter",
PROPERTY_ID_FIELD_DELIMITER,
::cppu::UnoType< OUString >::get(),
PropertyAttribute::TRANSIENT
);
aProps[ nProp++ ] = Property(
- OUString( "StringDelimiter" ),
+ "StringDelimiter",
PROPERTY_ID_STRING_DELIMITER,
::cppu::UnoType< OUString >::get(),
PropertyAttribute::TRANSIENT
);
aProps[ nProp++ ] = Property(
- OUString( "DecimalDelimiter" ),
+ "DecimalDelimiter",
PROPERTY_ID_DECIMAL_DELIMITER,
::cppu::UnoType< OUString >::get(),
PropertyAttribute::TRANSIENT
);
aProps[ nProp++ ] = Property(
- OUString( "ThousandDelimiter" ),
+ "ThousandDelimiter",
PROPERTY_ID_THOUSAND_DELIMITER,
::cppu::UnoType< OUString >::get(),
PropertyAttribute::TRANSIENT
);
aProps[ nProp++ ] = Property(
- OUString( "CharSet" ),
+ "CharSet",
PROPERTY_ID_ENCODING,
::cppu::UnoType< OUString >::get(),
PropertyAttribute::TRANSIENT
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index f7798d8..3c18b93 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -320,7 +320,7 @@ static void impl_setNeedsCompatCheck()
comphelper::getProcessComponentContext() ) );
Sequence< Any > theArgs(1);
- beans::NamedValue v( OUString("nodepath"),
+ beans::NamedValue v( "nodepath",
makeAny( OUString("org.openoffice.Setup/Office") ) );
theArgs[0] <<= v;
Reference< beans::XPropertySet > pset(
@@ -351,7 +351,7 @@ static bool impl_needsCompatCheck()
comphelper::getProcessComponentContext() ) );
Sequence< Any > theArgs(1);
- beans::NamedValue v( OUString("nodepath"),
+ beans::NamedValue v( "nodepath",
makeAny( OUString("org.openoffice.Setup/Office") ) );
theArgs[0] <<= v;
Reference< beans::XPropertySet > pset(
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index c2daf59..257dfb0 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -63,7 +63,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > &
uno::Reference< lang::XMultiServiceFactory > xConfig(
configuration::theDefaultProvider::get(xContext));
uno::Any args[1];
- beans::PropertyValue aValue( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ),
+ beans::PropertyValue aValue( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ),
beans::PropertyState_DIRECT_VALUE );
args[0] <<= aValue;
m_xNameAccessNodes.set(
@@ -73,7 +73,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > &
// get the 'get more extensions here' url
uno::Reference< container::XNameAccess > xNameAccessRepositories;
- beans::PropertyValue aValue2( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ),
+ beans::PropertyValue aValue2( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ),
beans::PropertyState_DIRECT_VALUE );
args[0] <<= aValue2;
xNameAccessRepositories.set(
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b0de4b9..2dcd59f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1145,7 +1145,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
try
{
uno::Sequence<css::beans::PropertyValue> aFilterOptions(2);
- aFilterOptions[0] = css::beans::PropertyValue( OUString("FilterOptions"),
+ aFilterOptions[0] = css::beans::PropertyValue( "FilterOptions",
0,
uno::makeAny(OUString::createFromAscii(pOptions)),
beans::PropertyState_DIRECT_VALUE);
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index f181883..2749da0 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -365,7 +365,7 @@ extern "C" int unopkg_main()
if (subcmd_add)
{
beans::NamedValue nvSuppress(
- OUString("SUPPRESS_LICENSE"), option_suppressLicense ?
+ "SUPPRESS_LICENSE", option_suppressLicense ?
makeAny(OUString("1")):makeAny(OUString("0")));
xExtensionManager->addExtension(
cmdPackage, Sequence<beans::NamedValue>(&nvSuppress, 1),
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index 93cc332..5ca6377 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -100,7 +100,7 @@ namespace drawinglayer
#ifdef DBG_UTIL
if(bDoSaveForVisualControl)
{
- SvFileStream aNew(OUString("c:\\test_content.png"), StreamMode::WRITE|StreamMode::TRUNC);
+ SvFileStream aNew("c:\\test_content.png", StreamMode::WRITE|StreamMode::TRUNC);
vcl::PNGWriter aPNGWriter(aContent);
aPNGWriter.Write(aNew);
}
@@ -130,7 +130,7 @@ namespace drawinglayer
#ifdef DBG_UTIL
if(bDoSaveForVisualControl)
{
- SvFileStream aNew(OUString("c:\\test_alpha.png"), StreamMode::WRITE|StreamMode::TRUNC);
+ SvFileStream aNew("c:\\test_alpha.png", StreamMode::WRITE|StreamMode::TRUNC);
vcl::PNGWriter aPNGWriter(aAlpha);
aPNGWriter.Write(aNew);
}
@@ -141,7 +141,7 @@ namespace drawinglayer
#ifdef DBG_UTIL
if(bDoSaveForVisualControl)
{
- SvFileStream aNew(OUString("c:\\test_combined.png"), StreamMode::WRITE|StreamMode::TRUNC);
+ SvFileStream aNew("c:\\test_combined.png", StreamMode::WRITE|StreamMode::TRUNC);
vcl::PNGWriter aPNGWriter(aRetval);
aPNGWriter.Write(aNew);
}
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index a2b0cef..f9dd4cd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -225,7 +225,7 @@ void SvxBaseAutoCorrCfg::Load(bool bInit)
}
SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) :
- utl::ConfigItem(OUString("Office.Common/AutoCorrect")),
+ utl::ConfigItem("Office.Common/AutoCorrect"),
rParent(rPar)
{
}
@@ -484,7 +484,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
}
SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) :
- utl::ConfigItem(OUString("Office.Writer/AutoFunction")),
+ utl::ConfigItem("Office.Writer/AutoFunction"),
rParent(rPar)
{
}
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 0c779fb..47b07aa 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -176,25 +176,25 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal
Any aVal;
{
aVal <<= rFmt.GetNumberingType();
- beans::PropertyValue aAlignProp( OUString(UNO_NAME_NRULE_NUMBERINGTYPE), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aAlignProp( UNO_NAME_NRULE_NUMBERINGTYPE, -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aAlignProp;
}
{
SvxAdjust eAdj = rFmt.GetNumAdjust();
aVal <<= ConvertUnoAdjust(eAdj);
- pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_ADJUST), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue( UNO_NAME_NRULE_ADJUST, -1, aVal, beans::PropertyState_DIRECT_VALUE);
}
{
aVal <<= OUString(rFmt.GetPrefix());
- beans::PropertyValue aPrefixProp( OUString(UNO_NAME_NRULE_PREFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aPrefixProp( UNO_NAME_NRULE_PREFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aPrefixProp;
}
{
aVal <<= OUString(rFmt.GetSuffix());
- beans::PropertyValue aSuffixProp( OUString(UNO_NAME_NRULE_SUFFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aSuffixProp( UNO_NAME_NRULE_SUFFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aSuffixProp;
}
@@ -203,7 +203,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal
sal_Unicode nCode = rFmt.GetBulletChar();
OUString aStr( &nCode, 1 );
aVal <<= aStr;
- beans::PropertyValue aBulletProp( OUString("BulletChar"), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aBulletProp( "BulletChar", -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aBulletProp;
}
@@ -212,7 +212,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal
awt::FontDescriptor aDesc;
SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc );
aVal <<= aDesc;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list