[Libreoffice-commits] core.git: 5 commits - avmedia/source basctl/source basic/source canvas/source chart2/source codemaker/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source framework/source hwpfilter/source i18npool/source idlc/source idl/source include/comphelper include/oox include/rtl include/svl io/source jvmfwk/plugins jvmfwk/source l10ntools/source linguistic/source lotuswordpro/source oox/source package/source padmin/source pyuno/source registry/tools reportdesign/source rsc/source sal/qa sax/source scaddins/source sc/qa sc/source sdext/source sd/source sfx2/source shell/source starmath/source stoc/source svl/source svtools/source svx/source sw/source toolkit/source tools/source ucbhelper/source ucb/source unotools/source uui/source vbahelper/source vcl/generic vcl/headless vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Luboš Luňák
l.lunak at suse.cz
Wed Aug 21 06:15:56 PDT 2013
avmedia/source/framework/mediaitem.cxx | 2
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/basobj3.cxx | 2
basctl/source/basicide/linenumberwindow.cxx | 2
basctl/source/basicide/localizationmgr.cxx | 8
basctl/source/basicide/scriptdocument.cxx | 2
basctl/source/basicide/tbxctl.cxx | 2
basctl/source/dlged/dlgedobj.cxx | 2
basic/source/classes/sb.cxx | 2
basic/source/comp/token.cxx | 2
basic/source/runtime/methods.cxx | 10
basic/source/sbx/sbxcurr.cxx | 2
basic/source/sbx/sbxint.cxx | 4
basic/source/sbx/sbxobj.cxx | 4
basic/source/sbx/sbxscan.cxx | 10
basic/source/sbx/sbxvar.cxx | 2
canvas/source/cairo/cairo_devicehelper.cxx | 2
canvas/source/tools/verifyinput.cxx | 38 -
canvas/source/vcl/devicehelper.cxx | 2
canvas/source/vcl/spritecanvashelper.cxx | 4
canvas/source/vcl/spritedevicehelper.cxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 4
chart2/source/controller/dialogs/DataBrowser.cxx | 4
chart2/source/controller/dialogs/DataBrowserModel.cxx | 4
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 10
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 12
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/controller/main/SelectionHelper.cxx | 6
chart2/source/tools/InternalData.cxx | 2
chart2/source/tools/InternalDataProvider.cxx | 54 +-
chart2/source/tools/ObjectIdentifier.cxx | 36 -
chart2/source/tools/PropertyHelper.cxx | 2
chart2/source/view/main/ChartView.cxx | 2
codemaker/source/codemaker/global.cxx | 2
comphelper/source/container/embeddedobjectcontainer.cxx | 2
comphelper/source/misc/anytostring.cxx | 2
comphelper/source/misc/mimeconfighelper.cxx | 4
compilerplugins/clang/plugin.cxx | 75 ++-
compilerplugins/clang/plugin.hxx | 65 ++-
compilerplugins/clang/pluginhandler.cxx | 2
compilerplugins/clang/pointertobool.cxx | 2
compilerplugins/clang/valueof.cxx | 148 +++++++
configmgr/source/writemodfile.cxx | 6
connectivity/source/commontools/ConnectionWrapper.cxx | 2
connectivity/source/commontools/dbtools.cxx | 6
connectivity/source/commontools/dbtools2.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 4
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 4
connectivity/source/drivers/file/FPreparedStatement.cxx | 2
connectivity/source/drivers/file/FStringFunctions.cxx | 2
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 4
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4
connectivity/source/drivers/mork/MResultSet.cxx | 6
connectivity/source/drivers/odbcbase/OPreparedStatement.cxx | 4
connectivity/source/drivers/odbcbase/OTools.cxx | 2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 18
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 2
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 6
connectivity/source/parse/PColumn.cxx | 2
connectivity/source/parse/sqliterator.cxx | 4
connectivity/source/parse/sqlnode.cxx | 2
connectivity/source/sdbcx/VCollection.cxx | 4
cppu/source/uno/lbenv.cxx | 4
cppuhelper/source/propertysetmixin.cxx | 4
cui/source/customize/cfg.cxx | 12
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/selector.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 4
cui/source/options/optaboutconfig.cxx | 6
cui/source/options/webconninfo.cxx | 4
cui/source/tabpages/grfpage.cxx | 4
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/page.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 6
dbaccess/source/ext/macromigration/migrationengine.cxx | 6
dbaccess/source/filter/xml/xmlExport.cxx | 6
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 4
dbaccess/source/ui/misc/DExport.cxx | 4
dbaccess/source/ui/misc/TokenWriter.cxx | 8
dbaccess/source/ui/misc/WCopyTable.cxx | 6
dbaccess/source/ui/querydesign/JoinController.cxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 2
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 4
dbaccess/source/ui/tabledesign/TableController.cxx | 4
dbaccess/source/ui/uno/copytablewizard.cxx | 4
desktop/source/app/app.cxx | 2
desktop/source/deployment/manager/dp_activepackages.hxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 4
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 2
desktop/source/deployment/registry/help/dp_help.cxx | 2
desktop/source/splash/splash.cxx | 4
editeng/source/editeng/impedit4.cxx | 8
embeddedobj/source/msole/oleembed.cxx | 4
embeddedobj/source/msole/olepersist.cxx | 6
embeddedobj/source/msole/ownview.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 4
extensions/source/bibliography/general.cxx | 2
extensions/source/dbpilots/dbptools.cxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/logging/logrecord.cxx | 2
extensions/source/nsplugin/source/so_main.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/newdatatype.cxx | 2
extensions/source/propctrlr/stringrepresentation.cxx | 2
extensions/source/update/feed/updatefeed.cxx | 4
filter/source/flash/swfexporter.hxx | 2
filter/source/graphicfilter/epbm/epbm.cxx | 2
filter/source/graphicfilter/epgm/epgm.cxx | 2
filter/source/graphicfilter/eppm/eppm.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 8
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/placeware/exporter.cxx | 2
filter/source/placeware/tempfile.cxx | 2
filter/source/svg/svgexport.cxx | 48 +-
filter/source/svg/svgfontexport.cxx | 12
filter/source/svg/svgreader.cxx | 86 ++--
filter/source/svg/svgwriter.cxx | 188 ++++-----
filter/source/t602/t602filter.cxx | 2
filter/source/xsltdialog/typedetectionexport.cxx | 6
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 6
forms/source/component/DatabaseForm.cxx | 4
forms/source/runtime/formoperations.cxx | 2
forms/source/solar/component/navbarcontrol.cxx | 2
forms/source/xforms/binding.cxx | 2
forms/source/xforms/datatypes.cxx | 4
forms/source/xforms/model_ui.cxx | 2
fpicker/source/office/commonpicker.cxx | 2
framework/source/accelerators/keymapping.cxx | 2
framework/source/classes/menumanager.cxx | 8
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwe/helper/actiontriggerhelper.cxx | 2
framework/source/fwe/xml/statusbardocumenthandler.cxx | 4
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 2
framework/source/layoutmanager/helpers.cxx | 2
framework/source/recording/dispatchrecorder.cxx | 2
framework/source/services/substitutepathvars.cxx | 2
framework/source/uiconfiguration/windowstateconfiguration.cxx | 16
framework/source/uielement/fontsizemenucontroller.cxx | 6
framework/source/uielement/menubarmanager.cxx | 6
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 32 -
framework/source/xml/imagesdocumenthandler.cxx | 4
hwpfilter/source/hwpreader.cxx | 2
i18npool/source/calendar/calendar_jewish.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 22 -
idl/source/objects/basobj.cxx | 3
idl/source/objects/object.cxx | 3
idl/source/objects/slot.cxx | 22 -
idl/source/objects/types.cxx | 4
idl/source/prj/database.cxx | 3
idlc/source/astexpression.cxx | 18
idlc/source/idlcmain.cxx | 4
include/comphelper/logging.hxx | 14
include/oox/core/xmlfilterbase.hxx | 4
include/oox/export/utils.hxx | 6
include/rtl/string.hxx | 12
include/rtl/ustring.hxx | 12
include/svl/zformat.hxx | 2
io/source/acceptor/acc_pipe.cxx | 2
io/source/acceptor/acc_socket.cxx | 2
io/source/connector/connector.cxx | 2
io/source/connector/ctr_pipe.cxx | 2
io/source/connector/ctr_socket.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8
jvmfwk/source/elements.cxx | 8
jvmfwk/source/fwkbase.cxx | 4
l10ntools/source/export.cxx | 2
l10ntools/source/xmlparse.cxx | 4
linguistic/source/convdicxml.cxx | 2
linguistic/source/gciterator.cxx | 2
linguistic/source/lngsvcmgr.cxx | 22 -
lotuswordpro/source/filter/lwptblformula.cxx | 2
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 2
lotuswordpro/source/filter/xfilter/xfutil.cxx | 8
oox/source/core/xmlfilterbase.cxx | 2
oox/source/drawingml/customshapegeometry.cxx | 18
oox/source/drawingml/hyperlinkcontext.cxx | 4
oox/source/dump/dumperbase.cxx | 6
oox/source/dump/oledumper.cxx | 6
oox/source/export/drawingml.cxx | 6
oox/source/export/shapes.cxx | 4
oox/source/export/vmlexport.cxx | 16
oox/source/helper/modelobjecthelper.cxx | 2
oox/source/ole/oleobjecthelper.cxx | 2
oox/source/ppt/commontimenodecontext.cxx | 2
oox/source/ppt/timenode.cxx | 2
oox/source/vml/vmldrawing.cxx | 2
oox/source/vml/vmlshape.cxx | 2
oox/source/vml/vmlshapecontext.cxx | 2
package/source/zippackage/zipfileaccess.cxx | 8
padmin/source/adddlg.cxx | 2
padmin/source/cmddlg.cxx | 4
padmin/source/newppdlg.cxx | 6
pyuno/source/module/pyuno_runtime.cxx | 2
registry/tools/regcompare.cxx | 14
reportdesign/source/filter/xml/xmlExport.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 4
rsc/source/parser/erscerr.cxx | 2
rsc/source/parser/rscyacc.y | 2
rsc/source/tools/rscdef.cxx | 4
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 4
sal/qa/osl/file/osl_File.cxx | 2
sal/qa/osl/security/osl_Security.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 2
sax/source/tools/converter.cxx | 2
sax/source/tools/fshelper.cxx | 6
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/source/core/data/conditio.cxx | 18
sc/source/core/data/document.cxx | 2
sc/source/core/data/dpitemdata.cxx | 4
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/dputil.cxx | 2
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/editutil.cxx | 2
sc/source/core/tool/interpr1.cxx | 2
sc/source/filter/excel/excrecds.cxx | 10
sc/source/filter/excel/xecontent.cxx | 34 -
sc/source/filter/excel/xeescher.cxx | 10
sc/source/filter/excel/xeextlst.cxx | 2
sc/source/filter/excel/xename.cxx | 2
sc/source/filter/excel/xepage.cxx | 26 -
sc/source/filter/excel/xepivot.cxx | 26 -
sc/source/filter/excel/xerecord.cxx | 2
sc/source/filter/excel/xestream.cxx | 8
sc/source/filter/excel/xestyle.cxx | 32 -
sc/source/filter/excel/xetable.cxx | 16
sc/source/filter/excel/xeview.cxx | 20
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/excel/xlchart.cxx | 2
sc/source/filter/excel/xltools.cxx | 2
sc/source/filter/inc/xerecord.hxx | 2
sc/source/filter/oox/drawingfragment.cxx | 4
sc/source/filter/oox/pivotcachebuffer.cxx | 6
sc/source/filter/rtf/rtfexp.cxx | 4
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 26 -
sc/source/filter/xcl97/xcl97rec.cxx | 12
sc/source/filter/xml/XMLExportDataPilot.cxx | 2
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 8
sc/source/filter/xml/XMLStylesExportHelper.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 10
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 2
sc/source/ui/cctrl/tbinsert.cxx | 2
sc/source/ui/condformat/colorformat.cxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 2
sc/source/ui/vba/vbachart.cxx | 2
sc/source/ui/vba/vbahelper.cxx | 16
sc/source/ui/vba/vbainterior.cxx | 2
sc/source/ui/vba/vbarange.cxx | 4
sc/source/ui/vba/vbaworkbooks.cxx | 2
scaddins/source/analysis/analysishelper.cxx | 2
sd/source/core/stlsheet.cxx | 2
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/eppt/pptexanimations.cxx | 16
sd/source/filter/eppt/pptx-epptooxml.cxx | 4
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 6
sd/source/ui/animations/CustomAnimationDialog.cxx | 4
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/app/tbxww.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 6
sd/source/ui/dlg/brkdlg.cxx | 12
sd/source/ui/dlg/copydlg.cxx | 4
sd/source/ui/dlg/custsdlg.cxx | 6
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 4
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4
sd/source/ui/remotecontrol/Listener.cxx | 6
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 2
sd/source/ui/slideshow/SlideShowRestarter.cxx | 2
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 2
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 4
sd/source/ui/view/drviewsa.cxx | 6
sdext/source/minimizer/informationdialog.cxx | 2
sdext/source/minimizer/optimizerdialogcontrols.cxx | 16
sdext/source/minimizer/pppoptimizerdialog.cxx | 4
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 6
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 4
sdext/source/pdfimport/tree/writertreevisiting.cxx | 6
sdext/source/presenter/PresenterAccessibility.cxx | 2
sdext/source/presenter/PresenterController.cxx | 6
sdext/source/presenter/PresenterScreen.cxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 2
sdext/source/presenter/PresenterToolBar.cxx | 8
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/appl/sfxpicklist.cxx | 4
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 4
sfx2/source/doc/Metadatable.cxx | 2
sfx2/source/doc/docinf.cxx | 2
sfx2/source/doc/doctemplates.cxx | 4
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/menu/virtmenu.cxx | 8
shell/source/backends/gconfbe/gconfaccess.cxx | 2
shell/source/backends/kde4be/kde4access.cxx | 2
shell/source/unix/sysshell/recently_used_file_handler.cxx | 2
starmath/source/cfgitem.cxx | 10
starmath/source/dialog.cxx | 2
stoc/source/javavm/javavm.cxx | 12
stoc/source/typeconv/convert.cxx | 14
svl/source/items/ptitem.cxx | 2
svl/source/items/stylepool.cxx | 2
svl/source/items/szitem.cxx | 2
svl/source/numbers/zforlist.cxx | 22 -
svl/source/numbers/zformat.cxx | 14
svl/source/numbers/zforscan.cxx | 2
svl/source/passwordcontainer/passwordcontainer.cxx | 10
svtools/source/config/fontsubstconfig.cxx | 2
svtools/source/control/calendar.cxx | 6
svtools/source/control/roadmap.cxx | 2
svtools/source/control/ruler.cxx | 4
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/filter/GraphicExportOptionsDialog.cxx | 2
svtools/source/filter/exportdialog.cxx | 2
svtools/source/misc/transfer.cxx | 8
svtools/source/svrtf/rtfout.cxx | 4
svtools/source/uno/treecontrolpeer.cxx | 10
svx/source/accessibility/AccessibleShape.cxx | 4
svx/source/accessibility/ChildrenManagerImpl.cxx | 2
svx/source/customshapes/EnhancedCustomShape2d.cxx | 6
svx/source/dialog/compressgraphicdialog.cxx | 10
svx/source/fmcomp/dbaexchange.cxx | 2
svx/source/form/fmsrccfg.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 14
svx/source/form/formcontroller.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/form/tbxform.cxx | 2
svx/source/items/rotmodit.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/svdraw/svdattr.cxx | 10
svx/source/svdraw/svdibrow.cxx | 6
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdtrans.cxx | 2
svx/source/svdraw/svdview.cxx | 8
svx/source/table/cell.cxx | 2
svx/source/table/tablertfexporter.cxx | 4
sw/source/core/access/accfootnote.cxx | 2
sw/source/core/access/accheaderfooter.cxx | 4
sw/source/core/access/accpage.cxx | 5
sw/source/core/doc/doc.cxx | 12
sw/source/core/doc/docnum.cxx | 4
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/fields/authfld.cxx | 2
sw/source/core/fields/cellfml.cxx | 12
sw/source/core/unocore/unochart.cxx | 6
sw/source/core/view/printdata.cxx | 2
sw/source/filter/html/css1atr.cxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 208 +++++-----
sw/source/filter/ww8/docxexport.cxx | 10
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 42 +-
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dbui/mmconfigitem.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 4
sw/source/ui/docvw/edtwin2.cxx | 2
sw/source/ui/envelp/labelcfg.cxx | 24 -
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/ribbar/workctrl.cxx | 4
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/table/chartins.cxx | 2
sw/source/ui/utlui/attrdesc.cxx | 10
sw/source/ui/vba/vbalisthelper.cxx | 90 ++--
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/tabpagecontainer.cxx | 2
toolkit/source/controls/unocontrolcontainer.cxx | 2
tools/source/debug/debug.cxx | 2
tools/source/fsys/urlobj.cxx | 32 -
ucb/source/core/ucbcmds.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 2
ucb/source/ucp/cmis/cmis_repo_content.cxx | 2
ucb/source/ucp/file/shell.cxx | 4
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 4
ucb/source/ucp/package/pkgcontent.cxx | 4
ucb/source/ucp/tdoc/tdoc_content.cxx | 4
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 2
ucb/source/ucp/webdav-neon/NeonUri.cxx | 4
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 16
ucbhelper/source/client/proxydecider.cxx | 2
unotools/source/config/configitem.cxx | 2
unotools/source/config/dynamicmenuoptions.cxx | 2
unotools/source/config/historyoptions.cxx | 24 -
unotools/source/config/xmlaccelcfg.cxx | 4
unotools/source/misc/fontcvt.cxx | 4
unotools/source/ucbhelper/tempfile.cxx | 2
uui/source/iahndl.cxx | 2
vbahelper/source/msforms/vbacontrols.cxx | 2
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 16
vbahelper/source/vbahelper/vbashapes.cxx | 2
vcl/generic/print/glyphset.cxx | 4
vcl/generic/print/printerjob.cxx | 4
vcl/headless/svpdummies.cxx | 2
vcl/source/control/field.cxx | 4
vcl/source/gdi/graph.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 8
vcl/source/window/builder.cxx | 8
vcl/source/window/printdlg.cxx | 10
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/printer/printerinfomanager.cxx | 10
vcl/unx/gtk/gdi/salprn-gtk.cxx | 8
writerfilter/source/dmapper/DomainMapper.cxx | 12
writerfilter/source/dmapper/FormControlHelper.cxx | 4
writerfilter/source/dmapper/GraphicImport.cxx | 4
writerfilter/source/dmapper/NumberingManager.cxx | 12
writerfilter/source/dmapper/OLEHandler.cxx | 2
writerfilter/source/dmapper/PropertyMap.cxx | 4
writerfilter/source/dmapper/StyleSheetTable.cxx | 8
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
writerfilter/source/rtftok/rtfsdrimport.cxx | 2
writerfilter/source/rtftok/rtfvalue.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/chart/SchXMLExport.cxx | 8
xmloff/source/chart/SchXMLTableContext.cxx | 8
xmloff/source/core/RDFaExportHelper.cxx | 2
xmloff/source/core/SettingsExportHelper.cxx | 2
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx | 2
xmloff/source/draw/animationexport.cxx | 2
xmloff/source/draw/animexp.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 10
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/draw/shapeexport2.cxx | 6
xmloff/source/draw/shapeexport3.cxx | 2
xmloff/source/draw/shapeexport4.cxx | 14
xmloff/source/draw/ximpcustomshape.cxx | 2
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/forms/layerexport.cxx | 2
xmloff/source/meta/xmlmetae.cxx | 6
xmloff/source/style/DashStyle.cxx | 4
xmloff/source/style/XMLFontAutoStylePool.cxx | 6
xmloff/source/style/cdouthdl.cxx | 2
xmloff/source/style/impastp2.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 24 -
xmloff/source/style/xmlnumfi.cxx | 4
xmloff/source/table/XMLTableExport.cxx | 4
xmloff/source/text/XMLSectionExport.cxx | 4
xmloff/source/text/XMLTextFrameContext.cxx | 2
xmloff/source/text/txtflde.cxx | 2
xmloff/source/text/txtlists.cxx | 4
xmloff/source/text/txtparae.cxx | 4
xmloff/source/text/txtvfldi.cxx | 2
xmloff/source/transform/Oasis2OOo.cxx | 4
xmloff/source/transform/StyleOASISTContext.cxx | 8
xmloff/source/transform/StyleOOoTContext.cxx | 10
xmloff/source/transform/TransformerBase.cxx | 2
xmlscript/source/xmldlg_imexp/exp_share.hxx | 31 +
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 24 -
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/framework/buffernode.cxx | 4
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 6
xmlsecurity/source/helper/xsecsign.cxx | 4
xmlsecurity/source/helper/xsecverify.cxx | 4
494 files changed, 1825 insertions(+), 1624 deletions(-)
New commits:
commit 64b993e046f23baaacaff1572b7d2a816588b5ef
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Aug 21 15:07:31 2013 +0200
finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 244bb55..8f6b067 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -406,7 +406,7 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage,
do
{
++count;
- filename = basename + OUString::valueOf(count) + suffix;
+ filename = basename + OUString::number(count) + suffix;
}
while (xStorage->hasByName(filename));
}
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 0593c12..386a3ab 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -135,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
if( bOutput )
{
- OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " + OUString::valueOf( nCurPage ) + "]";
+ OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]";
pPrinter->DrawText( aPos, aPageStr );
}
}
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1ccc4ad..578940f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -113,7 +113,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
nFound = pCurWin->StartSearchAndReplace(rSearchItem);
OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES));
- aReplStr = aReplStr.replaceAll("XX", OUString::valueOf(nFound));
+ aReplStr = aReplStr.replaceAll("XX", OUString::number(nFound));
InfoBox( pCurWin, aReplStr ).Execute();
}
else
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index f0aa0ba..89f9f45 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -96,7 +96,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
while ( !bValid )
{
aMacroName = aStdMacroText;
- aMacroName += OUString::valueOf( nMacro );
+ aMacroName += OUString::number( nMacro );
// test whether existing...
bValid = pModule->GetMethods()->Find( aMacroName, SbxCLASS_METHOD ) ? false : true;
nMacro++;
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 8baa2fe..3ee023b 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -73,7 +73,7 @@ void LineNumberWindow::Paint( const Rectangle& )
sal_Int64 y = (nStartLine - 1) * (sal_Int64)nLineHeight;
for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight)
- DrawText(Point(0, y - m_nCurYOffset), OUString::valueOf(n));
+ DrawText(Point(0, y - m_nCurYOffset), OUString::number(n));
}
void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 996767f..fe87f4c 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -171,7 +171,7 @@ OUString implCreatePureResourceId
Reference< XStringResourceManager > xStringResourceManager )
{
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- OUString aPureIdStr = OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::number( nUniqueId );
aPureIdStr += aDot;
aPureIdStr += aDialogName;
aPureIdStr += aDot;
@@ -433,7 +433,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
}
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- OUString aPureIdStr = OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::number( nUniqueId );
aPureIdStr += aIdStrBase;
// Set Id for all locales
@@ -527,7 +527,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- OUString aPureIdStr = OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::number( nUniqueId );
aPureIdStr += aIdStrBase;
// Set Id for all locales
@@ -576,7 +576,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- OUString aPureIdStr = OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::number( nUniqueId );
aPureIdStr += aIdStrBase;
// Set Id for all locales
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 3224c71..17cc607 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1296,7 +1296,7 @@ namespace basctl
while ( !bValid )
{
aObjectName = aBaseName;
- aObjectName += OUString::valueOf( i );
+ aObjectName += OUString::number( i );
if ( aUsedNamesCheck.find( aObjectName ) == aUsedNamesCheck.end() )
bValid = true;
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 1396e22..2b331ce 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -108,7 +108,7 @@ void TbxControls::StateChanged( sal_uInt16 nSID, SfxItemState eState,
if( nTemp )
{
OUString aSlotURL( "slot:" );
- aSlotURL += OUString::valueOf( sal_Int32( nTemp ));
+ aSlotURL += OUString::number( nTemp);
Image aImage = GetImage( m_xFrame,
aSlotURL,
hasBigImages()
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index ba07117..d166e92 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -804,7 +804,7 @@ OUString DlgEdObj::GetUniqueName() const
do
{
- aUniqueName = aDefaultName + OUString::valueOf(++n);
+ aUniqueName = aDefaultName + OUString::number(++n);
} while (xNameAcc->hasByName(aUniqueName));
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3ef3255..2987123 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1734,7 +1734,7 @@ sal_Bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sa
// like vba ( adds an error number etc )
if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
{
- OUString aTmp = "\'" + OUString::valueOf(SbxErrObject::getUnoErrObject()->getNumber()) +
+ OUString aTmp = "\'" + OUString::number(SbxErrObject::getUnoErrObject()->getNumber()) +
"\'\n" + OUString(!GetSbData()->aErrMsg.isEmpty() ? GetSbData()->aErrMsg : rMsg);
code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
}
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index f3d27ed..5761427 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -280,7 +280,7 @@ const OUString& SbiTokenizer::Symbol( SbiToken t )
// character token?
if( t < FIRSTKWD )
{
- aSym = OUString::valueOf(sal::static_int_cast<sal_Unicode>(t));
+ aSym = OUString(sal::static_int_cast<sal_Unicode>(t));
return aSym;
}
switch( t )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 3ae89cb..fb01bdb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -886,7 +886,7 @@ RTLFUNC(Hex)
sal_uInt32 nVal = pArg->IsInteger() ?
static_cast<sal_uInt16>(pArg->GetInteger()) :
static_cast<sal_uInt32>(pArg->GetLong());
- OUString aStr(OUString::valueOf( sal_Int64(nVal), 16 ));
+ OUString aStr(OUString::number( nVal, 16 ));
aStr = aStr.toAsciiUpperCase();
rPar.Get(0)->PutString( aStr );
}
@@ -4649,8 +4649,8 @@ RTLFUNC(Partition)
// will be handled properly during any subsequent sort operation.
// calculate the maximun number of characters before lowervalue and uppervalue
- OUString aBeforeStart = OUString::valueOf( nStart - 1 );
- OUString aAfterStop = OUString::valueOf( nStop + 1 );
+ OUString aBeforeStart = OUString::number( nStart - 1 );
+ OUString aAfterStop = OUString::number( nStop + 1 );
sal_Int32 nLen1 = aBeforeStart.getLength();
sal_Int32 nLen2 = aAfterStop.getLength();
sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
@@ -4675,8 +4675,8 @@ RTLFUNC(Partition)
nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
nUpperValue = nLowerValue + nInterval - 1;
}
- aLowerValue = OUString::valueOf( nLowerValue );
- aUpperValue = OUString::valueOf( nUpperValue );
+ aLowerValue = OUString::number( nLowerValue );
+ aUpperValue = OUString::number( nUpperValue );
}
nLen1 = aLowerValue.getLength();
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 422c0dd..851c6a8 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -37,7 +37,7 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal )
ImpGetIntntlSep( cDecimalSep, cThousandSep );
#endif
- OUString aAbsStr = OUString::valueOf( absVal );
+ OUString aAbsStr = OUString::number( absVal );
OUStringBuffer aBuf;
sal_Int32 initialLen = aAbsStr.getLength();
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 6642789..649bb46 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -543,7 +543,7 @@ start:
if( !p->pOUString )
p->pOUString = new OUString;
- ::OString aOStr = ::OString::valueOf( n );
+ ::OString aOStr = OString::number( n );
(*p->pOUString) = ::OStringToOUString
( aOStr, RTL_TEXTENCODING_ASCII_US );
break;
@@ -821,7 +821,7 @@ start:
SbxBase::SetError( SbxERR_CONVERSION );
else
{
- ::OString aOStr = ::OString::valueOf( (sal_Int64)n );
+ ::OString aOStr = OString::number( n );
(*p->pOUString) = ::OStringToOUString
( aOStr, RTL_TEXTENCODING_ASCII_US );
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index ac60928..ea82ec7 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -827,7 +827,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US));
rStrm << "Object( "
- << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
+ << OString::number(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
<< ( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ) << "', "
<< "of class '" << aClassNameStr.getStr() << "', "
<< "counts "
@@ -837,7 +837,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
{
OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
rStrm << "in parent "
- << OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr()
+ << OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr()
<< "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ) << "'";
}
else
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 180de7e..e3545ef 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -471,12 +471,12 @@ bool ImpConvStringExt( OUString& rSrc, SbxDataType eTargetType )
{
if( rSrc.equalsIgnoreAsciiCase("true") )
{
- aNewString = OUString::valueOf( (sal_Int32)SbxTRUE );
+ aNewString = OUString::number( SbxTRUE );
bChanged = true;
}
else if( rSrc.equalsIgnoreAsciiCase("false") )
{
- aNewString = OUString::valueOf( (sal_Int32)SbxFALSE );
+ aNewString = OUString::number( SbxFALSE );
bChanged = true;
}
break;
@@ -825,13 +825,13 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
}
else
{
- rRes = OUString::valueOf(nMin);
+ rRes = OUString::number(nMin);
}
}
else if( aFmtStr.equalsIgnoreAsciiCase( VBAFORMAT_W ))
{
sal_Int32 nWeekDay = implGetWeekDay( nNumber );
- rRes = OUString::valueOf(nWeekDay);
+ rRes = OUString::number(nWeekDay);
}
else if( aFmtStr.equalsIgnoreAsciiCase( VBAFORMAT_Y ))
{
@@ -839,7 +839,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
double dBaseDate;
implDateSerial( nYear, 1, 1, dBaseDate );
sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
- rRes = OUString::valueOf(nYear32);
+ rRes = OUString::number(nYear32);
}
else
{
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 6c4c09b..8fb9e08 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -737,7 +737,7 @@ void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
{
OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US));
rStrm << "Variable( "
- << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
+ << OString::number(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
<< aBNameStr.getStr();
OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US));
if ( GetParent() )
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index ce14003..3973836 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -254,7 +254,7 @@ namespace cairocanvas
if( mpRefDevice )
{
OUString aFilename("dbg_frontbuffer");
- aFilename += OUString::valueOf(nFilePostfixCount);
+ aFilename += OUString::number(nFilePostfixCount);
aFilename += ".bmp";
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index b682caf..48fdad5 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -227,7 +227,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " +
- OUString::valueOf(nBinaryState),
+ OUString::number(nBinaryState),
xIf, nArgPos );
}
#else
@@ -262,7 +262,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " +
- OUString::valueOf(nBinaryState),
+ OUString::number(nBinaryState),
xIf, nArgPos );
}
#else
@@ -300,9 +300,9 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): render state's device color has too few components (" +
- OUString::valueOf(nMinColorComponents) +
+ OUString::number(nMinColorComponents) +
" expected, " +
- OUString::valueOf(renderState.DeviceColor.getLength()) +
+ OUString::number(renderState.DeviceColor.getLength()) +
" provided)",
xIf, nArgPos );
#else
@@ -317,7 +317,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): render state's CompositeOperation value out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
" not known)",
xIf, nArgPos );
#else
@@ -342,7 +342,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): textures' alpha value out of range (is " +
- OUString::valueOf(texture.Alpha) + ")",
+ OUString::number(texture.Alpha) + ")",
xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
@@ -368,7 +368,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): textures' RepeatModeX value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
" not known)",
xIf, nArgPos );
#else
@@ -383,7 +383,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): textures' RepeatModeY value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
" not known)",
xIf, nArgPos );
#else
@@ -413,7 +413,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(mpStr) +
": verifyInput(): one of stroke attributes' DashArray value out of range (is " +
- OUString::valueOf(rVal) + ")",
+ OUString::number(rVal) + ")",
mrIf, mnArgPos );
#else
throw lang::IllegalArgumentException();
@@ -439,7 +439,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): stroke attributes' StrokeWidth value out of range (is " +
- OUString::valueOf(strokeAttributes.StrokeWidth) +
+ OUString::number(strokeAttributes.StrokeWidth) +
")",
xIf, nArgPos );
#else
@@ -454,7 +454,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): stroke attributes' MiterLimit value out of range (is " +
- OUString::valueOf(strokeAttributes.MiterLimit) + ")",
+ OUString::number(strokeAttributes.MiterLimit) + ")",
xIf, nArgPos );
#else
throw lang::IllegalArgumentException();
@@ -476,7 +476,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): stroke attributes' StartCapType value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
" not known)",
xIf, nArgPos );
#else
@@ -491,7 +491,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): stroke attributes' StartCapType value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
" not known)",
xIf, nArgPos );
#else
@@ -506,7 +506,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): stroke attributes' JoinType value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
+ OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
" not known)",
xIf, nArgPos );
#else
@@ -578,7 +578,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" +
- OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
+ OUString::number(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
" not known)",
xIf, nArgPos );
#else
@@ -683,7 +683,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyBitmapSize(): size has 0 or negative width (value: " +
- OUString::valueOf(size.Width) + ")",
+ OUString::number(size.Width) + ")",
xIf, 0 );
#else
throw lang::IllegalArgumentException();
@@ -696,7 +696,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifyBitmapSize(): size has 0 or negative height (value: " +
- OUString::valueOf(size.Height) +
+ OUString::number(size.Height) +
")",
xIf, 0 );
#else
@@ -717,7 +717,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifySpriteSize(): size has 0 or negative width (value: " +
- OUString::valueOf(size.Width) + ")",
+ OUString::number(size.Width) + ")",
xIf, 0 );
#else
throw lang::IllegalArgumentException();
@@ -730,7 +730,7 @@ namespace canvas
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
": verifySpriteSize(): size has 0 or negative height (value: " +
- OUString::valueOf(size.Height) + ")",
+ OUString::number(size.Height) + ")",
xIf, 0 );
#else
throw lang::IllegalArgumentException();
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index dc56874..b874bd1 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -212,7 +212,7 @@ namespace vclcanvas
if( mpOutDev )
{
OUString aFilename("dbg_frontbuffer");
- aFilename += OUString::valueOf(nFilePostfixCount);
+ aFilename += OUString::number(nFilePostfixCount);
aFilename += OUString(".bmp");
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 185d440..88a2970 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -645,9 +645,9 @@ namespace vclcanvas
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
OUString text(
- OUString::valueOf(
+ OUString::number(
// disambiguate overload...
- static_cast<sal_Int64>(nCount) ) );
+ nCount ) );
// pad with leading space
while( text.getLength() < 3 )
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 0a0e4b5..2e1063c 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
if( mpBackBuffer )
{
OUString aFilename("dbg_backbuffer");
- aFilename += OUString::valueOf(nFilePostfixCount);
+ aFilename += OUString::number(nFilePostfixCount);
aFilename += OUString(".bmp");
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 2147406..74cf3cc 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -566,8 +566,8 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i
i < 0 ||
static_cast< ChildListVectorType::size_type >( i ) >= m_aChildList.size() )
{
- OUString aBuf = "Index " + OUString::valueOf( i ) + " is invalid for range [ 0, " +
- OUString::valueOf( static_cast< sal_Int32 >( m_aChildList.size() - 1 ) ) +
+ OUString aBuf = "Index " + OUString::number( i ) + " is invalid for range [ 0, " +
+ OUString::number( m_aChildList.size() - 1 ) +
" ]";
lang::IndexOutOfBoundsException aEx( aBuf,
const_cast< ::cppu::OWeakObject * >(
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2ea1cf0..c86b10e 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -574,7 +574,7 @@ void DataBrowser::RenewTable()
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
- replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) );
+ replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
@@ -640,7 +640,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
{
- return OUString::valueOf(nRow + 1);
+ return OUString::number(nRow + 1);
}
OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 5a63bad..6e2c657 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -382,7 +382,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
// values
Reference< chart2::data::XDataSequence > xNewSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
- OUString::valueOf( nIndex )));
+ OUString::number( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getValues(), xNewSeq );
aLSequences[nSeqIdx]->setValues( xNewSeq );
@@ -391,7 +391,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
Reference< chart2::data::XDataSequence > xNewLabelSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
"label " +
- OUString::valueOf( nIndex )));
+ OUString::number( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq );
aLSequences[nSeqIdx]->setLabel( xNewLabelSeq );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index ef63d90..943081c 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -507,7 +507,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
- aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::valueOf(nPointIndex+1) );
+ aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::number(nPointIndex+1) );
}
//replace data series index
@@ -526,7 +526,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
}
}
- OUString aReplacement( OUString::valueOf(nSeriesIndex+1) );
+ OUString aReplacement( OUString::number(nSeriesIndex+1) );
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement );
}
@@ -673,7 +673,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
// replace data point index
- replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 ));
+ replaceParamterInString( aRet, "%POINTNUMBER", OUString::number( nPointIndex + 1 ));
// replace data series index
{
@@ -685,7 +685,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
if( aSeriesVector[nSeriesIndex] == xSeries )
break;
}
- replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) );
+ replaceParamterInString( aRet, "%SERIESNUMBER", OUString::number( nSeriesIndex + 1 ) );
}
// replace point value
@@ -743,7 +743,7 @@ OUString ObjectNameProvider::getNameForCID(
aRet += getName( OBJECTTYPE_DATA_POINT );
sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
aRet += " ";
- aRet += OUString::valueOf(nPointIndex+1);
+ aRet += OUString::number(nPointIndex+1);
if( eType == OBJECTTYPE_DATA_LABEL )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index fb8b8fd..6cfa45d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -58,7 +58,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
if( nIndex != -1 )
{
aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
- OUString::valueOf( nLightNumber ) );
+ OUString::number( nLightNumber ) );
}
this->SetQuickHelpText( String( aTipHelp ) );
}
@@ -143,13 +143,13 @@ namespace
OUString lcl_makeColorName( Color rColor )
{
OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
- OUString::valueOf((sal_Int32)rColor.GetRed()) +
+ OUString::number(rColor.GetRed()) +
" " +
SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
- OUString::valueOf((sal_Int32)rColor.GetGreen()) +
+ OUString::number(rColor.GetGreen()) +
" " +
SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
- OUString::valueOf((sal_Int32)rColor.GetBlue());
+ OUString::number(rColor.GetBlue());
return aStr;
}
void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
@@ -173,7 +173,7 @@ namespace
OUString aColorPropertyPrefix("D3DSceneLightColor");
OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
OUString aEnabledPropertyPrefix("D3DSceneLightOn");
- OUString aIndex( OUString::valueOf( nIndex + 1 ));
+ OUString aIndex( OUString::number( nIndex + 1 ));
try
{
@@ -201,7 +201,7 @@ namespace
OUString aColorPropertyPrefix("D3DSceneLightColor");
OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
OUString aEnabledPropertyPrefix("D3DSceneLightOn");
- OUString aIndex( OUString::valueOf( nIndex + 1 ));
+ OUString aIndex( OUString::number( nIndex + 1 ));
try
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ffbd7bc..91d6ca4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -475,7 +475,7 @@ void DataSourceTabPage::fillSeriesListBox()
if( nIndex != -1 )
aLabel = OUString( aResString.replaceAt(
nIndex, aReplacementStr.getLength(),
- OUString::valueOf(nUnnamedSeriesIndex)));
+ OUString::number(nUnnamedSeriesIndex)));
}
if( aLabel.isEmpty() )
aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString();
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 3aa1f2a..99923f2 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -72,7 +72,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
{
rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
- rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+ rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
}
bool DragMethod_PieSegment::BeginSdrDrag()
{
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 4e118ee..cb264ea 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -262,7 +262,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
}
//check whether the diagram was hit but not selected (e.g. because it has no filling):
- OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
if( bBackGroundHit )
@@ -431,7 +431,7 @@ OUString SelectionHelper::getHitObjectCID(
{
if( aRet.equals( aPageCID ) )
{
- OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
//todo: if more than one diagram is available in future do chack the list of all diagrams here
SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
if( pDiagram )
@@ -448,7 +448,7 @@ OUString SelectionHelper::getHitObjectCID(
if( aRet.equals( aWallCID ) )
{
- OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
aRet = aDiagramCID;
}
}
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 66424a9..0cc7038 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -47,7 +47,7 @@ struct lcl_NumberedStringGenerator
vector< uno::Any > operator()()
{
vector< uno::Any > aRet(1);
- aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::valueOf( ++m_nCounter )) );
+ aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter )) );
return aRet;
}
private:
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 8168c26..597e2be 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -125,7 +125,7 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::
for( sal_Int32 i=0; i<aOldSeriesData.getLength(); ++i )
{
sal_Int32 nNewIndex( m_bDataInColumns ? m_rInternalData.appendColumn() : m_rInternalData.appendRow() );
- OUString aIdentifier( OUString::valueOf( nNewIndex ));
+ OUString aIdentifier( OUString::number( nNewIndex ));
//@todo: deal also with genericXDataSequence
Reference< chart2::data::XNumericalDataSequence > xValues( aOldSeriesData[i]->getValues(), uno::UNO_QUERY );
Reference< chart2::data::XTextualDataSequence > xLabel( aOldSeriesData[i]->getLabel(), uno::UNO_QUERY );
@@ -468,10 +468,10 @@ void InternalDataProvider::lcl_increaseMapReferences(
{
for( sal_Int32 nIndex = nEnd - 1; nIndex >= nBegin; --nIndex )
{
- lcl_adaptMapReferences( OUString::valueOf( nIndex ),
- OUString::valueOf( nIndex + 1 ));
- lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ),
- lcl_aLabelRangePrefix + OUString::valueOf( nIndex + 1 ));
+ lcl_adaptMapReferences( OUString::number( nIndex ),
+ OUString::number( nIndex + 1 ));
+ lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::number( nIndex ),
+ lcl_aLabelRangePrefix + OUString::number( nIndex + 1 ));
}
}
@@ -480,10 +480,10 @@ void InternalDataProvider::lcl_decreaseMapReferences(
{
for( sal_Int32 nIndex = nBegin; nIndex < nEnd; ++nIndex )
{
- lcl_adaptMapReferences( OUString::valueOf( nIndex ),
- OUString::valueOf( nIndex - 1 ));
- lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ),
- lcl_aLabelRangePrefix + OUString::valueOf( nIndex - 1 ));
+ lcl_adaptMapReferences( OUString::number( nIndex ),
+ OUString::number( nIndex - 1 ));
+ lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::number( nIndex ),
+ lcl_aLabelRangePrefix + OUString::number( nIndex - 1 ));
}
}
@@ -548,7 +548,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
{
m_aInternalData.insertColumn( n );
m_aInternalData.setColumnValues( n, aNewData );
- aRangeRepresentation = OUString::valueOf( n );
+ aRangeRepresentation = OUString::number( n );
}
else if( nCategories > 1 )
{
@@ -556,7 +556,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
}
else
{
- aRangeRepresentation = lcl_aLabelRangePrefix+OUString::valueOf( n );
+ aRangeRepresentation = lcl_aLabelRangePrefix+OUString::number( n );
}
}
@@ -629,7 +629,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
for( sal_Int32 nL=0; nL<nLevelCount; nL++ )
aComplexCategories.push_back( new LabeledDataSequence(
new UncachedDataSequence( this
- , lcl_aCategoriesLevelRangeNamePrefix + OUString::valueOf( nL )
+ , lcl_aCategoriesLevelRangeNamePrefix + OUString::number( nL )
, lcl_aCategoriesRoleName ) ) );
}
else
@@ -638,7 +638,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
for( sal_Int32 nP=0; nP<nPointCount; nP++ )
aComplexCategories.push_back( new LabeledDataSequence(
new UncachedDataSequence( this
- , lcl_aCategoriesPointRangeNamePrefix + OUString::valueOf( nP )
+ , lcl_aCategoriesPointRangeNamePrefix + OUString::number( nP )
, lcl_aCategoriesRoleName ) ) );
}
//don't add the created sequences to the map as they are used temporarily only ...
@@ -661,8 +661,8 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
{
aDataVec.push_back(
new LabeledDataSequence(
- lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIdx )),
- lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIdx ))));
+ lcl_createDataSequenceAndAddToMap( OUString::number( nIdx )),
+ lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::number( nIdx ))));
}
// attention: this data provider has the limitation that it stores
@@ -745,14 +745,14 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
{
// label
sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
- return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ));
+ return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::number( nIndex ));
}
else if ( aRangeRepresentation == "last" )
{
sal_Int32 nIndex = (m_bDataInColumns
? m_aInternalData.getColumnCount()
: m_aInternalData.getRowCount()) - 1;
- return lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIndex ));
+ return lcl_createDataSequenceAndAddToMap( OUString::number( nIndex ));
}
else if( !aRangeRepresentation.isEmpty())
{
@@ -836,7 +836,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
if( nLevelCount == 1 )
{
sal_Int32 nL=0;
- aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::valueOf( nL ) );
+ aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( nL ) );
}
else
{
@@ -953,8 +953,8 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
throw (uno::RuntimeException)
{
- lcl_deleteMapReferences( OUString::valueOf( nAtIndex ));
- lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nAtIndex ));
+ lcl_deleteMapReferences( OUString::number( nAtIndex ));
+ lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex ));
if( m_bDataInColumns )
{
lcl_decreaseMapReferences( nAtIndex + 1, m_aInternalData.getColumnCount());
@@ -1028,7 +1028,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
- tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+ tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
::std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1052,7 +1052,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
- tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+ tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
::std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1072,7 +1072,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
- tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+ tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
::std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1193,18 +1193,18 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
if( aRange.aUpperLeft.nColumn == 0 )
return lcl_aCategoriesRangeName;
if( aRange.aUpperLeft.nRow == 0 )
- return lcl_aLabelRangePrefix + OUString::valueOf( aRange.aUpperLeft.nColumn - 1 );
+ return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nColumn - 1 );
- return OUString::valueOf( aRange.aUpperLeft.nColumn - 1 );
+ return OUString::number( aRange.aUpperLeft.nColumn - 1 );
}
// data in rows
if( aRange.aUpperLeft.nRow == 0 )
return lcl_aCategoriesRangeName;
if( aRange.aUpperLeft.nColumn == 0 )
- return lcl_aLabelRangePrefix + OUString::valueOf( aRange.aUpperLeft.nRow - 1 );
+ return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nRow - 1 );
- return OUString::valueOf( aRange.aUpperLeft.nRow - 1 );
+ return OUString::number( aRange.aUpperLeft.nRow - 1 );
}
namespace
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9c09aab..b6da8e8 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -467,7 +467,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
{
aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel );
aRet.appendAscii(":CS=");
- aRet.append( OUString::valueOf( nCooSysIndex ) );
+ aRet.append( OUString::number( nCooSysIndex ) );
break;
}
}
@@ -482,9 +482,9 @@ OUString ObjectIdentifier::createParticleForAxis(
{
OUStringBuffer aRet("Axis=");
- aRet.append( OUString::valueOf( nDimensionIndex ) );
+ aRet.append( OUString::number( nDimensionIndex ) );
aRet.appendAscii(",");
- aRet.append( OUString::valueOf( nAxisIndex ) );
+ aRet.append( OUString::number( nAxisIndex ) );
return aRet.makeStringAndClear();
}
@@ -494,9 +494,9 @@ OUString ObjectIdentifier::createParticleForGrid(
, sal_Int32 nAxisIndex )
{
OUStringBuffer aRet("Axis=");
- aRet.append( OUString::valueOf( nDimensionIndex ) );
+ aRet.append( OUString::number( nDimensionIndex ) );
aRet.appendAscii(",");
- aRet.append( OUString::valueOf( nAxisIndex ) );
+ aRet.append( OUString::number( nAxisIndex ) );
aRet.append( ":Grid=0" );
return aRet.makeStringAndClear();
@@ -527,15 +527,15 @@ OUString ObjectIdentifier::createParticleForSeries(
OUStringBuffer aRet;
aRet.appendAscii("D=");
- aRet.append( OUString::valueOf( nDiagramIndex ) );
+ aRet.append( OUString::number( nDiagramIndex ) );
aRet.appendAscii(":CS=");
- aRet.append( OUString::valueOf( nCooSysIndex ) );
+ aRet.append( OUString::number( nCooSysIndex ) );
aRet.appendAscii(":CT=");
- aRet.append( OUString::valueOf( nChartTypeIndex ) );
+ aRet.append( OUString::number( nChartTypeIndex ) );
aRet.appendAscii(":");
aRet.append(getStringForType( OBJECTTYPE_DATA_SERIES ));
aRet.appendAscii("=");
- aRet.append( OUString::valueOf( nSeriesIndex ) );
+ aRet.append( OUString::number( nSeriesIndex ) );
return aRet.makeStringAndClear();
}
@@ -601,15 +601,15 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString(
, const awt::Point& rMinimumPosition
, const awt::Point& rMaximumPosition )
{
- OUStringBuffer aRet( OUString::valueOf( nOffsetPercent ) );
+ OUStringBuffer aRet( OUString::number( nOffsetPercent ) );
aRet.append( sal_Unicode( ',' ));
- aRet.append( OUString::valueOf( rMinimumPosition.X ) );
+ aRet.append( OUString::number( rMinimumPosition.X ) );
aRet.append( sal_Unicode( ',' ));
- aRet.append( OUString::valueOf( rMinimumPosition.Y ) );
+ aRet.append( OUString::number( rMinimumPosition.Y ) );
aRet.append( sal_Unicode( ',' ));
- aRet.append( OUString::valueOf( rMaximumPosition.X ) );
+ aRet.append( OUString::number( rMaximumPosition.X ) );
aRet.append( sal_Unicode( ',' ));
- aRet.append( OUString::valueOf( rMaximumPosition.Y ) );
+ aRet.append( OUString::number( rMaximumPosition.Y ) );
return aRet.makeStringAndClear();
}
@@ -984,7 +984,7 @@ OUString ObjectIdentifier::createDataCurveCID(
, sal_Int32 nCurveIndex
, bool bAverageLine )
{
- OUString aParticleID( OUString::valueOf( nCurveIndex ) );
+ OUString aParticleID( OUString::number( nCurveIndex ) );
ObjectType eType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE;
return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle );
}
@@ -993,7 +993,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
const OUString& rSeriesParticle
, sal_Int32 nCurveIndex )
{
- OUString aParticleID( OUString::valueOf( nCurveIndex ) );
+ OUString aParticleID( OUString::number( nCurveIndex ) );
return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
}
@@ -1015,7 +1015,7 @@ OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType,
if( !aRet.isEmpty() )
{
aRet.appendAscii("=");
- aRet.append(OUString::valueOf(nIndex));
+ aRet.append(OUString::number(nIndex));
}
return aRet.makeStringAndClear();
}
@@ -1045,7 +1045,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
OUString ObjectIdentifier::createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex )
{
OUString aRet(rPointCID_Stub);
- return aRet+=OUString::valueOf( nIndex );
+ return aRet+=OUString::number( nIndex );
}
OUString ObjectIdentifier::getParticleID( const OUString& rCID )
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 96990b8..2ca570a 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -152,7 +152,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
if( aMaxIt != aNumbers.end())
nIndex = (*aMaxIt) + 1;
- aUniqueName = rPrefix + OUString::valueOf( nIndex );
+ aUniqueName = rPrefix + OUString::number( nIndex );
}
OSL_ASSERT( !aUniqueName.isEmpty());
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f783e24..5dda2a2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2451,7 +2451,7 @@ void ChartView::createShapes()
//create the group shape for diagram and axes first to have title and legends on top of it
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
- OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
+ OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) ) );//todo: other index if more than one diagram is possible
uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) );
uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 645fd06..6516b17 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -355,7 +355,7 @@ bool FileStream::write(void const * buffer, sal_uInt64 size) {
FileStream &operator<<(FileStream& o, sal_uInt32 i) {
sal_uInt64 writtenBytes;
- OString s = OString::valueOf((sal_Int32)i);
+ OString s = OString::number(i);
osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 94c9348..2d7df99 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -237,7 +237,7 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName()
do
{
aStr = aPersistName;
- aStr += OUString::valueOf( i++ );
+ aStr += OUString::number( i++ );
}
while( HasEmbeddedObject( aStr ) );
// TODO/LATER: should we consider deleted objects?
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index c9ddbee..9cf551a 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -42,7 +42,7 @@ inline void appendChar( OUStringBuffer & buf, sal_Unicode c )
if (c < ' ' || c > '~') {
buf.append( "\\X" );
OUString const s(
- OUString::valueOf( static_cast< sal_Int32 >(c), 16 ) );
+ OUString::number( static_cast< sal_Int32 >(c), 16 ) );
for ( sal_Int32 f = 4 - s.getLength(); f > 0; --f )
buf.append( static_cast< sal_Unicode >('0') );
buf.append( s );
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 68ef68c..4fd5274 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -55,8 +55,8 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
- aResult += OUString::valueOf( nDigit1, 16 );
- aResult += OUString::valueOf( nDigit2, 16 );
+ aResult += OUString::number( nDigit1, 16 );
+ aResult += OUString::number( nDigit2, 16 );
}
}
diff --git a/compilerplugins/clang/valueof.cxx b/compilerplugins/clang/valueof.cxx
new file mode 100644
index 0000000..7f00ff6
--- /dev/null
+++ b/compilerplugins/clang/valueof.cxx
@@ -0,0 +1,148 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+/*
+This is a rewriter.
+
+Replaces all calls to the deprecated O(U)String::valueOf() .
+
+*/
+
+#include "plugin.hxx"
+
+namespace loplugin
+{
+
+class ConvertValueOf
+ : public RecursiveASTVisitor< ConvertValueOf >
+ , public RewritePlugin
+ {
+ public:
+ explicit ConvertValueOf( CompilerInstance& compiler, Rewriter& rewriter );
+ virtual void run() override;
+ bool VisitCallExpr( const CallExpr* call );
+ private:
+ void removeCast( const Expr* arg );
+ };
+
+ConvertValueOf::ConvertValueOf( CompilerInstance& compiler, Rewriter& rewriter )
+ : RewritePlugin( compiler, rewriter )
+ {
+ }
+
+void ConvertValueOf::run()
+ {
+ TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
+ }
+
+bool ConvertValueOf::VisitCallExpr( const CallExpr* call )
+ {
+ if( ignoreLocation( call ))
+ return true;
+ // Using getDirectCallee() here means that we find only calls
+ // that call the function directly (i.e. not using a pointer, for example).
+ // Use getCallee() to include also those :
+ // if( const FunctionDecl* func = dyn_cast_or_null< FunctionDecl >( call->getCalleeDecl()))
+ if( const FunctionDecl* func = call->getDirectCallee())
+ {
+ // Optimize, getQualifiedNameAsString() is reportedly expensive,
+ // so first check fast details like number of arguments or the (unqualified)
+ // name before checking the fully qualified name.
+ // See FunctionDecl for all the API about the function.
+ if( func->getIdentifier() != NULL
+ && ( func->getName() == "valueOf" ))
+ {
+ string qualifiedName = func->getQualifiedNameAsString();
+ if( qualifiedName == "rtl::OString::valueOf" )
+ {
+ // Further checks about arguments. Check mainly ParmVarDecl, VarDecl,
+ // ValueDecl and QualType for Clang API details.
+ string arg0 = func->getParamDecl( 0 )->getType().getAsString();
+ if( arg0 == "sal_Bool" )
+ replaceText( call->getCallee()->getSourceRange(), "OString::boolean" );
+ else if( arg0 == "sal_Char" )
+ replaceText( call->getCallee()->getSourceRange(), "OString" );
+ else
+ {
+ replaceText( call->getCallee()->getSourceRange(), "OString::number" );
+ removeCast( call->getArg( 0 ));
+ }
+ }
+ if( qualifiedName == "rtl::OUString::valueOf" )
+ {
+ // Further checks about arguments. Check mainly ParmVarDecl, VarDecl,
+ // ValueDecl and QualType for Clang API details.
+ string arg0 = func->getParamDecl( 0 )->getType().getAsString();
+ if( arg0 == "sal_Bool" )
+ replaceText( call->getCallee()->getSourceRange(), "OUString::boolean" );
+ else if( arg0 == "sal_Unicode" )
+ replaceText( call->getCallee()->getSourceRange(), "OUString" );
+ else
+ {
+ replaceText( call->getCallee()->getSourceRange(), "OUString::number" );
+ removeCast( call->getArg( 0 ));
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+void ConvertValueOf::removeCast( const Expr* arg )
+ {
+ arg = arg->IgnoreImpCasts();
+ if( const ExplicitCastExpr* cast = dyn_cast< ExplicitCastExpr >( arg ))
+ {
+// Explicit casts don't seem to actually always change the type (integer promotion
+// takes place first?), so remove also preceding implicit casts:
+// void f( int );
+// char a;
+// f( int( a ));
+// |-CallExpr 0x1a84f20 <line:6:5, col:16> 'void'
+// | |-ImplicitCastExpr 0x1a84f08 <col:5> 'void (*)(int)' <FunctionToPointerDecay>
+// | | `-DeclRefExpr 0x1a84eb8 <col:5> 'void (int)' lvalue Function 0x1a58900 'f' 'void (int)'
+// | `-CXXFunctionalCastExpr 0x1a84e90 <col:8, col:15> 'int' functional cast to int <NoOp>
+// | `-ImplicitCastExpr 0x1a84e78 <col:13> 'int' <IntegralCast>
+// | `-ImplicitCastExpr 0x1a84e60 <col:13> 'char' <LValueToRValue>
+// | `-DeclRefExpr 0x1a58b88 <col:13> 'char' lvalue Var 0x1a58ab0 'a' 'char'
+ const Expr* castFrom = cast->getSubExpr()->IgnoreImpCasts();
+ if( cast->getType()->isIntegerType() && castFrom->getType()->isIntegerType())
+ {
+ string fromType = castFrom->getType().getAsString();
+ if( fromType != "sal_Bool" && fromType != "bool" && fromType != "sal_Char" && fromType != "sal_Unicode" )
+ {
+ if( const CXXFunctionalCastExpr* funcCast = dyn_cast< CXXFunctionalCastExpr >( cast ))
+ {
+ removeText( CharSourceRange::getCharRange( funcCast->getLocStart(),
+ compiler.getSourceManager().getExpansionLoc( funcCast->getSubExpr()->getLocStart())));
+ removeText( CharSourceRange::getCharRange( locationAfterToken(
+ compiler.getSourceManager().getExpansionLoc( funcCast->getSubExpr()->getLocEnd())),
+ locationAfterToken( funcCast->getLocEnd())));
+ }
+ else if( const CXXNamedCastExpr* namedCast = dyn_cast< CXXNamedCastExpr >( cast ))
+ {
+ removeText( CharSourceRange::getCharRange( namedCast->getLocStart(),
+ compiler.getSourceManager().getExpansionLoc( namedCast->getSubExpr()->getLocStart())));
+ removeText( CharSourceRange::getCharRange( locationAfterToken(
+ compiler.getSourceManager().getExpansionLoc( namedCast->getSubExpr()->getLocEnd())),
+ locationAfterToken( namedCast->getLocEnd())));
+ }
+ else if( const CStyleCastExpr* cCast = dyn_cast< CStyleCastExpr >( cast ))
+ removeText( SourceRange( cCast->getLocStart(), cCast->getRParenLoc()));
+ else
+ abort();
+ }
+ }
+ }
+ }
+
+static Plugin::Registration< ConvertValueOf > X( "convertvalueof" );
+
+} // namespace
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 1ab181c..f099acf 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -176,15 +176,15 @@ void writeValueContent(oslFileHandle handle, sal_Int16 value) {
}
void writeValueContent(oslFileHandle handle, sal_Int32 value) {
- writeData(handle, OString::valueOf(value));
+ writeData(handle, OString::number(value));
}
void writeValueContent(oslFileHandle handle, sal_Int64 value) {
- writeData(handle, OString::valueOf(value));
+ writeData(handle, OString::number(value));
}
void writeValueContent(oslFileHandle handle, double value) {
- writeData(handle, OString::valueOf(value));
+ writeData(handle, OString::number(value));
}
void writeValueContent(oslFileHandle handle, OUString const & value) {
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 8506fef..4b9f620 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -225,7 +225,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL
{
sal_Int32 nValue = 0;
if ( pBegin->Value >>= nValue )
- sValue = OUString::valueOf(nValue);
+ sValue = OUString::number(nValue);
else
{
Sequence< OUString> aSeq;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index fd51bfd..a4880d4 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1454,12 +1454,12 @@ OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString&
OUString sName( _rBaseName );
sal_Int32 nPos = 1;
if ( _bStartWithNumber )
- sName += OUString::valueOf( nPos );
+ sName += OUString::number( nPos );
while ( aUsedNames.find( sName ) != aUsedNames.end() )
{
sName = _rBaseName;
- sName += OUString::valueOf( ++nPos );
+ sName += OUString::number( ++nPos );
}
return sName;
}
@@ -1976,7 +1976,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
STR_UNKNOWN_PARA_TYPE,
- "$position$", OUString::valueOf(parameterIndex)
+ "$position$", OUString::number(parameterIndex)
) );
::dbtools::throwGenericSQLException(sError,NULL);
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index bfa0750..233d249 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -955,7 +955,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
SharedResources aResources;
OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED,
"$string$", _rSource,
- "$maxlen$", OUString::valueOf( _nMaxLen ),
+ "$maxlen$", OUString::number( _nMaxLen ),
"$charset$", lcl_getEncodingName( _eEncoding )
);
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index b21a476..9f05e88 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -434,7 +434,7 @@ static OUString lcl_GetColumnStr( sal_Int32 nColumn )
{
//SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetColumnStr" );
if ( nColumn < 26 )
- return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
+ return OUString( (sal_Unicode) ( 'A' + nColumn ) );
else
{
OUStringBuffer aBuffer(2);
@@ -504,7 +504,7 @@ void OCalcTable::fillColumns()
sal_Int32 nExprCnt = 0;
while(aFind != m_aColumns->get().end())
{
- (aAlias = aColumnName) += OUString::valueOf((sal_Int32)++nExprCnt);
+ (aAlias = aColumnName) += OUString::number(++nExprCnt);
aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
}
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index b4f445f..7f0c00c 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -976,13 +976,13 @@ OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, Runti
OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException)
{
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getDriverVersion" );
- return OUString::valueOf((sal_Int32)1);
+ return OUString::number(1);
}
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException)
{
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getDatabaseProductVersion" );
- return OUString::valueOf((sal_Int32)0);
+ return OUString::number(0);
}
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 175fd48..d34c526 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -350,7 +350,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
{
const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
STR_UNKNOWN_PARA_TYPE,
- "$position$", OUString::valueOf(parameterIndex)
+ "$position$", OUString::number(parameterIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 15e49ff..acac9ac 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -114,7 +114,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
return ORowSetValue();
}
if ( lhs.size() == 2 )
- return OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1);
+ return OUString::number(lhs[0].getString().indexOf(lhs[1].getString())+1);
else if ( lhs.size() != 3 )
return ORowSetValue();
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 75f804e..899ad14 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -110,7 +110,7 @@ namespace connectivity
OUString lcl_getNextCount()
{
static sal_Int32 s_nCount = 0;
- return OUString::valueOf(s_nCount++);
+ return OUString::number(s_nCount++);
}
// -----------------------------------------------------------------------------
OUString StorageContainer::removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL)
@@ -295,7 +295,7 @@ namespace connectivity
sMessage += "\nMode: 0x";
if ( _nMode < 16 )
sMessage += "0";
- sMessage += OString::valueOf( _nMode, 16 ).toAsciiUpperCase();
+ sMessage += OString::number( _nMode, 16 ).toAsciiUpperCase();
OSL_FAIL( sMessage.getStr() );
#endif
StorageContainer::throwJavaException(e,env);
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 0458ad7..59a4b29 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -389,7 +389,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c
{
const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
STR_UNKNOWN_PARA_TYPE,
- "$position$", OUString::valueOf(parameterIndex)
+ "$position$", OUString::number(parameterIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 6664ee0..34526ca 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -842,7 +842,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
STR_UNKNOWN_COLUMN_TYPE,
- "$position$", OUString::valueOf(columnIndex)
+ "$position$", OUString::number(columnIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 1f7e879..a850bde 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -654,13 +654,13 @@ OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, Runti
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
{
- OUString aValue = OUString::valueOf((sal_Int32)1);
+ OUString aValue = OUString::number(1);
return aValue;
}
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException)
{
- OUString aValue = OUString::valueOf((sal_Int32)0);
+ OUString aValue = OUString::number(0);
return aValue;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 7486f3f..c439d05 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -936,7 +936,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
// Determine where '%' character is...
- if ( matchString.equals( OUString::valueOf( WILDCARD ) ) )
+ if ( matchString.equals( OUString( WILDCARD ) ) )
{
// String containing only a '%' and nothing else
op = MQueryOp::Exists;
@@ -1787,7 +1787,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
{
const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution(
STR_COLUMN_NOT_UPDATEABLE,
- "$position$", OUString::valueOf(columnIndex)
+ "$position$", OUString::number(columnIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
} // if (!::dbtools::implUpdateObject(this, columnIndex, x))
@@ -1800,7 +1800,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
{
const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution(
STR_COLUMN_NOT_UPDATEABLE,
- "$position$", OUString::valueOf(columnIndex)
+ "$position$", OUString::number(columnIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 5d234c4..c0e4f0d 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -932,8 +932,8 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(STR_WRONG_PARAM_INDEX,
- "$pos$", OUString::valueOf(_parameterIndex),
- "$count$", OUString::valueOf((sal_Int32)numParams)
+ "$pos$", OUString::number(_parameterIndex),
+ "$count$", OUString::number(numParams)
));
SQLException aNext(sError,*this, OUString(),0,Any());
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 365f920..8e442f2 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -209,7 +209,7 @@ void OTools::bindValue( OConnection* _pConnection,
case SQL_DECIMAL:
case SQL_NUMERIC:
{
- OString aString = OString::valueOf(*(double*)_pValue);
+ OString aString = OString::number(*(double*)_pValue);
_nMaxLen = (SQLSMALLINT)aString.getLength();
*pLen = _nMaxLen;
*((OString*)_pData) = aString;
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 2442bba..8ec5b6b 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1635,12 +1635,12 @@ static void columnMetaData2DatabaseTypeDescription(
// row[9] RADIX TODO
if( xRow->getBoolean( 6 ) && ! isSystemColumn(xRow->getInt( 12 )) )
{
- row[10] <<= OUString::valueOf(com::sun::star::sdbc::ColumnValue::NO_NULLS);
+ row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NO_NULLS);
row[17] <<= statics.NO;
}
else
{
- row[10] <<= OUString::valueOf(com::sun::star::sdbc::ColumnValue::NULLABLE);
+ row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NULLABLE);
row[17] <<= statics.YES;
}
@@ -1865,7 +1865,7 @@ static void columnMetaData2DatabaseTypeDescription(
if( tableOid != lastTableOid )
index = 1;
lastTableOid = tableOid;
- row[4] <<= OUString::valueOf( index );
+ row[4] <<= OUString::number( index );
index ++;
}
{
@@ -2305,14 +2305,14 @@ static void pgTypeInfo2ResultSet(
}
row[TYPE_NAME] <<= xRow->getString(1);
- row[DATA_TYPE] <<= OUString::valueOf(dataType);
- row[PRECISION] <<= OUString::valueOf( precision );
+ row[DATA_TYPE] <<= OUString::number(dataType);
+ row[PRECISION] <<= OUString::number( precision );
sal_Int32 nullable = xRow->getBoolean(4) ?
com::sun::star::sdbc::ColumnValue::NO_NULLS :
com::sun::star::sdbc::ColumnValue::NULLABLE;
- row[NULLABLE] <<= OUString::valueOf(nullable);
- row[CASE_SENSITIVE] <<= OUString::valueOf((sal_Int32)1);
- row[SEARCHABLE] <<= OUString::valueOf( calcSearchable( dataType ) );
+ row[NULLABLE] <<= OUString::number(nullable);
+ row[CASE_SENSITIVE] <<= OUString::number(1);
+ row[SEARCHABLE] <<= OUString::number( calcSearchable( dataType ) );
row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); //
if( com::sun::star::sdbc::DataType::INTEGER == dataType ||
com::sun::star::sdbc::DataType::BIGINT == dataType )
@@ -2320,7 +2320,7 @@ static void pgTypeInfo2ResultSet(
else
row[AUTO_INCREMENT] <<= OUString("0"); // TODO
row[MINIMUM_SCALE] <<= OUString("0"); // TODO: what is this ?
- row[MAXIMUM_SCALE] <<= OUString::valueOf( getMaxScale( dataType ) );
+ row[MAXIMUM_SCALE] <<= OUString::number( getMaxScale( dataType ) );
row[NUM_PREC_RADIX] <<= OUString("10"); // TODO: what is this ?
(void)FIXED_PREC_SCALE;
vec.push_back( row );
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index fb82b99..23ef836 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -668,7 +668,7 @@ void PreparedStatement::setObjectWithInfo(
OUString myString;
if( x >>= myDouble )
{
- myString = OUString::valueOf( myDouble );
+ myString = OUString::number( myDouble );
}
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index ec000a5..b0d1c74 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -462,7 +462,7 @@ void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw
// buf.append( "'" );
// buf.append( (sal_Int64) x );
// buf.append( "'" );
- m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+ m_updateableField[columnIndex-1].value <<= OUString::number( x );
}
void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException)
@@ -472,7 +472,7 @@ void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (S
checkClosed();
checkUpdate( columnIndex );
- m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+ m_updateableField[columnIndex-1].value <<= OUString::number( x );
}
void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException)
@@ -481,7 +481,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw
checkClosed();
checkUpdate( columnIndex );
- m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+ m_updateableField[columnIndex-1].value <<= OUString::number( x );
}
void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException)
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 60ed5b0..d687b69 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -138,7 +138,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
sal_Int32 searchIndex=1;
while(_rColumns.find(sAlias) != _rColumns.end())
{
- (sAlias = sLabel) += OUString::valueOf(searchIndex++);
+ (sAlias = sLabel) += OUString::number(searchIndex++);
}
sLabel = sAlias;
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 12b4480..1237120 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1141,7 +1141,7 @@ namespace
{
if ( _rParentNode.getChild(i) == &_rParamNode )
{
- sColumnName += OUString::valueOf( i+1 );
+ sColumnName += OUString::number( i+1 );
break;
}
}
@@ -1854,7 +1854,7 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName
sal_Int32 i=1;
while(aIter != m_aSelectColumns->get().end())
{
- (aAlias = rColumnName) += OUString::valueOf(i++);
+ (aAlias = rColumnName) += OUString::number(i++);
aIter = find(
m_aSelectColumns->get().begin(),
m_aSelectColumns->get().end(),
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 1c748ab..db00487 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1150,7 +1150,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,m_pData->aLocale,0,OUString(),KParseType::ANY_NUMBER,OUString());
if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength())
{
- aValue = OUString::valueOf(aResult.Value);
+ aValue = OUString::number(aResult.Value);
sal_Int32 nPos = aValue.lastIndexOf('.');
if((nPos+_nScale) < aValue.getLength())
aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,OUString());
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 2bf5326..bbed171 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -310,7 +310,7 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsEx
{
::osl::MutexGuard aGuard(m_rMutex);
if (Index < 0 || Index >= m_pElements->size() )
- throw IndexOutOfBoundsException(OUString::valueOf(Index),static_cast<XTypeProvider*>(this));
+ throw IndexOutOfBoundsException(OUString::number(Index),static_cast<XTypeProvider*>(this));
return makeAny(getObject(Index));
}
@@ -413,7 +413,7 @@ void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, In
{
::osl::MutexGuard aGuard(m_rMutex);
if(index <0 || index >= getCount())
- throw IndexOutOfBoundsException(OUString::valueOf(index),static_cast<XTypeProvider*>(this));
+ throw IndexOutOfBoundsException(OUString::number(index),static_cast<XTypeProvider*>(this));
dropImpl(index);
}
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 79cec37..1390e565 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -951,7 +951,7 @@ inline void EnvironmentsData::getEnvironment(
}
OUString aKey(
- OUString::valueOf( reinterpret_cast< sal_IntPtr >(pContext) ) );
+ OUString::number( reinterpret_cast< sal_IntPtr >(pContext) ) );
aKey += rEnvDcp;
// try to find registered mapping
@@ -971,7 +971,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
uno_Environment * pEnv = *ppEnv;
OUString aKey(
- OUString::valueOf( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) );
+ OUString::number( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) );
aKey += pEnv->pTypeName;
// try to find registered environment
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index f1d7c52..65ddfa7 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -513,7 +513,7 @@ rtl::OUString PropertySetMixinImpl::Impl::translateHandle(
if (handle < 0 || handle >= handleMap.getLength()) {
throw css::beans::UnknownPropertyException(
(rtl::OUString("bad handle ")
- + rtl::OUString::valueOf(handle)),
+ + rtl::OUString::number(handle)),
object);
}
return handleMap[handle];
@@ -1362,7 +1362,7 @@ void PropertySetMixinImpl::setPropertyValues(
(rtl::OUString("name ")
+ props[i].Name
+ rtl::OUString(" does not match handle ")
- + rtl::OUString::valueOf(props[i].Handle)),
+ + rtl::OUString::number(props[i].Handle)),
static_cast< css::beans::XPropertySet * >(this));
}
m_impl->setProperty(
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7e1d9a3..6277eaf 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -231,8 +231,8 @@ OUString
replaceSixteen( const OUString& str, sal_Int32 nReplacement )
{
OUString result( str );
- OUString sixteen = OUString::valueOf( (sal_Int32)16 );
- OUString expected = OUString::valueOf( nReplacement );
+ OUString sixteen = OUString::number( 16 );
+ OUString expected = OUString::number( nReplacement );
sal_Int32 len = sixteen.getLength();
sal_Int32 index = result.indexOf( sixteen );
@@ -261,12 +261,12 @@ generateCustomName(
if ( pos != -1 )
{
name = prefix.replaceAt(
- pos, placeholder.getLength(), OUString::valueOf( suffix ) );
+ pos, placeholder.getLength(), OUString::number( suffix ) );
}
else
{
// no placeholder found so just append the suffix
- name = prefix + OUString::valueOf( suffix );
+ name = prefix + OUString::number( suffix );
}
// now check is there is an already existing entry with this name
@@ -307,7 +307,7 @@ generateCustomURL(
url += OUString(CUSTOM_TOOLBAR_STR );
// use a random number to minimize possible clash with existing custom toolbars
- url += OUString::valueOf( sal_Int64( generateRandomValue() ), 16 );
+ url += OUString::number( generateRandomValue(), 16 );
// now check is there is an already existing entry with this url
SvxEntries::const_iterator iter = entries->begin();
@@ -339,7 +339,7 @@ generateCustomMenuURL(
sal_Int32 suffix = 1 )
{
OUString url(CUSTOM_MENU_STR );
- url += OUString::valueOf( suffix );
+ url += OUString::number( suffix );
// now check is there is an already existing entry with this url
SvxEntries::const_iterator iter = entries->begin();
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index d5249dd..28b3ee4 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -451,7 +451,7 @@ void SfxConfigGroupListBox_Impl::InitModule()
for (i1=0; i1<c1; ++i1)
{
sal_Int16& rGroupID = lGroups[i1];
- OUString sGroupID = OUString::valueOf((sal_Int32)rGroupID);
+ OUString sGroupID = OUString::number(rGroupID);
OUString sGroupName ;
try
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 98e8a38..0d9a532 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -459,7 +459,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
}
sal_Int32 gid = gids[i];
- OUString idx = OUString::valueOf( gid );
+ OUString idx = OUString::number( gid );
OUString group = idx;
try
{
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index b0a73ef..f6b26ff 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1329,7 +1329,7 @@ OUString GetErrorMessage(
}
if ( eScriptError.lineNum != -1 )
{
- line = OUString::valueOf( eScriptError.lineNum );
+ line = OUString::number( eScriptError.lineNum );
unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
}
else
@@ -1369,7 +1369,7 @@ OUString GetErrorMessage(
if ( eScriptException.lineNum != -1 )
{
- line = OUString::valueOf( eScriptException.lineNum );
+ line = OUString::number( eScriptException.lineNum );
unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
}
else
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 2e9c670..9084b8d 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -202,7 +202,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
sal_Int32 nVal = 0;
if(aProp >>= nVal)
{
- OUString aNumber( OUString::valueOf( nVal ) );
+ OUString aNumber( OUString::number( nVal ) );
sValue = aNumber;
}
}
@@ -213,7 +213,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
sal_Bool bVal = sal_False;
if(aProp >>= bVal )
{
- OUString sBoolean( OUString::valueOf( bVal ) );
+ OUString sBoolean( OUString::boolean( bVal ) );
sValue = sBoolean;
}
}
@@ -242,7 +242,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
{
for(sal_Int16 nInd=0; nInd < seqLong.getLength(); ++nInd)
{
- OUString sNumber( OUString::valueOf(seqLong[nInd]) );
+ OUString sNumber( OUString::number(seqLong[nInd]) );
sValue += sNumber;
sValue += OUString(",");
}
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 7ba03b9..189ead2 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -173,7 +173,7 @@ void WebConnectionInfoDialog::FillPasswordList()
for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ )
{
OUString aUIEntry( aURLEntries[nURLInd].Url );
- aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
+ aUIEntry += OUString( (sal_Unicode)'\t' );
aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName;
SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
@@ -189,7 +189,7 @@ void WebConnectionInfoDialog::FillPasswordList()
for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
{
OUString aUIEntry( aUrls[ nURLIdx ] );
- aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
+ aUIEntry += OUString( (sal_Unicode)'\t' );
aUIEntry += OUString( "*" );
SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index fdf5e77..0f635d6 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -677,10 +677,10 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
sTemp += " ";
sTemp += CUI_RESSTR( STR_PPI );
- OUString sPPI = OUString::valueOf(ax);
+ OUString sPPI = OUString::number(ax);
if (abs(ax - ay) > 1) {
sPPI += OUString( sal_Unicode (0x00D7) );
- sPPI += OUString::valueOf(ay);
+ sPPI += OUString::number(ay);
}
sTemp = sTemp.replaceAll("%1", sPPI);
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a952c89..f089348 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -144,7 +144,7 @@ void SvxNumberPreview::Paint( const Rectangle& )
if ( mnPos != STRING_NOTFOUND )
{
- long nCharWidth = GetTextWidth( OUString::valueOf( mnChar ) );
+ long nCharWidth = GetTextWidth( OUString( mnChar ) );
int nNumCharsToInsert = 0;
if (nCharWidth > 0) nNumCharsToInsert = nLeadSpace / nCharWidth;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 24dfe30..5412625 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1244,7 +1244,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if(pSaveNum->GetLevelCount() > 1)
{
OUString sEntry( "1 - " );
- sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
+ sEntry += OUString::number( pSaveNum->GetLevelCount() );
m_pLevelLB->InsertEntry(sEntry);
m_pLevelLB->SelectEntry(sEntry);
}
@@ -2996,7 +2996,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
if(pSaveNum->GetLevelCount() > 1)
{
OUString sEntry( "1 - " );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list