[Libreoffice-commits] core.git: 60 commits - avmedia/source basctl/source basic/qa basic/source chart2/qa chart2/source connectivity/source cui/source dbaccess/qa dbaccess/source desktop/source dtrans/source editeng/qa editeng/source embeddedobj/source extensions/source filter/source forms/source formula/source fpicker/source framework/inc framework/source hwpfilter/source i18nlangtag/qa i18npool/qa i18npool/source include/framework include/tools include/unotools linguistic/source lotuswordpro/source oox/source opencl/source reportdesign/source sax/source scaddins/source sccomp/source sc/qa scripting/source sc/source sdext/source sd/qa sd/source sfx2/source shell/source slideshow/source sot/source starmath/source stoc/source svgio/source svl/source svtools/source svx/source sw/inc sw/qa sw/source test/source testtools/source toolkit/source ucbhelper/source ucb/source unotest/source unotools/source unoxml/source uui/source vcl/osx vcl/source writerfilter/source writerperfect/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Thu Dec 18 05:13:28 PST 2014
avmedia/source/framework/soundhandler.cxx | 3
avmedia/source/opengl/oglframegrabber.cxx | 2
avmedia/source/opengl/oglmanager.cxx | 2
avmedia/source/opengl/oglplayer.cxx | 2
avmedia/source/opengl/oglwindow.cxx | 2
avmedia/source/quicktime/framegrabber.mm | 2
avmedia/source/quicktime/manager.mm | 2
avmedia/source/quicktime/player.mm | 2
avmedia/source/quicktime/window.mm | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/moduldlg.cxx | 4
basic/qa/cppunit/test_scanner.cxx | 60 ++--
basic/source/classes/sb.cxx | 2
basic/source/classes/sbunoobj.cxx | 2
basic/source/comp/dim.cxx | 6
basic/source/comp/exprtree.cxx | 2
basic/source/comp/scanner.cxx | 2
basic/source/comp/symtbl.cxx | 2
basic/source/runtime/inputbox.cxx | 2
basic/source/runtime/methods.cxx | 8
basic/source/runtime/runtime.cxx | 12
basic/source/sbx/sbxobj.cxx | 2
basic/source/sbx/sbxvalue.cxx | 2
basic/source/uno/namecont.cxx | 4
basic/source/uno/scriptcont.cxx | 4
chart2/qa/extras/chart2import.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 4
chart2/source/controller/dialogs/DataBrowser.cxx | 18 -
chart2/source/controller/dialogs/DataBrowserModel.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 8
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/ChartFrameloader.cxx | 2
chart2/source/inc/servicenames.hxx | 16 -
chart2/source/inc/servicenames_charttypes.hxx | 22 -
chart2/source/model/filter/XMLFilter.cxx | 4
chart2/source/model/main/ChartModel_Persistence.cxx | 6
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 4
chart2/source/model/template/StockChartTypeTemplate.cxx | 6
chart2/source/tools/AxisHelper.cxx | 6
chart2/source/tools/ChartTypeHelper.cxx | 26 +-
chart2/source/tools/ConfigColorScheme.cxx | 2
chart2/source/tools/DataSourceHelper.cxx | 2
chart2/source/tools/DiagramHelper.cxx | 2
chart2/source/tools/InternalDataProvider.cxx | 16 -
chart2/source/tools/MediaDescriptorHelper.cxx | 2
chart2/source/tools/RegressionCurveCalculator.cxx | 4
chart2/source/tools/RegressionCurveHelper.cxx | 4
chart2/source/view/axes/VCoordinateSystem.cxx | 4
chart2/source/view/charttypes/GL3DBarChart.cxx | 20 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 2
chart2/source/view/main/AbstractShapeFactory.cxx | 2
chart2/source/view/main/ChartView.cxx | 8
chart2/source/view/main/GL3DRenderer.cxx | 2
chart2/source/view/main/OpenglShapeFactory.cxx | 2
connectivity/source/commontools/DriversConfig.cxx | 2
connectivity/source/drivers/calc/CConnection.cxx | 2
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 2
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/firebird/Driver.cxx | 2
connectivity/source/drivers/flat/EDatabaseMetaData.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
connectivity/source/drivers/macab/MacabDriver.cxx | 2
connectivity/source/drivers/mork/MResultSet.cxx | 6
connectivity/source/parse/sqliterator.cxx | 16 -
connectivity/source/parse/sqlnode.cxx | 11
cui/source/customize/cfg.cxx | 11
cui/source/customize/macropg.cxx | 4
cui/source/dialogs/about.cxx | 5
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 4
cui/source/dialogs/hldoctp.cxx | 2
cui/source/dialogs/hltpbase.cxx | 10
cui/source/dialogs/showcols.cxx | 2
cui/source/options/optgdlg.cxx | 4
cui/source/options/optinet2.cxx | 2
cui/source/options/optopencl.cxx | 4
cui/source/options/optpath.cxx | 4
cui/source/options/optsave.cxx | 4
cui/source/options/personalization.cxx | 6
cui/source/options/personasdochandler.cxx | 2
cui/source/tabpages/autocdlg.cxx | 5
cui/source/tabpages/backgrnd.cxx | 10
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/tparea.cxx | 2
dbaccess/qa/unit/firebird.cxx | 4
dbaccess/source/core/api/RowSet.cxx | 4
dbaccess/source/core/misc/dsntypes.cxx | 2
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 12
dbaccess/source/ui/browser/formadapter.cxx | 10
dbaccess/source/ui/browser/unodatbr.cxx | 34 +-
dbaccess/source/ui/control/charsetlistbox.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 8
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/DExport.cxx | 6
dbaccess/source/ui/misc/HtmlReader.cxx | 16 -
dbaccess/source/ui/misc/RtfReader.cxx | 6
dbaccess/source/ui/querydesign/JoinController.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 5
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 19 -
dbaccess/source/ui/tabledesign/TableController.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/deployment/gui/dp_gui_service.cxx | 2
desktop/source/deployment/inc/lockfile.hxx | 1
desktop/source/deployment/misc/lockfile.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 2
desktop/source/deployment/registry/script/dp_script.cxx | 4
desktop/source/migration/migration.cxx | 6
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 6
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
desktop/source/splash/splash.cxx | 2
dtrans/source/cnttype/mcnttype.cxx | 4
dtrans/source/cnttype/mctfentry.cxx | 5
editeng/qa/unit/core-test.cxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2
editeng/source/editeng/editview.cxx | 2
editeng/source/items/frmitems.cxx | 12
editeng/source/rtf/svxrtf.cxx | 8
embeddedobj/source/commonembedding/persistence.cxx | 6
embeddedobj/source/general/intercept.cxx | 4
embeddedobj/source/inc/docholder.hxx | 2
embeddedobj/source/msole/ownview.cxx | 3
extensions/source/dbpilots/unoautopilot.inl | 2
extensions/source/propctrlr/propcontroller.cxx | 6
extensions/source/propctrlr/stringrepresentation.cxx | 3
extensions/source/update/check/updatehdl.cxx | 2
filter/source/config/cache/filterfactory.cxx | 2
filter/source/flash/swfdialog.cxx | 2
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/svg/svgdialog.cxx | 2
filter/source/svg/svgexport.cxx | 22 -
filter/source/svg/svgwriter.cxx | 6
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 2
forms/source/component/Button.cxx | 6
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Filter.cxx | 2
forms/source/component/FormComponent.cxx | 6
forms/source/component/FormattedField.cxx | 4
forms/source/component/RadioButton.cxx | 4
forms/source/inc/FormComponent.hxx | 2
forms/source/misc/services.cxx | 2
forms/source/richtext/richtextcontrol.cxx | 14 -
forms/source/richtext/richtextmodel.cxx | 14 -
forms/source/solar/component/navbarcontrol.cxx | 28 +-
forms/source/solar/control/navtoolbar.cxx | 2
forms/source/xforms/model_ui.cxx | 2
forms/source/xforms/submission/submission_post.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 14 -
formula/source/ui/dlg/FormulaHelper.cxx | 2
formula/source/ui/dlg/formula.cxx | 14 -
fpicker/source/office/iodlg.cxx | 13 -
framework/inc/acceleratorconst.h | 10
framework/inc/classes/protocolhandlercache.hxx | 1
framework/inc/helper/statusindicatorfactory.hxx | 2
framework/inc/services.h | 14 -
framework/inc/services/layoutmanager.hxx | 2
framework/inc/targets.h | 25 -
framework/inc/uiconfiguration/imagemanager.hxx | 2
framework/inc/uielement/uicommanddescription.hxx | 2
framework/inc/uifactory/menubarfactory.hxx | 2
framework/source/accelerators/acceleratorconfiguration.cxx | 2
framework/source/accelerators/documentacceleratorconfiguration.cxx | 2
framework/source/accelerators/globalacceleratorconfiguration.cxx | 2
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 2
framework/source/accelerators/presethandler.cxx | 4
framework/source/classes/taskcreator.cxx | 10
framework/source/dispatch/closedispatcher.cxx | 4
framework/source/fwe/classes/actiontriggercontainer.cxx | 8
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 2
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 2
framework/source/fwe/classes/addonmenu.cxx | 12
framework/source/fwe/classes/addonsoptions.cxx | 126 +++-------
framework/source/fwe/classes/framelistanalyzer.cxx | 4
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 8
framework/source/fwe/xml/menudocumenthandler.cxx | 4
framework/source/fwe/xml/statusbardocumenthandler.cxx | 36 +-
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 20 -
framework/source/fwi/classes/protocolhandlercache.cxx | 2
framework/source/jobs/jobdata.cxx | 8
framework/source/jobs/jobdispatch.cxx | 2
framework/source/jobs/jobexecutor.cxx | 2
framework/source/loadenv/loadenv.cxx | 4
framework/source/loadenv/targethelper.cxx | 16 -
framework/source/recording/dispatchrecorder.cxx | 8
framework/source/services/autorecovery.cxx | 18 -
framework/source/services/desktop.cxx | 2
framework/source/services/frame.cxx | 2
framework/source/services/pathsettings.cxx | 2
framework/source/services/sessionlistener.cxx | 2
framework/source/services/substitutepathvars.cxx | 4
framework/source/services/tabwindowservice.cxx | 2
framework/source/services/taskcreatorsrv.cxx | 2
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/uicategorydescription.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 2
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 3
framework/source/uifactory/addonstoolbarfactory.cxx | 2
framework/source/uifactory/statusbarfactory.cxx | 2
framework/source/uifactory/toolbarfactory.cxx | 2
framework/source/uifactory/uicontrollerfactory.cxx | 6
framework/source/uifactory/uielementfactorymanager.cxx | 2
framework/source/uifactory/windowcontentfactorymanager.cxx | 2
framework/source/xml/acceleratorconfigurationreader.cxx | 16 -
framework/source/xml/imagesdocumenthandler.cxx | 32 +-
hwpfilter/source/hwpreader.hxx | 6
i18nlangtag/qa/cppunit/test_languagetag.cxx | 62 ++--
i18npool/qa/cppunit/test_breakiterator.cxx | 2
i18npool/source/breakiterator/breakiteratorImpl.cxx | 4
i18npool/source/calendar/calendarImpl.cxx | 2
i18npool/source/characterclassification/cclass_unicode.cxx | 2
i18npool/source/characterclassification/characterclassificationImpl.cxx | 4
i18npool/source/characterclassification/unoscripttypedetector.cxx | 2
i18npool/source/collator/collatorImpl.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
i18npool/source/indexentry/indexentrysupplier.cxx | 2
i18npool/source/inputchecker/inputsequencechecker.cxx | 2
i18npool/source/localedata/localedata.cxx | 2
i18npool/source/textconversion/textconversionImpl.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 6
include/framework/addonsoptions.hxx | 19 -
include/framework/menuconfiguration.hxx | 4
include/tools/diagnose_ex.h | 14 -
include/unotools/compatibility.hxx | 30 +-
include/unotools/dynamicmenuoptions.hxx | 8
include/unotools/historyoptions.hxx | 10
linguistic/source/dlistimp.cxx | 2
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 10
lotuswordpro/source/filter/lwpfrib.cxx | 2
lotuswordpro/source/filter/lwpmarker.cxx | 8
lotuswordpro/source/filter/lwpnotes.cxx | 2
lotuswordpro/source/filter/lwppara.cxx | 2
lotuswordpro/source/filter/xfilter/xfdocfield.cxx | 4
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfdropcap.hxx | 2
oox/source/core/relations.cxx | 4
oox/source/core/xmlfilterbase.cxx | 4
oox/source/docprop/docprophandler.cxx | 4
oox/source/drawingml/chart/objectformatter.cxx | 2
oox/source/drawingml/diagram/diagram.cxx | 2
oox/source/export/chartexport.cxx | 16 -
oox/source/export/drawingml.cxx | 12
opencl/source/openclconfig.cxx | 8
reportdesign/source/filter/xml/xmlCell.cxx | 6
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/source/filter/xml/xmlFixedContent.cxx | 6
reportdesign/source/ui/dlg/dlgpage.cxx | 4
reportdesign/source/ui/inspection/GeometryHandler.cxx | 25 +
reportdesign/source/ui/report/ReportController.cxx | 20 -
reportdesign/source/ui/report/SectionWindow.cxx | 6
sax/source/fastparser/fastparser.cxx | 4
sc/qa/extras/htmlexporttest.cxx | 2
sc/qa/unit/subsequent_export-test.cxx | 14 -
sc/qa/unit/ucalc.cxx | 4
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/inc/interpre.hxx | 2
sc/source/core/tool/address.cxx | 18 -
sc/source/core/tool/cellform.cxx | 14 -
sc/source/core/tool/compiler.cxx | 10
sc/source/core/tool/consoli.cxx | 4
sc/source/core/tool/stylehelper.cxx | 14 -
sc/source/filter/excel/xehelper.cxx | 4
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xihelper.cxx | 8
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/excel/xlpage.cxx | 4
sc/source/filter/excel/xlstyle.cxx | 6
sc/source/filter/ftools/ftools.cxx | 2
sc/source/filter/inc/xlconst.hxx | 4
sc/source/filter/xml/xmldrani.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlsorti.cxx | 18 -
sc/source/ui/Accessibility/AccessibleText.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 4
sc/source/ui/dbgui/scuiasciiopt.cxx | 36 +-
sc/source/ui/dbgui/validate.cxx | 6
sc/source/ui/docshell/arealink.cxx | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/impex.cxx | 8
sc/source/ui/miscdlgs/linkarea.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/navipi/navipi.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 26 +-
sc/source/ui/optdlg/tpusrlst.cxx | 6
sc/source/ui/pagedlg/areasdlg.cxx | 6
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 2
sc/source/ui/unoobj/appluno.cxx | 16 -
sc/source/ui/unoobj/cellsuno.cxx | 46 +--
sc/source/ui/unoobj/cursuno.cxx | 4
sc/source/ui/unoobj/dapiuno.cxx | 10
sc/source/ui/unoobj/datauno.cxx | 30 +-
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/fielduno.cxx | 2
sc/source/ui/unoobj/filtuno.cxx | 4
sc/source/ui/unoobj/fmtuno.cxx | 16 -
sc/source/ui/unoobj/funcuno.cxx | 6
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/shapeuno.cxx | 10
sc/source/ui/unoobj/srchuno.cxx | 4
sc/source/ui/unoobj/styleuno.cxx | 14 -
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbainterior.cxx | 2
sc/source/ui/vba/vbastyles.cxx | 2
sc/source/ui/vba/vbatitle.hxx | 2
sc/source/ui/vba/vbawindow.cxx | 2
sc/source/ui/vba/vbaworkbooks.cxx | 2
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/tabvwsh2.cxx | 2
sc/source/ui/view/viewdata.cxx | 76 +++---
scaddins/source/analysis/analysis.cxx | 4
scaddins/source/datefunc/datefunc.cxx | 4
scaddins/source/pricing/pricing.cxx | 4
sccomp/source/solver/CoinMPSolver.cxx | 2
sccomp/source/solver/LpsolveSolver.cxx | 2
scripting/source/basprov/basmethnode.cxx | 2
scripting/source/basprov/basprov.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 4
scripting/source/provider/URIHelper.cxx | 2
sd/qa/unit/HtmlExportTest.cxx | 2
sd/qa/unit/export-tests.cxx | 8
sd/qa/unit/import-tests.cxx | 4
sd/source/core/EffectMigration.cxx | 2
sd/source/core/drawdoc3.cxx | 6
sd/source/core/sdpage2.cxx | 2
sd/source/core/stlpool.cxx | 2
sd/source/filter/html/htmlex.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 6
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 6
sd/source/ui/dlg/TemplateScanner.cxx | 10
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 6
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.cxx | 4
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/unoidl/unopback.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/viewshe2.cxx | 4
sdext/source/minimizer/configurationaccess.cxx | 7
sdext/source/minimizer/pppoptimizerdialog.cxx | 2
sdext/source/pdfimport/filterdet.cxx | 3
sdext/source/presenter/PresenterFrameworkObserver.cxx | 2
sdext/source/presenter/PresenterScreen.cxx | 2
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appmisc.cxx | 4
sfx2/source/appl/appuno.cxx | 104 ++++----
sfx2/source/appl/fileobj.cxx | 4
sfx2/source/appl/helpinterceptor.cxx | 4
sfx2/source/appl/linkmgr2.cxx | 4
sfx2/source/appl/linksrc.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/macroloader.cxx | 2
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/openuriexternally.cxx | 3
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/config/evntconf.cxx | 14 -
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 10
sfx2/source/doc/docfile.cxx | 8
sfx2/source/doc/doctempl.cxx | 8
sfx2/source/doc/doctemplates.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/iframe.cxx | 2
sfx2/source/doc/objembed.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/plugin.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 23 -
sfx2/source/doc/zoomitem.cxx | 6
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/notify/eventsupplier.cxx | 4
sfx2/source/notify/globalevents.cxx | 2
sfx2/source/sidebar/Theme.cxx | 2
shell/source/backends/localebe/localebackend.cxx | 4
shell/source/backends/macbe/macbackend.mm | 2
shell/source/unix/exec/shellexec.cxx | 6
slideshow/source/engine/soundplayer.cxx | 2
sot/source/sdstor/stgole.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 12
starmath/source/cfgitem.cxx | 2
starmath/source/document.cxx | 8
starmath/source/mathmlimport.cxx | 2
starmath/source/parse.cxx | 2
stoc/source/invocation/invocation.cxx | 4
svgio/source/svgreader/svgdocumenthandler.cxx | 5
svl/source/items/srchitem.cxx | 24 -
svl/source/numbers/supservs.cxx | 4
svl/source/numbers/zforfind.cxx | 4
svl/source/numbers/zforlist.cxx | 2
svl/source/numbers/zformat.cxx | 10
svl/source/numbers/zforscan.cxx | 10
svl/source/passwordcontainer/passwordcontainer.cxx | 2
svl/source/uno/registerservices.cxx | 7
svtools/source/config/menuoptions.cxx | 8
svtools/source/contnr/contentenumeration.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/control/calendar.cxx | 2
svtools/source/control/inettbc.cxx | 2
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 2
svtools/source/dialogs/ServerDetailsControls.cxx | 4
svtools/source/dialogs/addresstemplate.cxx | 4
svtools/source/filter/SvFilterOptionsDialog.cxx | 2
svtools/source/graphic/graphicunofactory.cxx | 2
svtools/source/graphic/grfmgr.cxx | 6
svtools/source/misc/embedtransfer.cxx | 2
svtools/source/misc/imap.cxx | 2
svtools/source/svhtml/htmlsupp.cxx | 8
svtools/source/svhtml/parhtml.cxx | 25 -
svtools/source/svrtf/parrtf.cxx | 2
svtools/source/svrtf/svparser.cxx | 2
svtools/source/uno/fpicker.cxx | 6
svtools/source/urlobj/inetimg.cxx | 4
svx/source/accessibility/AccessibleShape.cxx | 7
svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx | 2
svx/source/dialog/docrecovery.cxx | 8
svx/source/dialog/imapdlg.cxx | 9
svx/source/dialog/imapwnd.cxx | 4
svx/source/dialog/srchdlg.cxx | 3
svx/source/fmcomp/gridcell.cxx | 24 -
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/fmservs.cxx | 4
svx/source/form/fmshimp.cxx | 10
svx/source/form/fmtools.cxx | 50 +--
svx/source/form/fmundo.cxx | 4
svx/source/form/fmvwimp.cxx | 6
svx/source/inc/docrecovery.hxx | 24 -
svx/source/inc/fmservs.hxx | 60 ++--
svx/source/inc/fmurl.hxx | 18 -
svx/source/inc/gridcols.hxx | 20 -
svx/source/items/numfmtsh.cxx | 2
svx/source/items/rotmodit.cxx | 2
svx/source/items/viewlayoutitem.cxx | 4
svx/source/items/zoomslideritem.cxx | 8
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdhdl.cxx | 4
svx/source/svdraw/svdibrow.cxx | 32 +-
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdograf.cxx | 6
svx/source/svdraw/svdomeas.cxx | 3
svx/source/svdraw/svdomedia.cxx | 2
svx/source/svdraw/svdoole2.cxx | 4
svx/source/svdraw/svdopath.cxx | 2
svx/source/svdraw/svdview.cxx | 2
svx/source/tbxctrls/Palette.cxx | 6
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 16 -
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 6
svx/source/unodraw/UnoGraphicExporter.cxx | 3
svx/source/unodraw/recoveryui.cxx | 6
svx/source/unodraw/unoshap4.cxx | 6
svx/source/unodraw/unoshape.cxx | 2
svx/source/xml/xmleohlp.cxx | 6
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 8
svx/source/xoutdev/xattr.cxx | 18 -
sw/inc/PostItMgr.hxx | 2
sw/qa/extras/globalfilter/globalfilter.cxx | 12
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 8
sw/qa/extras/uiwriter/uiwriter.cxx | 2
sw/source/core/access/acccell.cxx | 4
sw/source/core/access/accdoc.cxx | 4
sw/source/core/access/accembedded.cxx | 2
sw/source/core/access/accfootnote.cxx | 6
sw/source/core/access/accgraphic.cxx | 2
sw/source/core/access/accheaderfooter.cxx | 2
sw/source/core/access/accpage.cxx | 4
sw/source/core/access/accpara.cxx | 10
sw/source/core/access/accpreview.cxx | 2
sw/source/core/access/acctable.cxx | 2
sw/source/core/access/acctextframe.cxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/bastyp/init.cxx | 2
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docglbl.cxx | 2
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 60 ++--
sw/source/core/tox/ToxTextGenerator.cxx | 2
sw/source/core/unocore/unoframe.cxx | 10
sw/source/filter/html/css1atr.cxx | 10
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlbas.cxx | 10
sw/source/filter/html/htmlcss1.cxx | 6
sw/source/filter/html/htmlctxt.cxx | 2
sw/source/filter/html/htmldrawreader.cxx | 4
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 6
sw/source/filter/html/htmlnumreader.cxx | 2
sw/source/filter/html/htmlnumwriter.cxx | 2
sw/source/filter/html/htmlsect.cxx | 6
sw/source/filter/html/parcss1.cxx | 4
sw/source/filter/html/svxcss1.cxx | 4
sw/source/filter/html/swhtml.cxx | 12
sw/source/filter/html/wrthtml.cxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 18 -
sw/source/filter/ww8/docxsdrexport.cxx | 2
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 6
sw/source/filter/ww8/ww8par2.cxx | 8
sw/source/ui/dbui/mmlayoutpage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 3
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/fldui/fldref.cxx | 14 -
sw/source/ui/fmtui/tmpdlg.cxx | 4
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/misc/srtdlg.cxx | 6
sw/source/ui/vba/vbalisthelper.cxx | 6
sw/source/uibase/app/appenv.cxx | 2
sw/source/uibase/app/docstyle.cxx | 12
sw/source/uibase/dbui/dbmgr.cxx | 7
sw/source/uibase/dbui/mailmergehelper.cxx | 6
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/envelp/labelcfg.cxx | 2
sw/source/uibase/fldui/fldmgr.cxx | 6
sw/source/uibase/inc/view.hxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 4
sw/source/uibase/uiview/formatclipboard.cxx | 4
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view1.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 10
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/unomailmerge.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 12
test/source/sheet/xsheetannotation.cxx | 4
testtools/source/bridgetest/bridgetest.cxx | 3
testtools/source/bridgetest/cppobj.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/controls/animatedimages.cxx | 2
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2
toolkit/source/controls/tabpagemodel.cxx | 4
toolkit/source/controls/tkspinbutton.cxx | 4
toolkit/source/helper/formpdfexport.cxx | 2
ucb/source/cacher/cachedcontentresultset.cxx | 5
ucb/source/cacher/cachedcontentresultsetstub.cxx | 4
ucb/source/cacher/cacheddynamicresultset.cxx | 4
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 4
ucb/source/core/provprox.cxx | 4
ucb/source/core/ucb.cxx | 2
ucb/source/core/ucbprops.cxx | 2
ucb/source/core/ucbstore.cxx | 13 -
ucb/source/sorter/sortdynres.cxx | 4
ucb/source/sorter/sortresult.cxx | 2
ucb/source/ucp/cmis/cmis_provider.cxx | 2
ucb/source/ucp/file/bc.cxx | 2
ucb/source/ucp/ftp/ftpcontent.cxx | 13 -
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 2
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 5
ucb/source/ucp/hierarchy/hierarchydata.cxx | 11
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2
ucb/source/ucp/hierarchy/hierarchyuri.cxx | 4
ucb/source/ucp/package/pkgcontent.cxx | 6
ucb/source/ucp/package/pkgprovider.cxx | 2
ucb/source/ucp/tdoc/tdoc_content.cxx | 2
ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx | 3
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6
ucb/source/ucp/webdav-neon/webdavprovider.cxx | 2
ucbhelper/source/client/content.cxx | 4
ucbhelper/source/provider/resultset.cxx | 26 --
ucbhelper/source/provider/resultsethelper.cxx | 3
unotest/source/cpp/getargument.cxx | 3
unotest/source/cpp/gettestargument.cxx | 3
unotest/source/cpp/officeconnection.cxx | 8
unotest/source/cpp/toabsolutefileurl.cxx | 7
unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 3
unotools/source/config/compatibility.cxx | 32 +-
unotools/source/config/configmgr.cxx | 3
unotools/source/config/fontoptions.cxx | 6
unotools/source/config/localisationoptions.cxx | 4
unotools/source/config/moduleoptions.cxx | 76 +++---
unotools/source/config/optionsdlg.cxx | 15 -
unotools/source/config/syslocaleoptions.cxx | 12
unotools/source/i18n/localedatawrapper.cxx | 8
unotools/source/misc/datetime.cxx | 2
unotools/source/ucbhelper/localfilehelper.cxx | 6
unotools/source/ucbhelper/ucblockbytes.cxx | 3
unoxml/source/dom/element.cxx | 2
unoxml/source/rdf/CURI.cxx | 2
uui/source/iahndl-filter.cxx | 6
uui/source/iahndl.cxx | 4
uui/source/passwordcontainer.cxx | 4
vcl/osx/printaccessoryview.mm | 2
vcl/osx/salframe.cxx | 30 +-
vcl/source/app/svapp.cxx | 2
vcl/source/control/edit.cxx | 4
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/font/PhysicalFontCollection.cxx | 2
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 2
vcl/source/outdev/font.cxx | 2
vcl/source/window/layout.cxx | 2
vcl/source/window/status.cxx | 2
writerfilter/source/dmapper/CellColorHandler.cxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/ThemeTable.cxx | 4
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6
writerfilter/source/rtftok/rtfsdrimport.cxx | 6
writerperfect/source/calc/MWAWCalcImportFilter.cxx | 2
writerperfect/source/draw/MWAWDrawImportFilter.cxx | 2
writerperfect/source/impress/KeynoteImportFilter.cxx | 10
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 2
writerperfect/source/writer/EBookImportFilter.cxx | 2
writerperfect/source/writer/MWAWImportFilter.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/cxxhelp/provider/provider.cxx | 13 -
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 8
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 10
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 4
xmlhelp/source/treeview/tvread.cxx | 19 -
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 30 +-
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 2
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/draw/eventimp.cxx | 3
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/forms/elementexport.cxx | 4
xmloff/source/forms/elementimport.cxx | 4
xmloff/source/forms/eventexport.cxx | 8
xmloff/source/forms/eventimport.cxx | 12
xmloff/source/style/impastpl.cxx | 7
xmloff/source/text/XMLTextListBlockContext.cxx | 2
xmloff/source/text/XMLTextNumRuleInfo.hxx | 6
xmloff/source/text/txtfldi.cxx | 6
xmloff/source/text/txtparae.cxx | 6
xmloff/source/text/txtvfldi.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 4
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 4
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/framework/decryptorimpl.cxx | 4
xmlsecurity/source/framework/encryptorimpl.cxx | 4
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 4
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 4
xmlsecurity/source/framework/signatureverifierimpl.cxx | 4
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 4
xmlsecurity/source/helper/xsecctl.cxx | 16 -
xmlsecurity/source/helper/xsecparser.cxx | 2
xmlsecurity/source/helper/xsecsign.cxx | 4
xmlsecurity/source/xmlsec/certvalidity.cxx | 34 +-
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 3
680 files changed, 2075 insertions(+), 2262 deletions(-)
New commits:
commit eabf036cfe4b776b44675040aaf48c23f2ff5777
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:41:36 2014 +0100
xmlscript: Use appropriate OUString functions on string constants
Change-Id: I1fafba17c590d4485f2138e2dda877344c573df1
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 1c8012e..5914861 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -910,7 +910,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
Reference< form::binding::XBindableValue > xBinding( _xProps, UNO_QUERY );
- if ( xFac.is() && xBinding.is() && rAttrName.equals( XMLNS_DIALOGS_PREFIX ":linked-cell" ) )
+ if ( xFac.is() && xBinding.is() && rAttrName == XMLNS_DIALOGS_PREFIX ":linked-cell" )
{
try
{
@@ -935,7 +935,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
}
}
Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
- if ( xEntrySink.is() && rAttrName.equals( XMLNS_DIALOGS_PREFIX ":source-cell-range" ) )
+ if ( xEntrySink.is() && rAttrName == XMLNS_DIALOGS_PREFIX ":source-cell-range" )
{
Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
if ( xListSource.is() )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index bf504e7..9b1ccf4 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -912,9 +912,9 @@ bool ImportContext::importDataAwareProperty(
{
OUString sLinkedCell;
OUString sCellRange;
- if ( rPropName.equals( "linked-cell" ) )
+ if ( rPropName == "linked-cell" )
sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rPropName );
- if ( rPropName.equals( "source-cell-range" ) )
+ if ( rPropName == "source-cell-range" )
sCellRange = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rPropName );
bool bRes = false;
Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );
commit 8d487ceba1995b5831755bb5b37a82afc2125c0f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:41:18 2014 +0100
xmlsecurity: Use appropriate OUString functions on string constants
Change-Id: I18370f6203455cf7568e48e49b7093d114656619
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 951f6fc..835dc00 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -136,7 +136,7 @@ bool DigitalSignaturesDialog::isXML(const OUString& rURI )
}
if (DocumentSignatureHelper::equalsReferenceUriManifestPath(rURI, sPath))
{
- bIsXML = sMediaType.equals("text/xml") && ! bEncrypted;
+ bIsXML = sMediaType == "text/xml" && ! bEncrypted;
bPropsAvailable = true;
break;
}
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx
index 0891495..bb41a3d 100644
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ b/xmlsecurity/source/framework/decryptorimpl.cxx
@@ -32,7 +32,6 @@ namespace cssl = com::sun::star::lang;
namespace cssxc = com::sun::star::xml::crypto;
namespace cssxw = com::sun::star::xml::wrapper;
-#define SERVICE_NAME "com.sun.star.xml.crypto.sax.Decryptor"
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.DecryptorImpl"
DecryptorImpl::DecryptorImpl(const Reference< XComponentContext > & xContext) : DecryptorImpl_Base(xContext)
@@ -190,10 +189,9 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( )
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( SERVICE_NAME );
+ pArray[0] = "com.sun.star.xml.crypto.sax.Decryptor";
return aRet;
}
-#undef SERVICE_NAME
cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF)
throw( cssu::Exception )
diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx
index 9d42d44..776b532 100644
--- a/xmlsecurity/source/framework/encryptorimpl.cxx
+++ b/xmlsecurity/source/framework/encryptorimpl.cxx
@@ -31,7 +31,6 @@ namespace cssl = com::sun::star::lang;
namespace cssxc = com::sun::star::xml::crypto;
namespace cssxw = com::sun::star::xml::wrapper;
-#define SERVICE_NAME "com.sun.star.xml.crypto.sax.Encryptor"
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.EncryptorImpl"
EncryptorImpl::EncryptorImpl(const Reference<XComponentContext> & xContext) : EncryptorImpl_Base(xContext)
@@ -224,10 +223,9 @@ Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( )
{
Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( SERVICE_NAME );
+ pArray[0] = "com.sun.star.xml.crypto.sax.Encryptor";
return aRet;
}
-#undef SERVICE_NAME
Reference< XInterface > SAL_CALL EncryptorImpl_createInstance(
const Reference< cssl::XMultiServiceFactory >& xMSF)
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index be60a32..6013f2d 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -32,7 +32,6 @@ namespace cssxcsax = com::sun::star::xml::csax;
namespace cssxw = com::sun::star::xml::wrapper;
namespace cssxs = com::sun::star::xml::sax;
-#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SAXEventKeeper"
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SAXEventKeeperImpl"
#define _USECOMPRESSEDDOCUMENTHANDLER
@@ -1371,10 +1370,9 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( SERVICE_NAME );
+ pArray[0] = "com.sun.star.xml.crypto.sax.SAXEventKeeper";
return aRet;
}
-#undef SERVICE_NAME
cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
const cssu::Reference< cssl::XMultiServiceFactory > &)
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 300d159..68f0025 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -32,7 +32,6 @@ namespace cssl = com::sun::star::lang;
namespace cssxc = com::sun::star::xml::crypto;
namespace cssxw = com::sun::star::xml::wrapper;
-#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureCreator"
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureCreatorImpl"
SignatureCreatorImpl::SignatureCreatorImpl( const Reference<XComponentContext> & xContext )
@@ -238,10 +237,9 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( SERVICE_NAME );
+ pArray[0] = "com.sun.star.xml.crypto.sax.SignatureCreator";
return aRet;
}
-#undef SERVICE_NAME
cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance(
const cssu::Reference< cssl::XMultiServiceFactory >& xMSF )
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 0db8153..6ef0bed 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -30,7 +30,6 @@ namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
namespace cssxc = com::sun::star::xml::crypto;
-#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureVerifier"
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureVerifierImpl"
SignatureVerifierImpl::SignatureVerifierImpl( const cssu::Reference< css::uno::XComponentContext >& xContext)
@@ -184,10 +183,9 @@ cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNam
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( SERVICE_NAME );
+ pArray[0] = "com.sun.star.xml.crypto.sax.SignatureVerifier";
return aRet;
}
-#undef SERVICE_NAME
cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance(
const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr)
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 931ded8..4ffe2c2 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -162,9 +162,9 @@ uno::Reference<xml::sax::XWriter> XMLSignatureHelper::CreateDocumentHandlerWithH
SvXMLAttributeList *pAttributeList = new SvXMLAttributeList();
OUString sNamespace;
if (mbODFPre1_2)
- sNamespace = OUString(NS_DOCUMENTSIGNATURES);
+ sNamespace = NS_DOCUMENTSIGNATURES;
else
- sNamespace = OUString(NS_DOCUMENTSIGNATURES_ODF_1_2);
+ sNamespace = NS_DOCUMENTSIGNATURES_ODF_1_2;
pAttributeList->AddAttribute(
OUString(ATTR_XMLNS),
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 7fdddc3..9c65d88 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -792,7 +792,7 @@ void XSecController::exportSignature(
{
pAttributeList->AddAttribute(
OUString(ATTR_URI),
- OUString(CHAR_FRAGMENT)+refInfor.ouURI);
+ CHAR_FRAGMENT+refInfor.ouURI);
}
xDocumentHandler->startElement( tag_Reference, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -910,7 +910,7 @@ void XSecController::exportSignature(
signatureInfo.ouPropertyId);
pAttributeList->AddAttribute(
OUString(ATTR_TARGET),
- OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId);
+ CHAR_FRAGMENT+signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
tag_SignatureProperty,
cssu::Reference< cssxs::XAttributeList > (pAttributeList));
@@ -919,15 +919,11 @@ void XSecController::exportSignature(
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- OUString(ATTR_XMLNS)
- + ":"
- + OUString(NSTAG_DC),
+ ATTR_XMLNS ":" NSTAG_DC,
OUString(NS_DC));
xDocumentHandler->startElement(
- OUString(NSTAG_DC)
- + ":"
- + tag_Date,
+ NSTAG_DC ":" + tag_Date,
cssu::Reference< cssxs::XAttributeList > (pAttributeList));
OUStringBuffer buffer;
@@ -944,9 +940,7 @@ void XSecController::exportSignature(
xDocumentHandler->characters( buffer.makeStringAndClear() );
xDocumentHandler->endElement(
- OUString(NSTAG_DC)
- + ":"
- + tag_Date);
+ NSTAG_DC ":" + tag_Date);
}
xDocumentHandler->endElement( tag_SignatureProperty );
}
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index ca8edf9..750713f 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -161,7 +161,7 @@ void SAL_CALL XSecParser::startElement(
}
else if (aName == TAG_DIGESTVALUE)
{
- m_ouDigestValue = "";
+ m_ouDigestValue.clear();
m_bInDigestValue = true;
}
else if ( aName == TAG_SIGNATUREPROPERTY )
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index b67933f..ad706b0 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -175,10 +175,10 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
for(i=0; i<size; ++i)
{
SignatureReferenceInformation& refInfor = vReferenceInfors[i];
- refInfor.ouDigestValue = OUString(CHAR_BLANK);
+ refInfor.ouDigestValue = CHAR_BLANK;
}
- internalSignatureInfor.signatureInfor.ouSignatureValue = OUString(CHAR_BLANK);
+ internalSignatureInfor.signatureInfor.ouSignatureValue = CHAR_BLANK;
return xReferenceResolvedListener;
}
diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx
index f27dd20..0bfc432 100644
--- a/xmlsecurity/source/xmlsec/certvalidity.cxx
+++ b/xmlsecurity/source/xmlsec/certvalidity.cxx
@@ -45,39 +45,39 @@ OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
OUString aValidity ;
if( certValidity == CertificateValidity::VALID ) {
- aValidity = OUString(VALID_STR ) ;
+ aValidity = VALID_STR;
} else if( ( certValidity & CertificateValidity::UNTRUSTED ) == CertificateValidity::UNTRUSTED ) {
- aValidity = OUString(UNTRUSTED_STR ) ;
+ aValidity = UNTRUSTED_STR;
} else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) {
- aValidity = OUString(TIME_INVALID_STR ) ;
+ aValidity = TIME_INVALID_STR;
} else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) {
- aValidity = OUString(NOT_NESTED_TIME_STR ) ;
+ aValidity = NOT_NESTED_TIME_STR;
} else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) {
- aValidity = OUString(REVOKED_STR ) ;
+ aValidity = REVOKED_STR;
} else if( ( certValidity & CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) {
- aValidity = OUString(UNKNOWN_REVOKATION_STR ) ;
+ aValidity = UNKNOWN_REVOKATION_STR;
} else if( ( certValidity & CertificateValidity::SIGNATURE_INVALID ) == CertificateValidity::SIGNATURE_INVALID ) {
- aValidity = OUString(SIGNATURE_INVALID_STR ) ;
+ aValidity = SIGNATURE_INVALID_STR;
} else if( ( certValidity & CertificateValidity::EXTENSION_INVALID ) == CertificateValidity::EXTENSION_INVALID ) {
- aValidity = OUString(EXTENSION_INVALID_STR ) ;
+ aValidity = EXTENSION_INVALID_STR;
} else if( ( certValidity & CertificateValidity::EXTENSION_UNKNOWN ) == CertificateValidity::EXTENSION_UNKNOWN ) {
- aValidity = OUString(EXTENSION_UNKNOWN_STR ) ;
+ aValidity = EXTENSION_UNKNOWN_STR;
} else if( ( certValidity & CertificateValidity::ISSUER_UNKNOWN ) == CertificateValidity::ISSUER_UNKNOWN ) {
- aValidity = OUString(ISSUER_UNKNOWN_STR ) ;
+ aValidity = ISSUER_UNKNOWN_STR;
} else if( ( certValidity & CertificateValidity::ISSUER_UNTRUSTED ) == CertificateValidity::ISSUER_UNTRUSTED ) {
- aValidity = OUString(ISSUER_UNTRUSTED_STR ) ;
+ aValidity = ISSUER_UNTRUSTED_STR;
} else if( ( certValidity & CertificateValidity::ISSUER_INVALID ) == CertificateValidity::ISSUER_INVALID ) {
- aValidity = OUString(ISSUER_INVALID_STR ) ;
+ aValidity = ISSUER_INVALID_STR;
} else if( ( certValidity & CertificateValidity::ROOT_UNKNOWN ) == CertificateValidity::ROOT_UNKNOWN ) {
- aValidity = OUString(ROOT_UNKNOWN_STR ) ;
+ aValidity = ROOT_UNKNOWN_STR;
} else if( ( certValidity & CertificateValidity::ROOT_UNTRUSTED ) == CertificateValidity::ROOT_UNTRUSTED ) {
- aValidity = OUString(ROOT_UNTRUSTED_STR ) ;
+ aValidity = ROOT_UNTRUSTED_STR;
} else if( ( certValidity & CertificateValidity::ROOT_INVALID ) == CertificateValidity::ROOT_INVALID ) {
- aValidity = OUString(ROOT_INVALID_STR ) ;
+ aValidity = ROOT_INVALID_STR;
} else if( ( certValidity & CertificateValidity::CHAIN_INCOMPLETE ) == CertificateValidity::CHAIN_INCOMPLETE ) {
- aValidity = OUString(CHAIN_INCOMPLETE_STR ) ;
+ aValidity = CHAIN_INCOMPLETE_STR;
} else {
- aValidity = OUString(INVALID_STR ) ;
+ aValidity = INVALID_STR;
}
return aValidity ;
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index e35f44c..faede8a 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -474,7 +474,7 @@ cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( )
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( NSS_SERVICE_NAME );
+ pArray[0] = NSS_SERVICE_NAME;
return aRet;
}
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index bac83e4..684aebc 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -123,7 +123,7 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName
uno::Sequence < OUString > aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.xml.crypto.SEInitializer";
- pArray[1] = OUString ( NSS_SERVICE_NAME );
+ pArray[1] = NSS_SERVICE_NAME;
return aRet;
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index cf2377a..658fce0 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -257,8 +257,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
else
{
ouAttrName = OUString(C2U( (sal_Char*)pAttrNs->prefix))
- +OUString(":")
- +OUString(C2U( (sal_Char*)pAttrName ));
+ + ":" + OUString(C2U( (sal_Char*)pAttrName ));
}
pAttributeList->AddAttribute(
commit 05575c31e1f962636125ff8c42c3e2409a9edb6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:40:40 2014 +0100
xmloff: Use appropriate OUString functions on string constants
Change-Id: I349e0c2575d9a5154ac7002d129a1851a3df7687
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 1ccc56c..9768710 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2468,7 +2468,7 @@ void SchXMLExportHelper_Impl::exportAxes(
}
}
exportAxis( XML_X, XML_PRIMARY_X, xAxisProps, xNewAxis, aCategoriesRange, bHasXAxisTitle, bHasXAxisMajorGrid, bHasXAxisMinorGrid, bExportContent );
- aCategoriesRange = "";
+ aCategoriesRange.clear();
}
// secondary x axis
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index f49e938..5e3fc42 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -767,27 +767,27 @@ void XMLConfigItemMapIndexedContext::EndElement()
for ( sal_Int32 j = 0 ; j < XML_FORBIDDEN_CHARACTER_MAX ; j++ )
{
- if (pForChar->Name.equals ( "Language" ) )
+ if (pForChar->Name == "Language")
{
pForChar->Value >>= aLocale.Language;
bHaveLanguage = true;
}
- else if (pForChar->Name.equals ( "Country" ) )
+ else if (pForChar->Name == "Country")
{
pForChar->Value >>= aLocale.Country;
bHaveCountry = true;
}
- else if (pForChar->Name.equals ( "Variant" ) )
+ else if (pForChar->Name == "Variant")
{
pForChar->Value >>= aLocale.Variant;
bHaveVariant = true;
}
- else if (pForChar->Name.equals ( "BeginLine" ) )
+ else if (pForChar->Name == "BeginLine")
{
pForChar->Value >>= aForbid.beginLine;
bHaveBegin = true;
}
- else if (pForChar->Name.equals ( "EndLine" ) )
+ else if (pForChar->Name == "EndLine")
{
pForChar->Value >>= aForbid.endLine;
bHaveEnd = true;
@@ -839,52 +839,52 @@ void XMLConfigItemMapIndexedContext::EndElement()
for ( sal_Int32 j = 0 ; j < XML_SYMBOL_DESCRIPTOR_MAX ; j++ )
{
- if (pSymbol->Name.equals ( "Name" ) )
+ if (pSymbol->Name == "Name")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sName;
bHaveName = true;
}
- else if (pSymbol->Name.equals ( "ExportName" ) )
+ else if (pSymbol->Name == "ExportName")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sExportName;
bHaveExportName = true;
}
- else if (pSymbol->Name.equals ( "FontName" ) )
+ else if (pSymbol->Name == "FontName")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sFontName;
bHaveFontName = true;
}
- else if (pSymbol->Name.equals ( "CharSet" ) )
+ else if (pSymbol->Name == "CharSet")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nCharSet;
bHaveCharSet = true;
}
- else if (pSymbol->Name.equals ( "Family" ) )
+ else if (pSymbol->Name == "Family")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nFamily;
bHaveFamily = true;
}
- else if (pSymbol->Name.equals ( "Pitch" ) )
+ else if (pSymbol->Name == "Pitch")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nPitch;
bHavePitch = true;
}
- else if (pSymbol->Name.equals ( "Weight" ) )
+ else if (pSymbol->Name == "Weight")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nWeight;
bHaveWeight = true;
}
- else if (pSymbol->Name.equals ( "Italic" ) )
+ else if (pSymbol->Name == "Italic")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nItalic;
bHaveItalic = true;
}
- else if (pSymbol->Name.equals ( "SymbolSet" ) )
+ else if (pSymbol->Name == "SymbolSet")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].sSymbolSet;
bHaveSymbolSet = true;
}
- else if (pSymbol->Name.equals ( "Character" ) )
+ else if (pSymbol->Name == "Character")
{
pSymbol->Value >>= pDescriptor[nNumFullEntries].nCharacter;
bHaveCharacter = true;
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 939b48b..807804a 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -184,7 +184,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if( nPrfx == XML_NAMESPACE_MATH &&
IsXMLToken( rLName, XML_MATH ) )
{
- sFilterService = OUString( XML_IMPORT_FILTER_MATH );
+ sFilterService = XML_IMPORT_FILTER_MATH;
aName = SvGlobalName(SO3_SM_CLASSID);
}
else if( nPrfx == XML_NAMESPACE_OFFICE &&
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 9b49b82..2c78e1a 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1958,7 +1958,7 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR
if( (getExportFlags() & EXPORT_EMBEDDED) == 0 )
sRet = mxGraphicResolver->resolveGraphicObjectURL( rGraphicObjectURL );
else
- sRet = "";
+ sRet.clear();
}
else
sRet = GetRelativeReference( sRet );
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index c858528..49d6cdb 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -379,8 +379,7 @@ void SdXMLEventContext::EndElement()
}
else
{
- pProperties->Name =
- OUString( "EventType" );
+ pProperties->Name = "EventType";
pProperties->Handle = -1;
pProperties->Value <<= OUString( "Script" );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 03b7859..142f1e6 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -755,7 +755,7 @@ void SdXMLExport::ImpPrepAutoLayoutInfos()
bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
{
- rName = "";
+ rName.clear();
bool bRetval(false);
Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY);
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index bc0ee61..eb3bab4 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3133,7 +3133,7 @@ lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL)
{
if (rImport.IsPackageURL(rURL))
{
- return OUString( "vnd.sun.star.Package:") + rURL;
+ return "vnd.sun.star.Package:" + rURL;
}
else
{
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 0165193..ff73357 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -169,7 +169,7 @@ namespace xmloff
OUString sToWriteServiceName = sServiceName;
#define CHECK_N_TRANSLATE( name ) \
- else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \
+ else if (sServiceName == SERVICE_PERSISTENT_COMPONENT_##name) \
sToWriteServiceName = SERVICE_##name
if (false)
@@ -194,7 +194,7 @@ namespace xmloff
CHECK_N_TRANSLATE( HIDDENCONTROL );
CHECK_N_TRANSLATE( IMAGECONTROL );
CHECK_N_TRANSLATE( FORMATTEDFIELD );
- else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_EDIT))
+ else if (sServiceName == SERVICE_PERSISTENT_COMPONENT_EDIT)
{
// special handling for the edit field: we have two controls using this as persistence service name
sToWriteServiceName = SERVICE_EDIT;
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index f1911a4..eede26a 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -936,8 +936,8 @@ namespace xmloff
{
// we have exactly 2 properties where this type class is allowed:
OSL_ENSURE(
- !_rPropValue.Name.equals(PROPERTY_EFFECTIVE_VALUE)
- || !_rPropValue.Name.equals(PROPERTY_EFFECTIVE_DEFAULT),
+ _rPropValue.Name != PROPERTY_EFFECTIVE_VALUE
+ || _rPropValue.Name != PROPERTY_EFFECTIVE_DEFAULT,
"OControlImport::implTranslateValueProperty: invalid property type/name combination!");
// Both properties are allowed to have a double or a string value,
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 8febf2d..e26ed66 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -50,8 +50,8 @@ namespace xmloff
Sequence< PropertyValue >& rMappedEvent = m_aMappedEvents[sName];
sLocalMacroName = pEvents->ScriptCode;
- sLibrary = "";
- if (pEvents->ScriptType.equals(EVENT_STARBASIC))
+ sLibrary.clear();
+ if (pEvents->ScriptType == EVENT_STARBASIC)
{ // for StarBasic, the library name is part of the ScriptCode
sal_Int32 nPrefixLen = sLocalMacroName.indexOf( ':' );
DBG_ASSERT( 0 <= nPrefixLen, "OEventDescriptorMapper::OEventDescriptorMapper: invalid script code prefix!" );
@@ -59,7 +59,7 @@ namespace xmloff
{
// the export handler for StarBasic expects "StarOffice", not "application" for application modules ...
sLibrary = sLocalMacroName.copy( 0, nPrefixLen );
- if (sLibrary.equals(EVENT_APPLICATION))
+ if (sLibrary == EVENT_APPLICATION)
sLibrary = EVENT_STAROFFICE;
sLocalMacroName = sLocalMacroName.copy( nPrefixLen + 1 );
@@ -98,7 +98,7 @@ namespace xmloff
MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName);
if (m_aMappedEvents.end() == aPos)
throw NoSuchElementException(
- OUString("There is no element named ") + _rName,
+ "There is no element named " + _rName,
static_cast< ::cppu::OWeakObject* >(this));
return makeAny(aPos->second);
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index d3e83a1..2f499e7 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -65,18 +65,18 @@ namespace xmloff
pEventDescriptionEnd = pEventDescription + aEvent->second.getLength();
for (;pEventDescription != pEventDescriptionEnd; ++pEventDescription)
{
- if ((pEventDescription->Name.equals(EVENT_LOCALMACRONAME)) ||
- (pEventDescription->Name.equals(EVENT_SCRIPTURL)))
+ if (pEventDescription->Name == EVENT_LOCALMACRONAME ||
+ pEventDescription->Name == EVENT_SCRIPTURL)
pEventDescription->Value >>= pTranslated->ScriptCode;
- else if (pEventDescription->Name.equals(EVENT_TYPE))
+ else if (pEventDescription->Name == EVENT_TYPE)
pEventDescription->Value >>= pTranslated->ScriptType;
- else if (pEventDescription->Name.equals(EVENT_LIBRARY))
+ else if (pEventDescription->Name == EVENT_LIBRARY)
pEventDescription->Value >>= sLibrary;
}
- if (pTranslated->ScriptType.equals(EVENT_STARBASIC))
+ if (pTranslated->ScriptType == EVENT_STARBASIC)
{
- if (sLibrary.equals(EVENT_STAROFFICE))
+ if (sLibrary == EVENT_STAROFFICE)
sLibrary = EVENT_APPLICATION;
if ( !sLibrary.isEmpty() )
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index fc4cbb4..40b592e 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -182,7 +182,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
OUStringBuffer aStemBuffer(32);
aStemBuffer.append( rFamilyData.maStrPrefix );
- if (rParentName != "")
+ if (!rParentName.isEmpty())
{
aStemBuffer.append("-");
aStemBuffer.append(rParentName);
@@ -195,7 +195,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
if (rState.mnIndex == -1)
continue;
OUString sXMLName(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryXMLName(rState.mnIndex));
- if (sXMLName == "")
+ if (sXMLName.isEmpty())
continue;
aStemBuffer.append("-");
aStemBuffer.append(OUString::number(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryNameSpace(rState.mnIndex)));
@@ -415,8 +415,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
OUString aPrefix( rStrPrefix );
if( bStylesOnly )
{
- aPrefix = "M";
- aPrefix += rStrPrefix;
+ aPrefix = "M" + rStrPrefix;
}
#if OSL_DEBUG_LEVEL > 0
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index f396ede..f8f9d37 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -200,7 +200,7 @@ XMLTextListBlockContext::XMLTextListBlockContext(
{
if ( !rTextListsHelper.IsListProcessed( msContinueListId ) )
{
- msContinueListId = "";
+ msContinueListId.clear();
}
else
{
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index bfe02f9..8ca93af 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -163,15 +163,15 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
inline void XMLTextNumRuleInfo::Reset()
{
mxNumRules = 0;
- msNumRulesName = "";
- msListId = "";
+ msNumRulesName.clear();
+ msListId.clear();
mnListStartValue = -1;
mnListLevel = 0;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
mbIsNumbered = mbIsRestart =
mbOutlineStyleAsNormalListStyle = false;
mbContinueingPreviousSubTree = false;
- msListLabelString = "";
+ msListLabelString.clear();
}
#endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 6b7c9ad..90d1be3 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -4088,7 +4088,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext(
const OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName )
{
- sServicePrefix = OUString(sAPI_presentation_prefix );
+ sServicePrefix = sAPI_presentation_prefix;
bValid = true;
}
@@ -4112,7 +4112,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext(
const OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName )
{
- sServicePrefix = OUString(sAPI_presentation_prefix );
+ sServicePrefix = sAPI_presentation_prefix;
bValid = true;
}
@@ -4137,7 +4137,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext(
const OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName )
{
- sServicePrefix = OUString(sAPI_presentation_prefix );
+ sServicePrefix = sAPI_presentation_prefix;
bValid = true;
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index de92089..b2b6772 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2201,12 +2201,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
exportTextField( xTxtRange, bAutoStyles, bIsProgress );
bPrevCharIsSpace = false;
}
- else if ( sType.equals( sAnnotation ) )
+ else if ( sType == sAnnotation )
{
exportTextField( xTxtRange, bAutoStyles, bIsProgress );
bPrevCharIsSpace = false;
}
- else if ( sType.equals( sAnnotationEnd ) )
+ else if ( sType == sAnnotationEnd )
{
Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
const OUString& rName = xBookmark->getName();
@@ -2268,7 +2268,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
exportRuby(xPropSet, bAutoStyles);
}
- else if (sType.equals(sMeta))
+ else if (sType == sMeta)
{
exportMeta(xPropSet, bAutoStyles, bIsProgress);
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 6792fac..89f4047 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -329,7 +329,7 @@ void XMLSetVarFieldImportContext::EndElement()
{
// create field/Service
Reference<XPropertySet> xPropSet;
- if (CreateField(xPropSet, OUString(sAPI_textfield_prefix) + GetServiceName()))
+ if (CreateField(xPropSet, sAPI_textfield_prefix + GetServiceName()))
{
Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY);
if (xDepTextField.is())
commit fb4fec646d20388539c8d294f3e2bc20d0903a2b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:40:21 2014 +0100
xmlhelp: Use appropriate OUString functions on string constants
Change-Id: I8642ec147cb0dca32dce7ec7f3efec93bcb99cb4
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 56c122a..a228272 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -293,7 +293,7 @@ OString Databases::getImagesZipFileURL()
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
if ( ! bFound )
- aImageZip = "";
+ aImageZip.clear();
m_aImagesZipFileURL = OUStringToOString(
rtl::Uri::encode(
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 1dcc86a..0aa8584 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -159,12 +159,8 @@ uno::Sequence< OUString >
ContentProvider::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 2 );
- aSNS.getArray()[ 0 ] =
- OUString(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
- aSNS.getArray()[ 1 ] =
- OUString(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
+ aSNS.getArray()[ 0 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME1;
+ aSNS.getArray()[ 1 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME2;
return aSNS;
}
@@ -327,10 +323,7 @@ void ContentProvider::init()
{
}
- OUString productversion(
- setupversion +
- OUString( " " ) +
- setupextension );
+ OUString productversion( setupversion + " " + setupextension );
uno::Sequence< OUString > aImagesZipPaths( 2 );
xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 5656b5f..dbb3cea 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -331,10 +331,10 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
{
m_aPath[m_nRow] =
- m_aPath[m_nRow] +
- OUString( "?Language=" ) +
- m_aURLParameter.get_language() +
- OUString( "&System=" ) +
+ m_aPath[m_nRow] +
+ "?Language=" +
+ m_aURLParameter.get_language() +
+ "&System=" +
m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent();
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index a9cdba8..c269d57 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -52,11 +52,11 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{
m_aPath[i] =
- OUString( "vnd.sun.star.help://" ) +
- m_aPath[i] +
- OUString( "?Language=" ) +
- m_aURLParameter.get_language() +
- OUString( "&System=" ) +
+ "vnd.sun.star.help://" +
+ m_aPath[i] +
+ "?Language=" +
+ m_aURLParameter.get_language() +
+ "&System=" +
m_aURLParameter.get_system();
m_nRow = sal_Int32( i );
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index b0a7b23..08cdee8 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -610,7 +610,7 @@ bool URLParameter::query()
if( delimIdx == -1 )
{
value = query_.copy( equalIdx + 1 ).trim();
- query_ = "";
+ query_.clear();
}
else
{
@@ -635,7 +635,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() )
m_aQuery = value;
else
- m_aQuery += ( OUString( " " ) + value );
+ m_aQuery += " " + value;
}
else if( parameter == "Scope" )
m_aScope = value;
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index fd9a809..c43ba25 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -241,8 +241,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{
TargetURL = ( tvDom->getTargetURL() + configData.appendix );
if( !tvDom->anchor.isEmpty() )
- TargetURL += ( OUString( "#" ) +
- tvDom->anchor );
+ TargetURL += "#" + tvDom->anchor;
}
else
Children = new TVChildTarget( configData,tvDom );
@@ -665,9 +664,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
{
}
- OUString productVersion( setupversion +
- OUString( " " ) +
- setupextension );
+ OUString productVersion( setupversion + " " + setupextension );
OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
// Determine fileurl from url and locale
@@ -762,11 +759,11 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
configData.system = system;
configData.locale = locale;
configData.appendix =
- OUString( "?Language=" ) +
+ "?Language=" +
configData.locale +
- OUString( "&System=" ) +
+ "&System=" +
configData.system +
- OUString( "&UseDB=no" ) ;
+ "&UseDB=no";
return configData;
}
@@ -931,7 +928,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
OUString aMediaType = xPackageTypeInfo->getMediaType();
- if( aMediaType.equals( aHelpMediaType ) )
+ if( aMediaType == aHelpMediaType )
{
xHelpPackage = xSubPkg;
o_xParentPackageBundle = xPackage;
@@ -943,7 +940,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
{
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
OUString aMediaType = xPackageTypeInfo->getMediaType();
- if( aMediaType.equals( aHelpMediaType ) )
+ if( aMediaType == aHelpMediaType )
xHelpPackage = xPackage;
}
@@ -1184,7 +1181,7 @@ OUString TreeFileIterator::implGetTreeFileFromPackage
if( m_xSFA->exists( aRetFile ) )
rnFileSize = m_xSFA->getSize( aRetFile );
else
- aRetFile = "";
+ aRetFile.clear();
return aRetFile;
}
commit 56a6a6f2094f21cd14628ae9d50725a30a36f274
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:39:58 2014 +0100
writerperfect: Use appropriate OUString functions on string constants
Change-Id: If48c8c7181eb8eec7519ba17248244c7ba6bf0d5
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index a923b6b..5b2f3f7 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -46,7 +46,7 @@ bool MWAWCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index f4c0f18..3493903 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -46,7 +46,7 @@ bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index efd5ee2..e305bfb 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -233,22 +233,16 @@ throw (RuntimeException)
return OUString("org.libreoffice.comp.Impress.KeynoteImportFilter");
}
-#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
-#define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection"
-
Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray();
- pArray[0] = OUString(SERVICE_NAME1);
- pArray[1] = OUString(SERVICE_NAME2);
+ pArray[0] = "com.sun.star.document.ImportFilter";
+ pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
return aRet;
}
-#undef SERVICE_NAME2
-#undef SERVICE_NAME1
-
Reference< XInterface > SAL_CALL KeynoteImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index cdbfaa0..1a25ac66b 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -46,7 +46,7 @@ bool MWAWPresentationImportFilter::doImportDocument(librevenge::RVNGInputStream
bool MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 6f9ddf5..c6a4ce8 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -56,7 +56,7 @@ bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Od
bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN;
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 98b210c..34bf04e 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -45,7 +45,7 @@ bool MWAWImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Odt
bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
commit 24531a040ea90a8631699089118a9e88860a27ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:39:42 2014 +0100
writerfilter: Use appropriate OUString functions on string constants
Change-Id: I42d89d0cc8bf9e9a0918345147ae2f64b5aabf58
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 632bc07..3c8b506 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -303,7 +303,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag()
void CellColorHandler::disableInteropGrabBag()
{
- m_aInteropGrabBagName = "";
+ m_aInteropGrabBagName.clear();
m_aInteropGrabBag.clear();
}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 2397bd3..ec5afab 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3415,7 +3415,7 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
*pSeq++ = *i;
m_pImpl->m_aInteropGrabBag.clear();
- m_pImpl->m_aInteropGrabBagName = "";
+ m_pImpl->m_aInteropGrabBagName.clear();
aRet.Value = uno::makeAny(aSeq);
return aRet;
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b26a29f..59fff49 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4995,7 +4995,7 @@ void DomainMapper_Impl::enableInteropGrabBag(const OUString& aName)
void DomainMapper_Impl::disableInteropGrabBag()
{
- m_aInteropGrabBagName = "";
+ m_aInteropGrabBagName.clear();
m_aInteropGrabBag.clear();
m_aSubInteropGrabBag.clear();
}
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index cb33e3a..83a4d98 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -88,7 +88,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val)
if(m_pImpl->m_supplementalFontId && m_pImpl->m_supplementalFontName.getLength() > 0)
{
m_pImpl->m_currentFontThemeEntry[m_pImpl->m_supplementalFontId] = m_pImpl->m_supplementalFontName;
- m_pImpl->m_supplementalFontName = "";
+ m_pImpl->m_supplementalFontName.clear();
m_pImpl->m_supplementalFontId = 0;
}
}
@@ -100,7 +100,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
dmapper_logger->chars(rSprm.toString());
#endif
- m_pImpl->m_supplementalFontName = "";
+ m_pImpl->m_supplementalFontName.clear();
m_pImpl->m_supplementalFontId = 0;
sal_uInt32 nSprmId = rSprm.getId();
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 6ba07a0..f755c20 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -130,7 +130,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
// use '/' to representent the root of the zip package ( and provide a 'file' scheme to
// keep the XUriReference implementation happy )
// add mspath to represent the 'source' of this stream
- uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( OUString( "file:///" ) + msPath );
+ uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( "file:///" + msPath );
static const char sType[] = "Type";
static const char sDocumentType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index babc266..433bbf9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -349,12 +349,12 @@ void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId, OUString& rIgnoreF
if (!m_aAuthor.isEmpty())
{
pImpl->setAuthor(m_aAuthor);
- m_aAuthor = "";
+ m_aAuthor.clear();
}
if (!m_aAuthorInitials.isEmpty())
{
pImpl->setAuthorInitials(m_aAuthorInitials);
- m_aAuthorInitials = "";
+ m_aAuthorInitials.clear();
}
pImpl->m_nDefaultFontIndex = m_nDefaultFontIndex;
pImpl->seek(nPos);
@@ -1272,7 +1272,7 @@ void RTFDocumentImpl::text(OUString& rString)
if (!m_aIgnoreFirst.isEmpty() && m_aIgnoreFirst.equals(rString))
{
- m_aIgnoreFirst = "";
+ m_aIgnoreFirst.clear();
return;
}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3f39690..b99d968 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -354,11 +354,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
xPropertySet->setPropertyValue("FillColor", aAny);
// fillType will decide, possible it'll be the start color of a gradient.
- aFillModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>())));
+ aFillModel.moColor.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>())));
}
else if (i->first == "fillBackColor")
// fillType will decide, possible it'll be the end color of a gradient.
- aFillModel.moColor2.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
+ aFillModel.moColor2.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "lineColor")
aLineColor <<= msfilter::util::BGRToRGB(i->second.toInt32());
else if (i->first == "lineBackColor")
@@ -561,7 +561,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
aShadowModel.mbHasShadow = true;
}
else if (i->first == "shadowColor")
- aShadowModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
+ aShadowModel.moColor.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "shadowOffsetX")
// EMUs to points
aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt");
commit 56d479f5405cf018bf233879387dbad851d279f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:39:25 2014 +0100
vcl: Use appropriate OUString functions on string constants
Change-Id: I010146e9b7181d0cc704a26ae1d373794cf6facb
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index e2db4c3..81b3194 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -1251,7 +1251,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
// new tab item
if( ! aText.getLength() )
- aText = OUString( "OOo" );
+ aText = "OOo";
NSString* pLabel = CreateNSString( aGroupTitle );
NSTabViewItem* pItem = [[NSTabViewItem alloc] initWithIdentifier: pLabel ];
[pItem setLabel: pLabel];
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 7591c69..2dead37 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -961,26 +961,26 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
aKeyMap[ KEY_PAGEUP ] = OUString( sal_Unicode( 0x21de ) );
aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) );
aKeyMap[ KEY_RETURN ] = OUString( sal_Unicode( 0x21a9 ) );
- aKeyMap[ KEY_ESCAPE ] = OUString( "esc" );
+ aKeyMap[ KEY_ESCAPE ] = "esc";
aKeyMap[ KEY_TAB ] = OUString( sal_Unicode( 0x21e5 ) );
aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) );
aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) );
aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) );
- aKeyMap[ KEY_ADD ] = OUString( '+' );
- aKeyMap[ KEY_SUBTRACT ] = OUString( '-' );
- aKeyMap[ KEY_DIVIDE ] = OUString( '/' );
- aKeyMap[ KEY_MULTIPLY ] = OUString( '*' );
- aKeyMap[ KEY_POINT ] = OUString( '.' );
- aKeyMap[ KEY_COMMA ] = OUString( ',' );
- aKeyMap[ KEY_LESS ] = OUString( '<' );
- aKeyMap[ KEY_GREATER ] = OUString( '>' );
- aKeyMap[ KEY_EQUAL ] = OUString( '=' );
+ aKeyMap[ KEY_ADD ] = "+";
+ aKeyMap[ KEY_SUBTRACT ] = "-";
+ aKeyMap[ KEY_DIVIDE ] = "/";
+ aKeyMap[ KEY_MULTIPLY ] = "*";
+ aKeyMap[ KEY_POINT ] = ".";
+ aKeyMap[ KEY_COMMA ] = ",";
+ aKeyMap[ KEY_LESS ] = "<";
+ aKeyMap[ KEY_GREATER ] = ">";
+ aKeyMap[ KEY_EQUAL ] = "=";
aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) );
- aKeyMap[ KEY_TILDE ] = OUString( '~' );
- aKeyMap[ KEY_BRACKETLEFT ] = OUString( '[' );
- aKeyMap[ KEY_BRACKETRIGHT ] = OUString( ']' );
- aKeyMap[ KEY_SEMICOLON ] = OUString( ';' );
- aKeyMap[ KEY_QUOTERIGHT ] = OUString( '\'' );
+ aKeyMap[ KEY_TILDE ] = "~";
+ aKeyMap[ KEY_BRACKETLEFT ] = "[";
+ aKeyMap[ KEY_BRACKETRIGHT ] = "]";
+ aKeyMap[ KEY_SEMICOLON ] = ";";
+ aKeyMap[ KEY_QUOTERIGHT ] = "'";
/* yet unmapped KEYCODES:
aKeyMap[ KEY_INSERT ] = OUString( sal_Unicode( ) );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index eb3c00b..da305249 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -312,7 +312,7 @@ void Application::Abort( const OUString& rErrorText )
bool dumpCore = false;
sal_uInt16 n = GetCommandLineParamCount();
for (sal_uInt16 i = 0; i != n; ++i) {
- if (GetCommandLineParam(i).equals("--norestore")) {
+ if (GetCommandLineParam(i) == "--norestore") {
dumpCore = true;
break;
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 76775af..821d535 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -875,13 +875,13 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool
aSelection.Min() = nChgPos; // position for new text to be inserted
}
else
- aNewText = "";
+ aNewText.clear();
}
else
{
// should the character be ignored (i.e. not get inserted) ?
if (!xISC->checkInputSequence( aOldText, nTmpPos - 1, cChar, nCheckMode ))
- aNewText = "";
+ aNewText.clear();
}
}
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 25d136a..2e055c9 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -58,7 +58,7 @@ namespace vcl
{
static void lcl_reset( QuickSelectionEngine_Data& _data )
{
- _data.sCurrentSearchString = "";
+ _data.sCurrentSearchString.clear();
_data.aSingleSearchChar.reset();
_data.aSearchTimeout.Stop();
}
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 4eee225..6754e1b 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -264,7 +264,7 @@ PhysicalFontFamily* PhysicalFontCollection::GetGlyphFallbackFont( FontSelectPatt
// apply outdev3.cxx specific fontname normalization
rFontSelData.maSearchName = GetEnglishSearchFontName( rFontSelData.maSearchName );
else
- rFontSelData.maSearchName = "";
+ rFontSelData.maSearchName.clear();
// See fdo#32665 for an example. FreeSerif that has glyphs in normal
// font, but not in the italic or bold version
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 03de2ed..575a284 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -332,7 +332,7 @@ ImpSwap::ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ) :
if( bError )
{
osl_removeFile( maURL.pData );
- maURL = "";
+ maURL.clear();
}
}
}
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 5e9e942..04e19ba 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1008,7 +1008,7 @@ void OpenGLContext::renderToFile()
int iWidth = m_aGLWin.Width;
int iHeight = m_aGLWin.Height;
static int nIdx = 0;
- OUString aName = OUString( "file:///home/moggi/Documents/work/output" ) + OUString::number( nIdx++ ) + ".png";
+ OUString aName = "file:///home/moggi/Documents/work/output" + OUString::number( nIdx++ ) + ".png";
OpenGLHelper::renderToFile(iWidth, iHeight, aName);
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7d142e04..414b2e8 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1352,7 +1352,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection* pFon
// override the font name
rFontSelData.SetFamilyName( pFallbackData->GetFamilyName() );
// clear the cached normalized name
- rFontSelData.maSearchName = "";
+ rFontSelData.maSearchName.clear();
}
ImplFontEntry* pFallbackFont = GetFontEntry( pFontCollection, rFontSelData );
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1fc5e1f..5495e7c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2281,7 +2281,7 @@ void MessageDialog::set_secondary_text(const OUString &rSecondaryString)
m_sSecondaryString = rSecondaryString;
if (m_pSecondaryMessage)
{
- m_pSecondaryMessage->SetText(OUString("\n") + m_sSecondaryString);
+ m_pSecondaryMessage->SetText("\n" + m_sSecondaryString);
m_pSecondaryMessage->Show(!m_sSecondaryString.isEmpty());
}
}
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index acde64a..8583e5f 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1361,7 +1361,7 @@ void StatusBar::EndProgressMode()
DBG_ASSERT( mbProgressMode, "StatusBar::EndProgressMode(): no progress mode" );
mbProgressMode = false;
- maPrgsTxt = "";
+ maPrgsTxt.clear();
// re-trigger Paint to recreate StatusBar
SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
commit bb80b9e6cda268bb57481e7835ac6e4009174053
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:39:00 2014 +0100
uui: Use appropriate OUString functions on string constants
Change-Id: I846ee3bf07a5c99da11f0041de1e778584bfae09
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index bfdb312..6291553 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -216,8 +216,7 @@ handleFilterOptionsRequest_(
sal_Int32 nPropCount = rRequest.rProperties.getLength();
for( sal_Int32 ind = 0; ind < nPropCount; ++ind )
{
- if( rRequest.rProperties[ind].Name.equals(
- OUString("FilterName")) )
+ if( rRequest.rProperties[ind].Name == "FilterName" )
{
rRequest.rProperties[ind].Value >>= aFilterName;
break;
@@ -231,8 +230,7 @@ handleFilterOptionsRequest_(
for( sal_Int32 nProperty=0;
nProperty < nPropertyCount;
++nProperty )
- if( aProps[nProperty].Name.equals(
- OUString("UIComponent")) )
+ if( aProps[nProperty].Name == "UIComponent" )
{
OUString aServiceName;
aProps[nProperty].Value >>= aServiceName;
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 4208018..cae3bf9 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -437,7 +437,7 @@ UUIInteractionHelper::handleRequest_impl(
for ( sal_Int32 index=0; index< sModules.getLength(); ++index )
{
if ( index )
- aName = aName + "," + sModules[index];
+ aName += "," + sModules[index];
else
aName = sModules[index]; // 1st name
}
@@ -1298,7 +1298,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
OUString title(
utl::ConfigManager::getProductName() +
- OUString( " " ) +
+ " " +
utl::ConfigManager::getProductVersion() );
switch (
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 12d95cc..08a8b68 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -334,8 +334,8 @@ uno::Sequence< OUString >
PasswordContainerInteractionHandler::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[ 0 ] = OUString(
- "com.sun.star.task.PasswordContainerInteractionHandler" );
+ aSNS.getArray()[ 0 ] =
+ "com.sun.star.task.PasswordContainerInteractionHandler";
return aSNS;
}
commit 3607b14acd6541d31e7a882e83b743423d8a22b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:38:45 2014 +0100
unoxml: Use appropriate OUString functions on string constants
Change-Id: I6be6717b1714e2f7115ec8e27c5026a439bf1b05
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 1b93505..03eacf4 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -65,7 +65,7 @@ namespace DOM
strlen(reinterpret_cast<const char*>(pPrefix)),
RTL_TEXTENCODING_UTF8);
OUString name = (prefix.isEmpty())
- ? OUString( "xmlns" ) : OUString( "xmlns:" ) + prefix;
+ ? OUString( "xmlns" ) : "xmlns:" + prefix;
const xmlChar *pHref = pNs->href;
OUString val(reinterpret_cast<const sal_Char*>(pHref),
strlen(reinterpret_cast<const char*>(pHref)),
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 458b823..e73b95e8 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -746,7 +746,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArgu
}
// just append the parameters and then split them again; seems simplest
arg0 = arg0 + arg1;
- arg1 = "";
+ arg1.clear();
}
// split parameter
commit 994cc6c8689f7186193ce504c92fc2bc2fdcb560
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:38:27 2014 +0100
unotools: Use appropriate OUString functions on string constants
Change-Id: I9762f913080b4bad0d9cd3d1c1b42b333b08f27e
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 24fc1bb..60bde91 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -47,21 +47,21 @@ enum CompatibilityOptions
@descr The method GetList() returns a list of property values.
Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
-#define COMPATIBILITY_PROPERTYNAME_NAME OUString( "Name" )
-#define COMPATIBILITY_PROPERTYNAME_MODULE OUString( "Module" )
-#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS OUString( "UsePrinterMetrics" )
-#define COMPATIBILITY_PROPERTYNAME_ADDSPACING OUString( "AddSpacing" )
-#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES OUString( "AddSpacingAtPages" )
-#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS OUString( "UseOurTabStopFormat" )
-#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING OUString( "NoExternalLeading" )
-#define COMPATIBILITY_PROPERTYNAME_USELINESPACING OUString( "UseLineSpacing" )
-#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING OUString( "AddTableSpacing" )
-#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING OUString( "UseObjectPositioning" )
-#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING OUString( "UseOurTextWrapping" )
-#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE OUString( "ConsiderWrappingStyle" )
-#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE OUString( "ExpandWordSpace" )
-
-#define COMPATIBILITY_DEFAULT_NAME OUString( "_default" )
+#define COMPATIBILITY_PROPERTYNAME_NAME "Name"
+#define COMPATIBILITY_PROPERTYNAME_MODULE "Module"
+#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS "UsePrinterMetrics"
+#define COMPATIBILITY_PROPERTYNAME_ADDSPACING "AddSpacing"
+#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES "AddSpacingAtPages"
+#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS "UseOurTabStopFormat"
+#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING "NoExternalLeading"
+#define COMPATIBILITY_PROPERTYNAME_USELINESPACING "UseLineSpacing"
+#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING "AddTableSpacing"
+#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING "UseObjectPositioning"
+#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING "UseOurTextWrapping"
+#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE "ConsiderWrappingStyle"
+#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE "ExpandWordSpace"
+
+#define COMPATIBILITY_DEFAULT_NAME "_default"
// forward declarations
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 9de603c..9e3aef3 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -30,10 +30,10 @@
@descr The method GetList() returns a list of property values.
Use follow defines to separate values by names.
*//*-*************************************************************************************************************/
-#define DYNAMICMENU_PROPERTYNAME_URL OUString("URL")
-#define DYNAMICMENU_PROPERTYNAME_TITLE OUString("Title")
-#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER OUString("ImageIdentifier")
-#define DYNAMICMENU_PROPERTYNAME_TARGETNAME OUString("TargetName")
+#define DYNAMICMENU_PROPERTYNAME_URL "URL"
+#define DYNAMICMENU_PROPERTYNAME_TITLE "Title"
+#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER "ImageIdentifier"
+#define DYNAMICMENU_PROPERTYNAME_TARGETNAME "TargetName"
/*-************************************************************************************************************
@descr You can use these enum values to specify right menu if you call our interface methods.
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index e773a41..aaf0e2e 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -31,11 +31,11 @@
// The method GetList() returns a list of property values.
// Use follow defines to separate values by names.
-#define HISTORY_PROPERTYNAME_URL OUString("URL")
-#define HISTORY_PROPERTYNAME_FILTER OUString("Filter")
-#define HISTORY_PROPERTYNAME_TITLE OUString("Title")
-#define HISTORY_PROPERTYNAME_PASSWORD OUString("Password")
-#define HISTORY_PROPERTYNAME_THUMBNAIL OUString("Thumbnail")
+#define HISTORY_PROPERTYNAME_URL "URL"
+#define HISTORY_PROPERTYNAME_FILTER "Filter"
+#define HISTORY_PROPERTYNAME_TITLE "Title"
+#define HISTORY_PROPERTYNAME_PASSWORD "Password"
+#define HISTORY_PROPERTYNAME_THUMBNAIL "Thumbnail"
/// You can use these enum values to specify right history if you call our interface methods.
enum EHistoryType
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index bf427ac..3915c5d 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -40,8 +40,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
#define ROOTNODE_OPTIONS OUString( "Office.Compatibility/" )
-#define PATHDELIMITER OUString( "/" )
-#define SETNODE_ALLFILEFORMATS OUString( "AllFileFormats" )
+#define PATHDELIMITER "/"
+#define SETNODE_ALLFILEFORMATS "AllFileFormats"
#define PROPERTYNAME_NAME COMPATIBILITY_PROPERTYNAME_NAME
#define PROPERTYNAME_MODULE COMPATIBILITY_PROPERTYNAME_MODULE
@@ -356,7 +356,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
lValues[ nPosition++ ] >>= aItem.bExpandWordSpace;
m_aOptions.AppendEntry( aItem );
- if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) )
+ if ( !bDefaultFound && aItem.sName == COMPATIBILITY_DEFAULT_NAME )
{
SvtSysLocale aSysLocale;
com::sun::star::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
@@ -382,27 +382,27 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bValue )
{
- if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) )
+ if ( sName == COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS )
m_aDefOptions.SetUsePrtMetrics( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDSPACING )
m_aDefOptions.SetAddSpacing( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES )
m_aDefOptions.SetAddSpacingAtPages( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS )
m_aDefOptions.SetUseOurTabStops( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_NOEXTLEADING )
m_aDefOptions.SetNoExtLeading( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_USELINESPACING )
m_aDefOptions.SetUseLineSpacing( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING )
m_aDefOptions.SetAddTableSpacing( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING )
m_aDefOptions.SetUseObjPos( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING )
m_aDefOptions.SetUseOurTextWrapping( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE )
m_aDefOptions.SetConsiderWrappingStyle( bValue );
- else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) )
+ else if ( sName == COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE )
m_aDefOptions.SetExpandWordSpace( bValue );
}
@@ -429,7 +429,7 @@ void SvtCompatibilityOptions_Impl::Commit()
for( nItem = 0; nItem < nNewCount; ++nItem )
{
aItem = m_aOptions[ nItem ];
- sNode = SETNODE_ALLFILEFORMATS + PATHDELIMITER + aItem.sName + PATHDELIMITER;
+ sNode = SETNODE_ALLFILEFORMATS PATHDELIMITER + aItem.sName + PATHDELIMITER;
lPropertyValues[ OFFSET_MODULE - 1 ].Name = sNode + PROPERTYNAME_MODULE;
lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Name = sNode + PROPERTYNAME_USEPRTMETRICS;
@@ -509,7 +509,7 @@ void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName,
m_aOptions.AppendEntry( aItem );
// default item reset?
- if ( _sName.equals( COMPATIBILITY_DEFAULT_NAME ) )
+ if ( _sName == COMPATIBILITY_DEFAULT_NAME )
m_aDefOptions = aItem;
SetModified();
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index a84db5e..0fa8f6f 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -148,8 +148,7 @@ utl::ConfigManager::acquireTree(utl::ConfigItem & item) {
css::uno::Sequence< css::uno::Any > args(1);
args[0] <<= css::beans::NamedValue(
OUString("nodepath"),
- css::uno::makeAny(
- OUString("/org.openoffice.") + item.GetSubTreeName()));
+ css::uno::makeAny("/org.openoffice." + item.GetSubTreeName()));
if ((item.GetMode() & CONFIG_MODE_ALL_LOCALES) != 0) {
args.realloc(2);
args[1] <<= css::beans::NamedValue(OUString("locale"), css::uno::makeAny(OUString("*")));
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index c04640c..e810502 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -33,9 +33,9 @@ using namespace ::com::sun::star::uno;
#define ROOTNODE_FONT OUString("Office.Common/Font")
-#define PROPERTYNAME_REPLACEMENTTABLE OUString("Substitution/Replacement")
-#define PROPERTYNAME_FONTHISTORY OUString("View/History")
-#define PROPERTYNAME_FONTWYSIWYG OUString("View/ShowFontBoxWYSIWYG")
+#define PROPERTYNAME_REPLACEMENTTABLE "Substitution/Replacement"
+#define PROPERTYNAME_FONTHISTORY "View/History"
+#define PROPERTYNAME_FONTWYSIWYG "View/ShowFontBoxWYSIWYG"
#define PROPERTYHANDLE_REPLACEMENTTABLE 0
#define PROPERTYHANDLE_FONTHISTORY 1
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 62b4616..244fe16 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno;
#define DEFAULT_AUTOMNEMONIC false
#define DEFAULT_DIALOGSCALE 0
-#define PROPERTYNAME_AUTOMNEMONIC OUString("AutoMnemonic")
-#define PROPERTYNAME_DIALOGSCALE OUString("DialogScale")
+#define PROPERTYNAME_AUTOMNEMONIC "AutoMnemonic"
+#define PROPERTYNAME_DIALOGSCALE "DialogScale"
#define PROPERTYHANDLE_AUTOMNEMONIC 0
#define PROPERTYHANDLE_DIALOGSCALE 1
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 705f684..564c7b1 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -50,16 +50,16 @@
NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ]
*//*-*************************************************************************************************************/
#define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" )
-#define PATHSEPARATOR OUString("/" )
+#define PATHSEPARATOR "/"
// Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is
// special code that uses hard coded strings to return them.
-#define PROPERTYNAME_SHORTNAME OUString("ooSetupFactoryShortName" )
-#define PROPERTYNAME_TEMPLATEFILE OUString("ooSetupFactoryTemplateFile" )
-#define PROPERTYNAME_WINDOWATTRIBUTES OUString("ooSetupFactoryWindowAttributes")
-#define PROPERTYNAME_EMPTYDOCUMENTURL OUString("ooSetupFactoryEmptyDocumentURL")
-#define PROPERTYNAME_DEFAULTFILTER OUString("ooSetupFactoryDefaultFilter" )
-#define PROPERTYNAME_ICON OUString("ooSetupFactoryIcon" )
+#define PROPERTYNAME_SHORTNAME "ooSetupFactoryShortName"
+#define PROPERTYNAME_TEMPLATEFILE "ooSetupFactoryTemplateFile"
+#define PROPERTYNAME_WINDOWATTRIBUTES "ooSetupFactoryWindowAttributes"
+#define PROPERTYNAME_EMPTYDOCUMENTURL "ooSetupFactoryEmptyDocumentURL"
+#define PROPERTYNAME_DEFAULTFILTER "ooSetupFactoryDefaultFilter"
+#define PROPERTYNAME_ICON "ooSetupFactoryIcon"
#define PROPERTYHANDLE_SHORTNAME 0
#define PROPERTYHANDLE_TEMPLATEFILE 1
@@ -70,16 +70,16 @@
#define PROPERTYCOUNT 6
-#define FACTORYNAME_WRITER OUString("com.sun.star.text.TextDocument" )
-#define FACTORYNAME_WRITERWEB OUString("com.sun.star.text.WebDocument" )
-#define FACTORYNAME_WRITERGLOBAL OUString("com.sun.star.text.GlobalDocument" )
-#define FACTORYNAME_CALC OUString("com.sun.star.sheet.SpreadsheetDocument" )
-#define FACTORYNAME_DRAW OUString("com.sun.star.drawing.DrawingDocument" )
-#define FACTORYNAME_IMPRESS OUString("com.sun.star.presentation.PresentationDocument")
-#define FACTORYNAME_MATH OUString("com.sun.star.formula.FormulaProperties" )
-#define FACTORYNAME_CHART OUString("com.sun.star.chart2.ChartDocument" )
-#define FACTORYNAME_DATABASE OUString("com.sun.star.sdb.OfficeDatabaseDocument" )
-#define FACTORYNAME_STARTMODULE OUString("com.sun.star.frame.StartModule" )
+#define FACTORYNAME_WRITER "com.sun.star.text.TextDocument"
+#define FACTORYNAME_WRITERWEB "com.sun.star.text.WebDocument"
+#define FACTORYNAME_WRITERGLOBAL "com.sun.star.text.GlobalDocument"
+#define FACTORYNAME_CALC "com.sun.star.sheet.SpreadsheetDocument"
+#define FACTORYNAME_DRAW "com.sun.star.drawing.DrawingDocument"
+#define FACTORYNAME_IMPRESS "com.sun.star.presentation.PresentationDocument"
+#define FACTORYNAME_MATH "com.sun.star.formula.FormulaProperties"
+#define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument"
+#define FACTORYNAME_DATABASE "com.sun.star.sdb.OfficeDatabaseDocument"
+#define FACTORYNAME_STARTMODULE "com.sun.star.frame.StartModule"
#define FACTORYCOUNT 10
@@ -102,12 +102,12 @@ struct FactoryInfo
void free()
{
bInstalled = false;
- sFactory = "";
- sShortName = "";
- sTemplateFile = "";
- sWindowAttributes = "";
- sEmptyDocumentURL = "";
- sDefaultFilter = "";
+ sFactory.clear();
+ sShortName.clear();
+ sTemplateFile.clear();
+ sWindowAttributes.clear();
+ sEmptyDocumentURL.clear();
+ sDefaultFilter.clear();
nIcon = 0;
bChangedTemplateFile = false;
bChangedWindowAttributes = false;
@@ -712,12 +712,12 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const
for( sal_Int32 nName=0; nName<nCount; ++nName )
{
- pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_SHORTNAME;
- pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_TEMPLATEFILE;
- pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_WINDOWATTRIBUTES;
- pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_EMPTYDOCUMENTURL;
- pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_DEFAULTFILTER;
- pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_ICON;
+ pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_SHORTNAME;
+ pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_TEMPLATEFILE;
+ pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_WINDOWATTRIBUTES;
+ pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_EMPTYDOCUMENTURL;
+ pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_DEFAULTFILTER;
+ pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR PROPERTYNAME_ICON;
nPropStart += PROPERTYCOUNT;
}
@@ -1134,23 +1134,23 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const OU
SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const OUString& sName)
{
- if (sName.equals(FACTORYNAME_WRITERGLOBAL))
+ if (sName == FACTORYNAME_WRITERGLOBAL)
return E_WRITERGLOBAL;
- if (sName.equals(FACTORYNAME_WRITERWEB))
+ if (sName == FACTORYNAME_WRITERWEB)
return E_WRITERWEB;
- if (sName.equals(FACTORYNAME_WRITER))
+ if (sName == FACTORYNAME_WRITER)
return E_WRITER;
- if (sName.equals(FACTORYNAME_CALC))
+ if (sName == FACTORYNAME_CALC)
return E_CALC;
- if (sName.equals(FACTORYNAME_DRAW))
+ if (sName == FACTORYNAME_DRAW)
return E_DRAW;
- if (sName.equals(FACTORYNAME_IMPRESS))
+ if (sName == FACTORYNAME_IMPRESS)
return E_IMPRESS;
- if (sName.equals(FACTORYNAME_MATH))
+ if (sName == FACTORYNAME_MATH)
return E_MATH;
- if (sName.equals(FACTORYNAME_CHART))
+ if (sName == FACTORYNAME_CHART)
return E_CHART;
- if (sName.equals(FACTORYNAME_DATABASE))
+ if (sName == FACTORYNAME_DATABASE)
return E_DATABASE;
return E_UNKNOWN_FACTORY;
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index afe61b8..d831914 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -32,10 +32,9 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
#define CFG_FILENAME OUString( "Office.OptionsDialog" )
-#define ROOT_NODE OUString( "OptionsDialogGroups" )
-#define PAGES_NODE OUString( "Pages" )
-#define OPTIONS_NODE OUString( "Options" )
-#define PROPERTY_HIDE OUString( "Hide" )
+#define ROOT_NODE "OptionsDialogGroups"
+#define PAGES_NODE "Pages"
+#define OPTIONS_NODE "Options"
static SvtOptionsDlgOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
@@ -135,7 +134,7 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
}
Sequence< OUString > lResult( nLen );
- lResult[0] = OUString( sNode + PROPERTY_HIDE );
+ lResult[0] = OUString( sNode + "Hide" );
if ( _eType != NT_Option )
lResult[1] = OUString( sNode + sSet );
@@ -162,15 +161,15 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
OUString getGroupPath( const OUString& _rGroup )
{
- return OUString( ROOT_NODE + "/" + _rGroup + "/" );
+ return OUString( ROOT_NODE "/" + _rGroup + "/" );
}
OUString getPagePath( const OUString& _rPage )
{
- return OUString( PAGES_NODE + "/" + _rPage + "/" );
+ return OUString( PAGES_NODE "/" + _rPage + "/" );
}
OUString getOptionPath( const OUString& _rOption )
{
- return OUString( OPTIONS_NODE + "/" + _rOption + "/" );
+ return OUString( OPTIONS_NODE "/" + _rOption + "/" );
}
bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index fa25d34..cbcb7e8 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -101,12 +101,12 @@ public:
#define ROOTNODE_SYSLOCALE OUString("Setup/L10N")
-#define PROPERTYNAME_LOCALE OUString("ooSetupSystemLocale")
-#define PROPERTYNAME_UILOCALE OUString("ooLocale")
-#define PROPERTYNAME_CURRENCY OUString("ooSetupCurrency")
-#define PROPERTYNAME_DECIMALSEPARATOR OUString("DecimalSeparatorAsLocale")
-#define PROPERTYNAME_DATEPATTERNS OUString("DateAcceptancePatterns")
-#define PROPERTYNAME_IGNORELANGCHANGE OUString("IgnoreLanguageChange")
+#define PROPERTYNAME_LOCALE "ooSetupSystemLocale"
+#define PROPERTYNAME_UILOCALE "ooLocale"
+#define PROPERTYNAME_CURRENCY "ooSetupCurrency"
+#define PROPERTYNAME_DECIMALSEPARATOR "DecimalSeparatorAsLocale"
+#define PROPERTYNAME_DATEPATTERNS "DateAcceptancePatterns"
+#define PROPERTYNAME_IGNORELANGCHANGE "IgnoreLanguageChange"
#define PROPERTYHANDLE_LOCALE 0
#define PROPERTYHANDLE_UILOCALE 1
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index fcfd2c3..26a3b31 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -116,20 +116,20 @@ const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const
void LocaleDataWrapper::invalidateData()
{
- aCurrSymbol = "";
- aCurrBankSymbol = "";
+ aCurrSymbol.clear();
+ aCurrBankSymbol.clear();
nDateFormat = nLongDateFormat = nDateFormatInvalid;
nCurrPositiveFormat = nCurrNegativeFormat = nCurrDigits = nCurrFormatInvalid;
if ( bLocaleDataItemValid )
{
for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j)
- aLocaleItem[j] = "";
+ aLocaleItem[j].clear();
bLocaleDataItemValid = false;
}
if ( bReservedWordValid )
{
for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j )
- aReservedWord[j] = "";
+ aReservedWord[j].clear();
bReservedWordValid = false;
}
xDefaultCalendar.reset();
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 6caa86b..60a7fa2 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -162,7 +162,7 @@ namespace
else if (i_str[io_index] == '+' || i_str[io_index] == '-') // other timezones indicator
{
++io_index;
- o_strInt = "";
+ o_strInt.clear();
for (; io_index < i_str.getLength(); ++io_index)
{
const sal_Unicode c = i_str[io_index];
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 4d08c63..d602452 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -39,7 +39,7 @@ namespace utl
bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn )
{
- rReturn = "";
+ rReturn.clear();
Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create(
@@ -58,7 +58,7 @@ bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUStr
bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn )
{
- rReturn = "";
+ rReturn.clear();
Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create(
comphelper::getProcessComponentContext() ) );
@@ -93,7 +93,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString&
bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn)
{
- rReturn = "";
+ rReturn.clear();
Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create(
comphelper::getProcessComponentContext() ) );
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 42bce6a..b91d53f 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -973,8 +973,7 @@ static bool UCBOpenContentSync(
OUString() );
aExcep.Server = aURL.GetHost();
aExcep.Classification = InteractionClassification_ERROR;
- aExcep.Message =
- OUString( "server not responding after five seconds");
+ aExcep.Message = "server not responding after five seconds";
Any request;
request <<= aExcep;
ucbhelper::InteractionRequest *ir =
commit 484401bb5e2aaea5cb1645743ed615f4166b6cda
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 18 13:38:03 2014 +0100
unotest: Use appropriate OUString functions on string constants
Change-Id: I449587dd8e6e625e886e4ffc6419c612adffcfde
diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx
index 0020649..7a7e765 100644
--- a/unotest/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
@@ -32,8 +32,7 @@ namespace detail {
bool getArgument(OUString const & name, OUString * value) {
OSL_ASSERT(value != 0);
- return rtl::Bootstrap::get(
- OUString("arg-") + name, *value);
+ return rtl::Bootstrap::get("arg-" + name, *value);
}
}
diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx
index 86ca32b..93300c5 100644
--- a/unotest/source/cpp/gettestargument.cxx
+++ b/unotest/source/cpp/gettestargument.cxx
@@ -28,8 +28,7 @@
namespace test {
bool getTestArgument(OUString const & name, OUString * value) {
- return detail::getArgument(
- OUString("testarg.") + name, value);
+ return detail::getArgument("testarg." + name, value);
}
}
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index 91568b0..0c9f045 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -65,9 +65,7 @@ void OfficeConnection::setUp() {
OUString argUser;
CPPUNIT_ASSERT(
detail::getArgument(OUString("user"), &argUser));
- OUString userArg(
- OUString("-env:UserInstallation=") +
- toAbsoluteFileUrl(argUser));
+ OUString userArg("-env:UserInstallation=" + toAbsoluteFileUrl(argUser));
OUString jreArg(
"-env:UNO_JAVA_JFW_ENV_JREHOME=true");
OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
@@ -101,9 +99,7 @@ void OfficeConnection::setUp() {
context_ =
css::uno::Reference< css::uno::XComponentContext >(
resolver->resolve(
- OUString("uno:") +
- desc +
- OUString(";urp;StarOffice.ComponentContext")),
+ "uno:" + desc + ";urp;StarOffice.ComponentContext"),
css::uno::UNO_QUERY_THROW);
break;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list