summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (diff)
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--accessibility/source/extended/accessibletabbarpage.cxx2
-rw-r--r--accessibility/source/standard/accessiblemenuitemcomponent.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessiblelistitem.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblestatusbaritem.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessibletabpage.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibletextcomponent.cxx2
-rw-r--r--avmedia/source/framework/mediaitem.cxx2
-rw-r--r--avmedia/source/framework/modeltools.cxx4
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx2
-rw-r--r--avmedia/source/win/framegrabber.cxx2
-rw-r--r--avmedia/source/win/player.cxx2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx2
-rw-r--r--basic/source/classes/errobject.cxx2
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/runtime/iosys.cxx6
-rw-r--r--bridges/source/cpp_uno/shared/vtablefactory.cxx2
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx2
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx4
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx2
-rw-r--r--codemaker/source/codemaker/global.cxx2
-rw-r--r--codemaker/source/javamaker/javatype.cxx2
-rw-r--r--comphelper/qa/string/test_string.cxx2
-rw-r--r--comphelper/source/misc/documentinfo.cxx2
-rw-r--r--configmgr/source/valueparser.cxx2
-rw-r--r--connectivity/source/commontools/CommonTools.cxx2
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx2
-rw-r--r--connectivity/source/commontools/parameters.cxx2
-rw-r--r--connectivity/source/commontools/predicateinput.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx2
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx8
-rw-r--r--connectivity/source/sdbcx/VCatalog.cxx6
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/cfgutil.cxx10
-rw-r--r--cui/source/customize/selector.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx6
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx2
-rw-r--r--dbaccess/source/ui/browser/dsbrowserDnD.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx2
-rw-r--r--dbaccess/source/ui/inc/indexes.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx2
-rw-r--r--editeng/source/editeng/editattr.cxx2
-rw-r--r--editeng/source/editeng/textconv.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx6
-rw-r--r--editeng/source/items/paraitem.cxx6
-rw-r--r--editeng/source/items/textitem.cxx10
-rw-r--r--editeng/source/misc/hangulhanja.cxx2
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx12
-rw-r--r--embeddedobj/source/general/dummyobject.cxx2
-rw-r--r--embeddedobj/source/msole/oleembed.cxx2
-rw-r--r--embeddedobj/source/msole/olepersist.cxx10
-rw-r--r--embeddedobj/source/msole/ownview.cxx4
-rw-r--r--extensions/source/bibliography/datman.hxx2
-rw-r--r--extensions/source/bibliography/general.cxx2
-rw-r--r--extensions/source/logging/loghandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/update/check/download.cxx6
-rw-r--r--extensions/source/update/check/updatecheck.cxx2
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx6
-rw-r--r--filter/source/config/cache/typedetection.cxx14
-rw-r--r--filter/source/msfilter/svdfppt.cxx8
-rw-r--r--filter/source/pdf/pdfexport.cxx4
-rw-r--r--filter/source/xsltdialog/typedetectionimport.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx4
-rw-r--r--forms/source/component/Button.cxx4
-rw-r--r--forms/source/component/ComboBox.cxx6
-rw-r--r--forms/source/component/File.cxx2
-rw-r--r--forms/source/component/Hidden.cxx2
-rw-r--r--forms/source/component/ImageButton.cxx4
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/component/imgprod.cxx4
-rw-r--r--forms/source/xforms/datatypes.cxx2
-rw-r--r--forms/source/xforms/mip.cxx6
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.cxx2
-rw-r--r--framework/inc/classes/filtercachedata.hxx24
-rw-r--r--framework/inc/queries.h2
-rw-r--r--framework/source/accelerators/presethandler.cxx2
-rw-r--r--framework/source/fwe/xml/xmlnamespaces.cxx2
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/helper/vclstatusindicator.cxx2
-rw-r--r--framework/source/jobs/helponstartup.cxx6
-rw-r--r--framework/source/jobs/joburl.cxx12
-rw-r--r--framework/source/layoutmanager/helpers.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx4
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx4
-rw-r--r--i18nlangtag/source/isolang/mslangid.cxx2
-rw-r--r--i18nlangtag/source/languagetag/languagetag.cxx37
-rw-r--r--i18npool/source/characterclassification/cclass_unicode_parser.cxx2
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_default.cxx6
-rw-r--r--idl/inc/database.hxx2
-rw-r--r--idl/source/cmptools/lex.cxx2
-rw-r--r--idlc/source/astdeclaration.cxx2
-rw-r--r--idlc/source/idlc.cxx8
-rw-r--r--include/rtl/string.hxx10
-rw-r--r--include/rtl/ustring.hxx9
-rw-r--r--jvmfwk/source/fwkbase.cxx4
-rw-r--r--l10ntools/source/cfgmerge.cxx4
-rw-r--r--linguistic/source/dicimp.cxx2
-rw-r--r--linguistic/source/gciterator.cxx2
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.cxx2
-rw-r--r--mysqlc/source/mysqlc_connection.cxx2
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx2
-rw-r--r--oox/source/drawingml/hyperlinkcontext.cxx2
-rw-r--r--oox/source/drawingml/textfont.cxx2
-rw-r--r--oox/source/dump/dumperbase.cxx4
-rw-r--r--oox/source/dump/oledumper.cxx4
-rw-r--r--oox/source/ole/axcontrol.cxx2
-rw-r--r--oox/source/ppt/commonbehaviorcontext.cxx2
-rw-r--r--oox/source/vml/vmlshapecontext.cxx2
-rw-r--r--package/source/xstor/owriteablestream.cxx12
-rw-r--r--registry/source/keyimpl.cxx4
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx6
-rw-r--r--rsc/source/rsc/rsc.cxx2
-rw-r--r--rsc/source/tools/rschash.cxx2
-rw-r--r--sc/qa/unit/ucalc_formula.cxx2
-rw-r--r--sc/source/core/data/attrib.cxx8
-rw-r--r--sc/source/core/data/conditio.cxx6
-rw-r--r--sc/source/core/data/documen2.cxx2
-rw-r--r--sc/source/core/data/documen3.cxx2
-rw-r--r--sc/source/core/data/documen5.cxx2
-rw-r--r--sc/source/core/data/document.cxx8
-rw-r--r--sc/source/core/data/dpshttab.cxx2
-rw-r--r--sc/source/core/data/funcdesc.cxx2
-rw-r--r--sc/source/core/data/sortparam.cxx2
-rw-r--r--sc/source/core/data/table1.cxx2
-rw-r--r--sc/source/core/data/table2.cxx6
-rw-r--r--sc/source/core/data/table6.cxx4
-rw-r--r--sc/source/core/tool/callform.cxx4
-rw-r--r--sc/source/core/tool/chgtrack.cxx8
-rw-r--r--sc/source/core/tool/editutil.cxx4
-rw-r--r--sc/source/core/tool/rangeutl.cxx2
-rw-r--r--sc/source/filter/dif/difimp.cxx4
-rw-r--r--sc/source/filter/excel/xiescher.cxx10
-rw-r--r--sc/source/filter/excel/xipivot.cxx2
-rw-r--r--sc/source/filter/excel/xlchart.cxx2
-rw-r--r--sc/source/filter/excel/xlpivot.cxx14
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/oox/numberformatsbuffer.cxx2
-rw-r--r--sc/source/filter/oox/richstring.cxx2
-rw-r--r--sc/source/filter/oox/sheetdatacontext.cxx4
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx2
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx2
-rw-r--r--sc/source/filter/xml/celltextparacontext.cxx4
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx8
-rw-r--r--sc/source/ui/app/inputhdl.cxx12
-rw-r--r--sc/source/ui/app/scmod.cxx10
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx6
-rw-r--r--sc/source/ui/docshell/impex.cxx4
-rw-r--r--sc/source/ui/docshell/tablink.cxx2
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx2
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx8
-rw-r--r--sc/source/ui/view/gridwin2.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx2
-rw-r--r--sc/source/ui/view/tabcont.cxx2
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx3
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/filter/ppt/propread.cxx6
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
-rw-r--r--sd/source/ui/docshell/docshel2.cxx2
-rw-r--r--sd/source/ui/framework/module/ResourceManager.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx4
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx2
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx8
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx4
-rw-r--r--sfx2/source/appl/imagemgr.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx2
-rw-r--r--sfx2/source/appl/sfxhelp.cxx2
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx2
-rw-r--r--sfx2/source/config/evntconf.cxx2
-rw-r--r--sfx2/source/control/templatelocalview.cxx2
-rw-r--r--sfx2/source/dialog/mgetempl.cxx2
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx2
-rw-r--r--sfx2/source/doc/docfilt.cxx2
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx4
-rw-r--r--sfx2/source/doc/objstor.cxx2
-rw-r--r--sfx2/source/sidebar/CommandInfoProvider.cxx2
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx8
-rw-r--r--sfx2/source/view/frmload.cxx2
-rw-r--r--starmath/source/dialog.cxx4
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/mathtype.cxx62
-rw-r--r--starmath/source/parse.cxx2
-rw-r--r--stoc/source/uriproc/UriReference.cxx2
-rw-r--r--svgio/source/svgreader/svgtools.cxx5
-rw-r--r--svl/source/inc/passwordcontainer.hxx4
-rw-r--r--svl/source/items/ctypeitm.cxx2
-rw-r--r--svl/source/items/flagitem.cxx2
-rw-r--r--svl/source/items/macitem.cxx2
-rw-r--r--svl/source/items/poolio.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx2
-rw-r--r--svl/source/passwordcontainer/syscreds.cxx2
-rw-r--r--svl/source/svdde/ddesvr.cxx2
-rw-r--r--svtools/source/contnr/svtabbx.cxx6
-rw-r--r--svtools/source/control/headbar.cxx4
-rw-r--r--svtools/source/control/tabbar.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx2
-rw-r--r--svtools/source/graphic/descriptor.cxx2
-rw-r--r--svtools/source/misc/embedhlp.cxx2
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--svx/source/inc/fmcontrolbordermanager.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/items/drawitem.cxx12
-rw-r--r--svx/source/items/grfitem.cxx2
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/svdraw/svdmark.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx4
-rw-r--r--svx/source/xoutdev/xattr2.cxx32
-rw-r--r--sw/inc/shellio.hxx2
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentListsManager.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/fields/cellfml.cxx2
-rw-r--r--sw/source/core/fields/chpfld.cxx8
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx6
-rw-r--r--sw/source/core/fields/reffld.cxx2
-rw-r--r--sw/source/core/frmedt/fetab.cxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx2
-rw-r--r--sw/source/core/table/swtable.cxx2
-rw-r--r--sw/source/core/text/porexp.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx2
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx8
-rw-r--r--sw/source/core/unocore/unosett.cxx8
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/htmlatr.cxx4
-rw-r--r--sw/source/filter/html/htmlsect.cxx3
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/frmdlg/cption.cxx2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx2
-rw-r--r--sw/source/ui/misc/outline.cxx4
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx32
-rw-r--r--sw/source/uibase/dbui/mailmergechildwindow.cxx2
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx4
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx2
-rw-r--r--sw/source/uibase/shells/frmsh.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx2
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx4
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx32
-rw-r--r--sw/source/uibase/utlui/content.cxx6
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx3
-rw-r--r--sw/source/uibase/utlui/zoomctrl.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx2
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx2
-rw-r--r--toolkit/source/controls/grid/gridcolumn.cxx3
-rw-r--r--tools/source/inet/inetmime.cxx2
-rw-r--r--tools/source/misc/getprocessworkingdir.cxx2
-rw-r--r--tools/source/stream/stream.cxx6
-rw-r--r--tubes/source/manager.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx3
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.hxx2
-rw-r--r--ucb/source/ucp/package/pkguri.cxx7
-rw-r--r--ucb/source/ucp/package/pkguri.hxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_uri.hxx8
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx6
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx6
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.cxx4
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx6
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx2
-rw-r--r--unotools/source/config/defaultoptions.cxx2
-rw-r--r--unotools/source/config/viewoptions.cxx2
-rw-r--r--unotools/source/ucbhelper/localfilehelper.cxx2
-rw-r--r--unoxml/source/dom/documentbuilder.cxx2
-rw-r--r--unoxml/source/dom/saxbuilder.cxx8
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/generic/fontmanager/helper.cxx2
-rw-r--r--vcl/generic/print/genprnpsp.cxx7
-rw-r--r--vcl/generic/print/printerjob.cxx2
-rw-r--r--vcl/generic/print/text_gfx.cxx2
-rw-r--r--vcl/osx/DataFlavorMapping.cxx2
-rw-r--r--vcl/osx/salframeview.mm4
-rw-r--r--vcl/source/control/field.cxx2
-rw-r--r--vcl/source/control/fixed.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx2
-rw-r--r--vcl/source/gdi/impimagetree.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/gdi/print.cxx2
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/source/window/menuitemlist.cxx2
-rw-r--r--vcl/source/window/winproc.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx2
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx10
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx2
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx4
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx4
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx2
-rw-r--r--xmloff/source/core/nmspmap.cxx2
-rw-r--r--xmloff/source/style/numehelp.cxx2
-rw-r--r--xmloff/source/style/prstylei.cxx2
-rw-r--r--xmloff/source/style/xmlnumi.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx2
-rw-r--r--xmloff/source/text/txtexppr.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx2
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx4
-rw-r--r--xmlsecurity/source/helper/xsecparser.cxx10
357 files changed, 714 insertions, 667 deletions
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 9723d570efc2..c3d6533261ee 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -242,7 +242,7 @@ namespace accessibility
void AccessibleTabBarPage::disposing()
{
AccessibleTabBarBase::disposing();
- m_sPageText = OUString();
+ m_sPageText.clear();
}
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 60c7b6b77e96..73674c7195f9 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -299,8 +299,8 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing()
OAccessibleMenuBaseComponent::disposing();
m_pParent = NULL;
- m_sAccessibleName = OUString();
- m_sItemText = OUString();
+ m_sAccessibleName.clear();
+ m_sItemText.clear();
}
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 76044a2ffd05..96f8a249fc4e 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -183,7 +183,7 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
::osl::MutexGuard aGuard( m_aMutex );
VCLXAccessibleListItem_BASE::disposing();
- m_sEntryText = OUString();
+ m_sEntryText.clear();
m_pListBoxHelper = NULL;
m_xParent = NULL;
m_xParentContext = NULL;
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 6ed6ec6e4a58..089176fdbb66 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -221,8 +221,8 @@ void VCLXAccessibleStatusBarItem::disposing()
AccessibleTextHelper_BASE::disposing();
m_pStatusBar = NULL;
- m_sItemName = OUString();
- m_sItemText = OUString();
+ m_sItemName.clear();
+ m_sItemText.clear();
}
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 5797ccca10d6..61a091af3958 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -254,7 +254,7 @@ void VCLXAccessibleTabPage::disposing()
AccessibleTextHelper_BASE::disposing();
m_pTabControl = NULL;
- m_sPageText = OUString();
+ m_sPageText.clear();
}
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index ba92960e4d02..111f95716049 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -125,7 +125,7 @@ void VCLXAccessibleTextComponent::disposing()
{
VCLXAccessibleComponent::disposing();
- m_sText = OUString();
+ m_sText.clear();
}
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7861446c2d63..3b3352916c77 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -133,7 +133,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
OUString& rText,
const IntlWrapper * ) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 003c84ce349e..524e37a386ee 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -48,7 +48,7 @@ namespace avmedia {
static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL)
{
- o_rDaeFileURL = OUString();
+ o_rDaeFileURL.clear();
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), rSourceURL);
uno::Sequence< OUString > aNames = xNameAccess->getElementNames();
@@ -70,7 +70,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
{
- o_rOutput = OUString();
+ o_rOutput.clear();
const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(".dae");
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz");
if( !bIsDAE && !bIsKMZ )
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 836e89e3fee8..cc44a4a9347d 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -401,7 +401,7 @@ bool Player::create( const OUString& rURL )
if( bRet )
maURL = rURL;
else
- maURL = OUString();
+ maURL.clear();
return bRet;
}
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index a52199a63f66..22326a60fdff 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
}
}
else if( !rURL.isEmpty() )
- rURL = OUString();
+ rURL.clear();
return !rURL.isEmpty();
}
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 66a625169502..6fb869c6fe93 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -299,7 +299,7 @@ void MediaWindowImpl::setURL( const OUString& rURL,
}
mxPlayer.clear();
- mTempFileURL = OUString();
+ mTempFileURL.clear();
if (!rTempURL.isEmpty())
{
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index aef5be256316..1418276c1626 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -96,7 +96,7 @@ bool FrameGrabber::create( const OUString& rURL )
pDet = NULL;
}
else
- maURL = OUString();
+ maURL.clear();
return !maURL.isEmpty();
}
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 9fc766428746..baf72ad9e6cf 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -189,7 +189,7 @@ bool Player::create( const OUString& rURL )
if( bRet )
maURL = rURL;
else
- maURL = OUString();
+ maURL.clear();
return bRet;
}
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index c4f54e350118..0f8c9d9213fe 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -681,7 +681,7 @@ namespace basctl
bool ScriptDocument::Impl::createModule( const OUString& _rLibName, const OUString& _rModName, bool _bCreateMain, OUString& _out_rNewModuleCode ) const
{
- _out_rNewModuleCode = OUString();
+ _out_rNewModuleCode.clear();
try
{
Reference< XNameContainer > xLib( getLibrary( E_SCRIPTS, _rLibName, true ) );
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 64f88a2815a8..163336be8fe8 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -137,7 +137,7 @@ ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, st
void SAL_CALL
ErrObject::Clear( ) throw (uno::RuntimeException, std::exception)
{
- m_sHelpFile = OUString();
+ m_sHelpFile.clear();
m_sSource = m_sHelpFile;
m_sDescription = m_sSource;
m_nNumber = 0;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index aff857622a53..91b98d7d1322 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1833,7 +1833,7 @@ bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
bRet = SbxObject::StoreData( rStrm );
if( bRet )
{
- pImage->aOUSource = OUString();
+ (pImage->aOUSource).clear();
pImage->aComment = aComment;
pImage->aName = GetName();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4465743a6581..4627218ce6a6 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -738,7 +738,7 @@ SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n )
aLine = aLine.copy(0, nLineLen);
}
WriteLines(*pStrm, aLine);
- aLine = OString();
+ aLine.clear();
}
}
else
@@ -857,7 +857,7 @@ void SbiIoSystem::Shutdown()
MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut ).Execute();
#endif
}
- aOut = OUString();
+ aOut.clear();
}
@@ -965,7 +965,7 @@ void SbiIoSystem::ReadCon(OString& rIn)
{
nError = SbERR_USER_ABORT;
}
- aPrompt = OString();
+ aPrompt.clear();
}
// output of a MessageBox, if theres a CR in the console-buffer
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 2af1b6287cb6..f646c8979d57 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -288,7 +288,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
freeBlock(block);
- strDirectory = OUString();
+ strDirectory.clear();
}
if (!block.start || !block.exec || block.fd == -1)
{
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index a7869d732156..8389fe4e932c 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -409,7 +409,7 @@ OUString SelectionHelper::getHitObjectCID(
//accept only named objects while searching for the object to select
if( !findNamedParent( pNewObj, aRet, true ) )
{
- aRet = OUString();
+ aRet.clear();
}
OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 1452af7c5791..27de75e50672 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -542,7 +542,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
aElem = OUString(pElem, p-pElem);
aRawElems.push_back(aElem);
pElem = NULL;
- aElem = OUString();
+ aElem.clear();
++p; // Skip '"'.
if (p == pEnd)
@@ -560,7 +560,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
aElem = OUString(pElem, p-pElem);
aRawElems.push_back(aElem);
pElem = NULL;
- aElem = OUString();
+ aElem.clear();
}
else if (!pElem)
pElem = p;
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 7cd278903c3e..9f5db9926456 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -497,7 +497,7 @@ void VDiagram::createShapes_3d()
OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
if( !bAddFloorAndWall )
- aWallCID = OUString();
+ aWallCID.clear();
uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) );
CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) );
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 6b15abb5b2a1..ee12bc54b15b 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -325,7 +325,7 @@ void FileStream::close()
{
osl_closeFile(m_file);
m_file = NULL;
- m_name = OString();
+ m_name.clear();
}
}
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 572ad4ff76cb..4dc7f5c5647a 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -308,7 +308,7 @@ SpecialType getFieldDescriptor(
if (needsSig) {
*signature = sig.makeStringAndClear();
} else {
- *signature = OString();
+ signature->clear();
}
}
return specialType;
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index 5e9f23ffb087..6100a777f63a 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -405,7 +405,7 @@ void TestString::testEqualsString()
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'B'));
aIn = OString("AA");
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
- aIn = OString();
+ aIn.clear();
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
}
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 7456e64925f8..4ddf1f2871c3 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -96,7 +96,7 @@ namespace comphelper {
// private:object as URL
sDocURL = _rxDocument->getURL();
if ( sDocURL.matchAsciiL( "private:", 8 ) )
- sDocURL = OUString();
+ sDocURL.clear();
// 2. if the document is not saved, yet, check the frame title
if ( sDocURL.isEmpty() )
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 183b51009dd3..487d91400fcf 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -403,7 +403,7 @@ bool ValueParser::endElement() {
}
items_.clear();
}
- separator_ = OString();
+ separator_.clear();
node_.clear();
}
break;
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index d67a794002bc..5aa7dc939bd7 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -233,7 +233,7 @@ OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials)
}
if ( !bValid )
- aNewName = OUString();
+ aNewName.clear();
return aNewName;
}
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 1312e7e54c9a..5f2b28f1eab0 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -369,7 +369,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
// this must be outsid the "if" because we have to call in a right order
sCatalog = xRow->getString(1);
if ( xRow->wasNull() )
- sCatalog = OUString();
+ sCatalog.clear();
aSchema = xRow->getString(2);
aName = xRow->getString(3);
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 72757fb8f9b7..4bc8b46bef7c 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -108,7 +108,7 @@ namespace dbtools
m_aParameterInformation.swap( aEmptyInfo );
m_aMasterFields.realloc( 0 );
m_aDetailFields.realloc( 0 );
- m_sIdentifierQuoteString = OUString();
+ m_sIdentifierQuoteString.clear();
::std::vector< bool > aEmptyArray;
m_aParametersVisited.swap( aEmptyArray );
m_bUpToDate = false;
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 4fbd21764d6c..5d0cc9d531d9 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -267,7 +267,7 @@ namespace dbtools
getSeparatorChars( rParseContext.getPreferredLocale(), nDecSeparator, nThousandSeparator );
// translate it back into a string
- sTransformedText = OUString();
+ sTransformedText.clear();
pParseNode->parseNodeToPredicateStr(
sTransformedText, m_xConnection, m_xFormatter, _rxField, OUString(),
rParseContext.getPreferredLocale(), (sal_Char)nDecSeparator, &rParseContext
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 0ce8ae423255..d28fa19c1dff 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -405,7 +405,7 @@ void ODbaseIndex::createINFEntry()
aKeyName = aInfFile.GetKeyName(i);
if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry))
{
- aNewEntry = OString();
+ aNewEntry.clear();
break;
}
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 937773d53cef..4e44f5e33b7c 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1574,7 +1574,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
if (xTableColumn.is())
xTableColumn->getPropertyValue(sName) >>= sTableColumnName;
else
- sTableColumnName = OUString();
+ sTableColumnName.clear();
// look if we have such a select column
// TODO: would like to have a O(log n) search here ...
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index dcaa620eaa8f..5a7bbe6dd5e4 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -417,7 +417,7 @@ sal_Bool PreparedStatement::execute( )
m_executedStatement = buf.makeStringAndClear();
m_lastResultset.clear();
- m_lastTableInserted = OUString();
+ m_lastTableInserted.clear();
struct CommandData data;
data.refMutex = m_refMutex;
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 629d362866b9..5c20b9a989f6 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -464,7 +464,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data )
ExecStatusType state = PQresultStatus( result );
*(data->pLastOidInserted) = 0;
- *(data->pLastTableInserted) = OUString();
+ (data->pLastTableInserted)->clear();
*(data->pLastQuery) = cmd;
bool ret = false;
@@ -858,7 +858,7 @@ sal_Bool Statement::execute( const OUString& sql )
OString cmd = OUStringToOString( sql, m_pSettings );
m_lastResultset.clear();
- m_lastTableInserted = OUString();
+ m_lastTableInserted.clear();
struct CommandData data;
data.refMutex = m_refMutex;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 17428fd96fe2..3f8e85fb7c74 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -552,7 +552,7 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt
switch (vec.size())
{
case 1:
- *first = OUString();
+ first->clear();
*second = OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 );
break;
case 3:
@@ -808,7 +808,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
RTL_CONSTASCII_STRINGPARAM( "(" ) ) == 0 )
{
// whoops, it is a function
- ret = OString();
+ ret.clear();
}
else
{
@@ -828,7 +828,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
RTL_CONSTASCII_STRINGPARAM( "," ) ) == 0 )
{
// whoops, multiple tables are used
- ret = OString();
+ ret.clear();
}
else
{
@@ -842,7 +842,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
strlen(forbiddenKeywords[i]) ) )
{
// whoops, it is a join
- ret = OString();
+ ret.clear();
}
}
}
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index fe4e13ae87a2..ef3880f632ce 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -189,13 +189,13 @@ OUString OCatalog::buildName(const Reference< XRow >& _xRow)
{
OUString sCatalog = _xRow->getString(1);
if ( _xRow->wasNull() )
- sCatalog = OUString();
+ sCatalog.clear();
OUString sSchema = _xRow->getString(2);
if ( _xRow->wasNull() )
- sSchema = OUString();
+ sSchema.clear();
OUString sTable = _xRow->getString(3);
if ( _xRow->wasNull() )
- sTable = OUString();
+ sTable.clear();
OUString sComposedName(
::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, false, ::dbtools::eInDataManipulation ) );
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d324dfebad23..94f7d79f1926 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1090,7 +1090,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
// remove function name from selected entry
sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
- pEntry->m_sCommand = OUString();
+ (pEntry->m_sCommand).clear();
((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 9f63afd4e447..6cb2357d1ed0 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -103,8 +103,8 @@ bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
if (!aStyle.sCommand.startsWith(CMDURL_STYLEPROT_ONLY))
return false;
- aStyle.sFamily = OUString();
- aStyle.sStyle = OUString();
+ aStyle.sFamily.clear();
+ aStyle.sStyle.clear();
sal_Int32 nCmdLen = aStyle.sCommand.getLength();
OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
@@ -148,14 +148,14 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
if (xStyleSet.is())
xStyleSet->getByName(aStyle.sStyle) >>= xStyle;
- aStyle.sLabel = OUString();
+ aStyle.sLabel.clear();
if (xStyle.is())
xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel;
}
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { aStyle.sLabel = OUString(); }
+ { aStyle.sLabel.clear(); }
if (aStyle.sLabel.isEmpty())
{
@@ -839,7 +839,7 @@ OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(css::uno::Exception&)
- { sUIName = OUString(); }
+ { sUIName.clear(); }
// fallback for missing UINames !?
if (sUIName.isEmpty())
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 5541697f4380..4bb467a41b6c 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -422,7 +422,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
try{
aModuleId = xModuleManager->identify( m_xFrame );
}catch(const uno::Exception&)
- { aModuleId = OUString(); }
+ { aModuleId.clear(); }
Reference< container::XNameAccess > const xNameAccess(
frame::theUICommandDescription::get(xContext) );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index cf22d8d858a7..10fa9967c587 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -421,7 +421,7 @@ static void Plugin_ImplFillCommandSequence( const OUString& aCommands, uno::Sequ
short SvInsertPlugInDialog::Execute()
{
short nRet = RET_OK;
- m_aCommands = OUString();
+ m_aCommands.clear();
DBG_ASSERT( m_xStorage.is(), "No storage!");
if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK )
{
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3e0644c0b70f..fd7810c7ada2 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -226,7 +226,7 @@ static void deleteGroupNames()
{
sal_uInt16 nIndex = 0;
while ( ModuleMap[ nIndex ].m_pModule )
- ModuleMap[ nIndex++ ].m_sGroupName = OUString();
+ ModuleMap[ nIndex++ ].m_sGroupName.clear();
}
static sal_uInt16 getGroupNodeId( const OUString& rModule )
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 7b912320f266..ef3c0e079e16 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -330,7 +330,7 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) th
// we have no "elementary" parts anymore (means filter/groupby/having/order clauses)
for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) )
- m_aElementaryParts[ eLoopParts ] = OUString();
+ m_aElementaryParts[ eLoopParts ].clear();
}
void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException, std::exception)
@@ -1754,21 +1754,21 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
- sCondition = OUString();
+ sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
OSQLParseNode::disjunctiveNormalForm(pCondition);
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
- sCondition = OUString();
+ sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
OSQLParseNode::absorptions(pCondition);
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
- sCondition = OUString();
+ sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
if ( pCondition )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 25923c4de031..b6c57087c0ae 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -917,7 +917,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
case PROPERTY_ID_USER:
rValue >>= m_pImpl->m_sUser;
// if the user name has changed, reset the password
- m_pImpl->m_aPassword = OUString();
+ (m_pImpl->m_aPassword).clear();
break;
case PROPERTY_ID_PASSWORD:
rValue >>= m_pImpl->m_aPassword;
@@ -1131,7 +1131,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
m_pImpl->m_aPassword = pAuthenticate->getPassword();
bNewPasswordGiven = true;
}
- m_pImpl->m_sFailedPassword = OUString();
+ (m_pImpl->m_sFailedPassword).clear();
}
try
@@ -1146,7 +1146,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
// assume that we had an authentication problem. Without this we may, after an unsuccessful connect, while
// the user gave us a password an the order to remember it, never allow an password input again (at least
// not without restarting the session)
- m_pImpl->m_aPassword = OUString();
+ (m_pImpl->m_aPassword).clear();
}
throw;
}
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index eda7eecd38d5..4c6ec3e6145a 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -69,7 +69,7 @@ namespace dbaccess
void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName )
{
- o_rNamespace = OUString();
+ o_rNamespace.clear();
o_rLocalName = i_rElementName;
const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' );
if ( nSeparatorPos > -1 )
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 4b9d676893e0..90f0b1f7c731 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -59,7 +59,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
const OUString sValue = _xAttrList->getValueByIndex( i );
- aProperty.Name = OUString();
+ aProperty.Name.clear();
aProperty.Value = Any();
switch( rTokenMap.Get( nPrefix, sLocalName ) )
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index a65a3a440915..0403fba293bb 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -138,7 +138,7 @@ namespace dbaui
m_aAsyncDrop.bError = false;
m_aAsyncDrop.bHtml = false;
m_aAsyncDrop.pDroppedAt = NULL;
- m_aAsyncDrop.aUrl = OUString();
+ m_aAsyncDrop.aUrl.clear();
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index d10b40cd32d6..a6ca7ae16bd9 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -118,7 +118,7 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const
&& !xMeta->supportsSchemasInDataManipulation() )
{
aCatalog = aSchema;
- aSchema = OUString();
+ aSchema.clear();
}
aComposedName = ::dbtools::composeTableName(
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index 57a0f2d9682a..91f5d40fa0c8 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -71,7 +71,7 @@ namespace dbaui
void clearModified() { setModified(false); }
bool isNew() const { return getOriginalName().isEmpty(); }
- void flagAsNew(const GrantIndexAccess&) { sOriginalName = OUString(); }
+ void flagAsNew(const GrantIndexAccess&) { sOriginalName.clear(); }
void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; }
private:
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index 178a4508f927..518ffea03243 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -61,7 +61,8 @@ OConnectionLineData& OConnectionLineData::operator=( const OConnectionLineData&
bool OConnectionLineData::Reset()
{
- m_aDestFieldName = m_aSourceFieldName = OUString();
+ m_aDestFieldName.clear();
+ m_aSourceFieldName.clear();
return true;
}
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 85a3e45bc2ca..6c3ab2d64d18 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -61,7 +61,7 @@ OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowDa
// if table name matches alias, do not pass to InitialAlias,
// as the appending of a possible token could not succeed...
if (m_strInitialAlias == pTabWinData->GetTableName())
- m_strInitialAlias = OUString();
+ m_strInitialAlias.clear();
SetHelpId(HID_CTL_QRYDGNTAB);
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 3d78dee5f153..1b66601dabbb 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -904,7 +904,7 @@ void OQueryController::impl_initialize()
break;
case CommandType::COMMAND:
setStatement_fireEvent( sCommand );
- m_sName = OUString();
+ m_sName.clear();
break;
default:
OSL_FAIL( "OQueryController::impl_initialize: logic error in code!" );
@@ -1771,7 +1771,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange )
::dbtools::SQLExceptionInfo aInfo(e);
showError(aInfo);
// an error occurred so we clear the statement
- sTranslatedStmt = OUString();
+ sTranslatedStmt.clear();
}
}
else if(m_sStatement.isEmpty())
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 98a72c8587c8..546b4c9053d8 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -319,7 +319,7 @@ bool ORelationTableConnectionData::Update()
}
// get the name of foreign key; search for columns
- m_aConnName = OUString();
+ m_aConnName.clear();
xKey.clear();
bool bDropRelation = false;
for(sal_Int32 i=0;i<xKeys->getCount();++i)
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 3bdb494924ca..70e5a6e615ce 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -569,7 +569,7 @@ void CopyTableWizard::impl_dialogToAttributes_nothrow( const OCopyTableWizard& _
if ( m_aPrimaryKeyName.IsPresent )
m_aPrimaryKeyName.Value = _rDialog.getPrimaryKeyName();
else
- m_aPrimaryKeyName.Value = OUString();
+ m_aPrimaryKeyName.Value.clear();
m_sDestinationTable = _rDialog.getName();
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 84bf5b7d7318..d64fe67bfe1d 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -266,7 +266,7 @@ void ServiceImpl::startExecuteModal(
myExtMgr->createDialog( false );
if (!m_initialTitle.isEmpty()) {
myExtMgr->SetText( m_initialTitle );
- m_initialTitle = OUString();
+ m_initialTitle.clear();
}
if ( m_bShowUpdateOnly )
{
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 871183f4f6b2..f4aab63200f8 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -561,7 +561,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
//remove also the temp file which we have used to create the unique name
OUString tempFile = m_sDownloadFolder.copy(0, m_sDownloadFolder.getLength() - 1);
dp_misc::erase_path(tempFile, cssu::Reference<css::ucb::XCommandEnvironment>(),false);
- m_sDownloadFolder = OUString();
+ m_sDownloadFolder.clear();
}
}
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index ac55335f0d17..85676abb035e 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -363,7 +363,7 @@ void EditCharAttribField::SetFieldValue(const OUString& rVal)
void EditCharAttribField::Reset()
{
- aFieldValue = OUString();
+ aFieldValue.clear();
delete pTxtColor; pTxtColor = NULL;
delete pFldColor; pFldColor = NULL;
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index dbf19b950cd2..b7ac6448cd11 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -234,7 +234,7 @@ bool TextConvWrapper::ConvContinue_impl()
// modified version of EditSpellWrapper::SpellContinue
// get next convertible text portion and its language
- m_aConvText = OUString();
+ m_aConvText.clear();
m_nConvTextLang = LANGUAGE_NONE;
m_pEditView->GetImpEditEngine()->ImpConvert( m_aConvText, m_nConvTextLang,
m_pEditView, GetSourceLanguage(), m_aConvSel,
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 30253e446cd6..de18d85475d6 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2048,7 +2048,7 @@ bool SvxBoxItem::GetPresentation
{
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- rText = OUString();
+ rText.clear();
if ( pTop )
{
@@ -2561,7 +2561,7 @@ bool SvxBoxInfoItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -3184,7 +3184,7 @@ bool SvxLineItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
- rText = OUString();
+ rText.clear();
if ( pLine )
rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl,
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 0b2e078681ad..aeca389ba342 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -233,7 +233,7 @@ bool SvxLineSpacingItem::GetPresentation
#ifdef DBG_UTIL
rText = "SvxLineSpacingItem";
#else
- rText = OUString();
+ rText.clear();
#endif
return false;
}
@@ -1081,7 +1081,7 @@ bool SvxTabStopItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
- rText = OUString();
+ rText.clear();
bool bComma = false;
@@ -1300,7 +1300,7 @@ bool SvxPageModelItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
bool bSet = !GetValue().isEmpty();
switch ( ePres )
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index c471b45b3052..b4f5303ff383 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -202,7 +202,7 @@ bool SvxFontListItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -1790,7 +1790,7 @@ bool SvxPropSizeItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2015,7 +2015,7 @@ bool SvxCharSetColorItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2549,7 +2549,7 @@ bool SvxNoLinebreakItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2594,7 +2594,7 @@ bool SvxNoHyphenItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index a4c12e1262e1..0d2e6d7ab4cd 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -471,7 +471,7 @@ namespace editeng
{
const bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional;
- m_sCurrentPortion = OUString();
+ m_sCurrentPortion.clear();
m_nCurrentPortionLang = LANGUAGE_NONE;
m_pAntiImpl->GetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges );
m_nReplacementBaseIndex = 0;
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index e67cc77bd14a..e3f615df4e01 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1447,7 +1447,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
{
if ( bUseNew )
m_aEntryName = m_aNewEntryName;
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
return;
}
@@ -1489,7 +1489,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewObjectStorage = uno::Reference< embed::XStorage >();
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_aNewDocMediaDescriptor.realloc( 0 );
m_bWaitSaveCompleted = false;
@@ -1714,12 +1714,12 @@ void SAL_CALL OCommonEmbeddedObject::reload(
{
// the new URL
lArguments[nInd].Value >>= m_aLinkURL;
- m_aLinkFilterName = OUString();
+ m_aLinkFilterName.clear();
}
else if ( lArguments[nInd].Name == "FilterName" )
{
lArguments[nInd].Value >>= aNewLinkFilter;
- m_aLinkFilterName = OUString();
+ m_aLinkFilterName.clear();
}
}
@@ -1886,8 +1886,8 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
m_pDocHolder->Show();
m_bIsLink = false;
- m_aLinkFilterName = OUString();
- m_aLinkURL = OUString();
+ m_aLinkFilterName.clear();
+ m_aLinkURL.clear();
}
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 236f12e16b41..3f6c4167eca3 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -447,7 +447,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
}
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_bWaitSaveCompleted = false;
}
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 81511826ffaf..7bce91d12cb8 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -219,7 +219,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
if ( !xResult.is() )
{
- o_aStorageName = OUString();
+ o_aStorageName.clear();
throw uno::RuntimeException();
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 04224514ced4..7b9fe7827865 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -147,7 +147,7 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
catch( const uno::Exception& )
{
KillFile_Impl( aResult, xFactory );
- aResult = OUString();
+ aResult.clear();
}
}
@@ -726,7 +726,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
{
// this is the own stream, so the temporary URL must be cleaned if it exists
KillFile_Impl( m_aTempURL, m_xFactory );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
#ifdef WNT
@@ -1613,7 +1613,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewObjectStream = uno::Reference< io::XStream >();
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_bWaitSaveCompleted = false;
m_bNewVisReplInStream = false;
m_xNewCachedVisRepl = uno::Reference< io::XStream >();
@@ -1964,7 +1964,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
// disconnect the old temporary URL
OUString aOldTempURL = m_aTempURL;
- m_aTempURL = OUString();
+ m_aTempURL.clear();
OleComponent* pNewOleComponent = new OleComponent( m_xFactory, this );
try {
@@ -2017,7 +2017,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
}
m_bIsLink = sal_False;
- m_aLinkURL = OUString();
+ m_aLinkURL.clear();
}
else
#endif
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index b0ffa3e7227c..277b0c43e578 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -442,7 +442,7 @@ void OwnView_Impl::CreateNative()
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
KillFile_Impl( m_aNativeTempURL, m_xFactory );
- m_aNativeTempURL = OUString();
+ m_aNativeTempURL.clear();
}
}
@@ -453,7 +453,7 @@ void OwnView_Impl::CreateNative()
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
KillFile_Impl( m_aNativeTempURL, m_xFactory );
- m_aNativeTempURL = OUString();
+ m_aNativeTempURL.clear();
}
}
}
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index fa52d0b7491a..ea5738f51378 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -178,7 +178,7 @@ public:
void SetToolbar(BibToolBar* pSet);
const OUString& GetIdentifierMapping();
- void ResetIdentifierMapping() {sIdentifierMapping = OUString();}
+ void ResetIdentifierMapping() {sIdentifierMapping.clear();}
::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
// #100312# ----------
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 26a2512774e2..a08caf9c3486 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -476,7 +476,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
for(sal_uInt16 j = 0; j < TYPE_COUNT; j++)
pValuesArr[j] = aBibTypeArr[j];
// empty string if an invalid value no values is set
- pValuesArr[TYPE_COUNT] = OUString();
+ pValuesArr[TYPE_COUNT].clear();
aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0));
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index c0b6958964e0..7b8af0f35598 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -110,7 +110,7 @@ namespace logging
_out_rEncoding = OUString::createFromAscii( pMimeCharset );
return true;
}
- _out_rEncoding = OUString();
+ _out_rEncoding.clear();
return false;
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4495b842e97a..41167b00a02c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2616,7 +2616,7 @@ namespace pcr
OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(),
"FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: to be called for forms only!" );
- _out_rSelectedClause = OUString();
+ _out_rSelectedClause.clear();
bool bSuccess = false;
SQLExceptionInfo aErrorInfo;
try
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index ac0c4b7688e1..8c0d6d6c4aa2 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -373,7 +373,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
if ( m_aHandler->checkDownloadDestination( aURL.copy( nIndex+1 ) ) )
{
osl_removeFile( aFile.pData );
- aFile = OUString();
+ aFile.clear();
}
else
m_aHandler->downloadStarted( aFile, 0 );
@@ -381,7 +381,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
else
{
osl_removeFile( aFile.pData );
- aFile = OUString();
+ aFile.clear();
}
}
@@ -402,7 +402,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
}
}
else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile ..
- out.File = OUString();
+ out.File.clear();
}
OString aProxyHost;
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 5c1399e70507..0ec35467ac31 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1310,7 +1310,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty())
{
iter2->URL = iter2->URL2;
- iter2->URL2 = OUString();
+ (iter2->URL2).clear();
iter2->Pos = iter2->Pos2;
iter2->Pos2 = 0;
}
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 9bd5fb8720a7..9e222f58413c 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -126,8 +126,8 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
if ( ! ::utl::splitLastFromConfigurationPath(sOrgPath, sTempPath, sProperty))
{
sNode = sLocale;
- sProperty = OUString();
- sLocale = OUString();
+ sProperty.clear();
+ sLocale.clear();
}
else
{
@@ -136,7 +136,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
{
sNode = sProperty;
sProperty = sLocale;
- sLocale = OUString();
+ sLocale.clear();
}
}
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 4919fbaa1372..a7d306892eda 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -453,7 +453,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
"filter.config",
"caught Exception \"" << e.Message
<< "\" while querying type of <" << sURL << ">");
- sType = OUString();
+ sType.clear();
}
// adapt media descriptor, so it contains the right values
@@ -546,7 +546,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// - or to any other filter if no preferred filter was set.
// Note: It's an optimization only!
// It's not guaranteed, that such preferred filter exists.
- sFilter = OUString();
+ sFilter.clear();
try
{
// SAFE ->
@@ -569,7 +569,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// d)
// Search for any import(!) filter, which is registered for this type.
- sFilter = OUString();
+ sFilter.clear();
try
{
// SAFE ->
@@ -610,7 +610,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
aLock.clear();
// <- SAFE
- sFilter = OUString();
+ sFilter.clear();
}
if (!sFilter.isEmpty())
@@ -656,7 +656,7 @@ bool TypeDetection::impl_getPreselectionForType(
}
catch(const css::container::NoSuchElementException&)
{
- sType = OUString();
+ sType.clear();
bBreakDetection = true;
}
@@ -879,7 +879,7 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& r
{
// reset it everytimes, so the outside code can distinguish between
// a set and a not set value.
- rLastChance = OUString();
+ rLastChance.clear();
rUsedDetectors.clear();
// step over all possible types for this URL.
@@ -1046,7 +1046,7 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet
// Thrown exceptions mostly will end in crash recovery ...
// But might be we find another deep detection service which can detect the same
// document without a problem .-)
- sDeepType = OUString();
+ sDeepType.clear();
}
// seek to 0 is an optional feature to be more robust against
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 4cc9956a3c4a..d0b2103485f3 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5227,7 +5227,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
if ( nLen )
aCharPropSet.maString = aString.copy( nCharAnzRead, nLen );
else if ( bEmptyParaPossible )
- aCharPropSet.maString = OUString();
+ aCharPropSet.maString.clear();
if ( nLen || bEmptyParaPossible )
aCharPropList.push_back( new PPTCharPropSet( aCharPropSet, nCurrentPara ) );
nCurrentPara++;
@@ -5270,7 +5270,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
if ( !aCharPropList.empty() && ( aCharPropList.back()->mnParagraph != nCurrentPara ) )
{
PPTCharPropSet* pCharPropSet = new PPTCharPropSet( *aCharPropList.back(), nCurrentPara );
- pCharPropSet->maString = OUString();
+ (pCharPropSet->maString).clear();
pCharPropSet->mnOriginalTextPos = nStringLen - 1;
aCharPropList.push_back( pCharPropSet );
}
@@ -6807,7 +6807,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( aString[nCount] == 0x2a )
{
sal_uInt32 nBehind = aString.getLength() - ( nCount + 1 );
- pSet->maString = OUString();
+ (pSet->maString).clear();
if ( nBehind )
{
PPTCharPropSet* pNewCPS = new PPTCharPropSet( *pSet );
@@ -6906,7 +6906,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
pCurrent->mpFieldItem = new SvxFieldItem( SvxURLField( pField->GetURL(), aRepresentation, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD );
nHyperLenLeft = 0;
}
- pCurrent->maString = OUString();
+ (pCurrent->maString).clear();
pCurrent->SetColor( PPT_COLSCHEME_A_UND_HYPERLINK );
}
nIdx++;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 635d64e14234..ffa9e42d87d8 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -717,8 +717,8 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
// after this point we don't need the legacy clear passwords anymore
// however they are still inside the passed filter data sequence
// which is sadly out out our control
- aPermissionPassword = OUString();
- aOpenPassword = OUString();
+ aPermissionPassword.clear();
+ aOpenPassword.clear();
/*
* FIXME: the entries are only implicitly defined by the resource file. Should there
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 781641e0a03a..386ab1b2b59f 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -279,7 +279,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
if( aName == sValue )
{
eNewState = e_Value;
- maValue = OUString();
+ maValue.clear();
}
}
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 2153d115a7a4..fc0da394f46f 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -431,7 +431,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
{
if( pOldInfo->maType == pOldInfo->maFilterName )
{
- pNewInfo->maType = OUString();
+ (pNewInfo->maType).clear();
}
}
@@ -1163,7 +1163,7 @@ void XMLFilterSettingsDialog::initFilterList()
Sequence< OUString > aExtensions;
if( pValues2->Value >>= aExtensions )
{
- pTempFilter->maExtension = OUString();
+ (pTempFilter->maExtension).clear();
sal_Int32 nCount3( aExtensions.getLength() );
OUString* pExtensions = aExtensions.getArray();
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 4c6adca2a7db..2bb0ea6b8187 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -212,8 +212,8 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
default:
OSL_FAIL("OButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
- m_sTargetURL = OUString();
- m_sTargetFrame = OUString();
+ m_sTargetURL.clear();
+ m_sTargetFrame.clear();
break;
}
}
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 8e3bfff3861d..76bc4cfee15b 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -387,9 +387,9 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
if (nVersion > 0x0006)
{
OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !");
- m_aListSource = OUString();
+ m_aListSource.clear();
m_aBoundColumn <<= (sal_Int16)0;
- m_aDefaultText = OUString();
+ m_aDefaultText.clear();
m_eListSourceType = ListSourceType_TABLE;
m_bEmptyIsNull = true;
defaultCommonProperties();
@@ -407,7 +407,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
}
else // nVersion == 4
{
- m_aListSource = OUString();
+ m_aListSource.clear();
StringSequence aListSource;
_rxInStream >> aListSource;
const OUString* pToken = aListSource.getConstArray();
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 5274b1cf35d8..34e437e0c57c 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -232,7 +232,7 @@ void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxIn
break;
default:
OSL_FAIL("OFileControlModel::read : unknown version !");
- m_sDefaultValue = OUString();
+ m_sDefaultValue.clear();
}
// Display default values after read
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index deb58cef4646..5b8437084210 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -164,7 +164,7 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea
{
case 1 : { OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break;
case 2 : _rxInStream >> m_sHiddenValue; break;
- default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = OUString();
+ default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue.clear();
}
OControlModel::read(_rxInStream);
}
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 1802437dfae0..936c69194f7e 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -138,8 +138,8 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
default :
OSL_FAIL("OImageButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
- m_sTargetURL = OUString();
- m_sTargetFrame = OUString();
+ m_sTargetURL.clear();
+ m_sTargetFrame.clear();
break;
}
}
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 22d2c5aedf4d..f94b32e4cabf 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -550,7 +550,7 @@ void OImageControlModel::onDisconnectedDbColumn()
{
OBoundControlModel::onDisconnectedDbColumn();
- m_sDocumentURL = OUString();
+ m_sDocumentURL.clear();
}
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index b692155d0026..948e8c8220d3 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -244,7 +244,7 @@ void ImageProducer::SetImage( const OUString& rPath )
void ImageProducer::SetImage( SvStream& rStm )
{
- maURL = OUString();
+ maURL.clear();
mpGraphic->Clear();
mbConsInit = false;
@@ -256,7 +256,7 @@ void ImageProducer::SetImage( SvStream& rStm )
void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef )
{
- maURL = OUString();
+ maURL.clear();
mpGraphic->Clear();
mbConsInit = false;
delete mpStm;
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 84d9eb9dabf7..69d58fad40b7 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -521,7 +521,7 @@ namespace xforms
if ( !OStringType_Base::checkPropertySanity( _nHandle, _rNewValue, _rErrorMessage ) )
return false;
- _rErrorMessage = OUString();
+ _rErrorMessage.clear();
switch ( _nHandle )
{
case PROPERTY_ID_XSD_LENGTH:
diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx
index 838d4033cbfc..f37b99156a93 100644
--- a/forms/source/xforms/mip.cxx
+++ b/forms/source/xforms/mip.cxx
@@ -87,8 +87,8 @@ void MIP::resetRequired() { mbHasRequired = false; mbRequired = false; }
void MIP::setRelevant( bool b ) { mbHasRelevant = true; mbRelevant = b; }
void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; }
-void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); }
-void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); }
+void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation.clear(); }
+void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation.clear(); }
void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; }
@@ -97,7 +97,7 @@ void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; }
void MIP::resetCalculate() { mbHasCalculate = false; }
void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; }
-void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; }
+void MIP::resetTypeName() { msTypeName.clear(); mbHasTypeName = false; }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c862a7899a6c..81ce17e4532d 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -291,7 +291,7 @@ namespace
*/
bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue )
{
- _rValue = OUString();
+ _rValue.clear();
OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName );
osl_getEnvironment( sEnvName.pData, &_rValue.pData );
return !_rValue.isEmpty();
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 5403b814a4ed..8251ed9fb271 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -218,7 +218,7 @@ static OUString trimTrailingSpaces(const OUString& rString)
if (nIndex >= 0)
aResult = rString.copy(0,nIndex+1);
else
- aResult = OUString();
+ aResult.clear();
}
return aResult;
}
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index c490d116a8ab..31222930867a 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -88,9 +88,9 @@ struct FileType
inline void impl_clear()
{
bPreferred = false;
- sName = OUString();
- sMediaType = OUString();
- sClipboardFormat = OUString();
+ sName.clear();
+ sMediaType.clear();
+ sClipboardFormat.clear();
nDocumentIconID = 0;
lUINames.free ();
lURLPattern.free();
@@ -148,14 +148,14 @@ struct Filter
inline void impl_clear()
{
nOrder = 0;
- sName = OUString();
- sType = OUString();
- sDocumentService = OUString();
- sFilterService = OUString();
- sUIComponent = OUString();
+ sName.clear();
+ sType.clear();
+ sDocumentService.clear();
+ sFilterService.clear();
+ sUIComponent.clear();
nFlags = 0;
nFileFormatVersion = 0;
- sTemplateName = OUString();
+ sTemplateName.clear();
lUINames.free ();
lUserData.free ();
}
@@ -215,7 +215,7 @@ struct Detector
inline void impl_clear()
{
- sName = OUString();
+ sName.clear();
lTypes.free();
}
@@ -256,7 +256,7 @@ struct Loader
inline void impl_clear()
{
- sName = OUString();
+ sName.clear();
lUINames.free ();
lTypes.free ();
}
@@ -299,7 +299,7 @@ struct ContentHandler
inline void impl_clear()
{
- sName = OUString();
+ sName.clear();
lTypes.free();
}
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index b43d65cc30b4..6311bc64a7e6 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -131,7 +131,7 @@ class QueryBuilder
void resetAll()
{
- m_sBase = OUString();
+ m_sBase.clear();
resetParams();
}
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 6396ecf3d671..feed98870065 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -777,7 +777,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
if (xLocalePath.is())
sPath = sLocalizedPath;
else
- sPath = OUString();
+ sPath.clear();
return xLocalePath;
}
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index da01d4f4e35f..f52536e2d098 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -51,7 +51,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue
{
if ( aNamespaceName.getLength() == nXMLNamespaceLength )
{
- aNamespaceName = OUString();
+ aNamespaceName.clear();
}
else if ( aNamespaceName.getLength() >= nXMLNamespaceLength+2 )
{
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 1599447eef8c..ea253438079f 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -158,7 +158,7 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference<
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sModuleName = OUString(); }
+ { sModuleName.clear(); }
return sModuleName;
}
@@ -188,7 +188,7 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sWindowState = OUString(); }
+ { sWindowState.clear(); }
return sWindowState;
}
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 5067a66217de..c0ed698825ec 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -157,7 +157,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus
if (pItem != m_aStack.end())
{
pItem->m_nValue = 0;
- pItem->m_sText = OUString();
+ (pItem->m_sText).clear();
}
css::uno::Reference< css::task::XStatusIndicator > xActive = m_xActiveChild;
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 856ad02b02fc..e02c4e747ca9 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -82,7 +82,7 @@ void SAL_CALL VCLStatusIndicator::end()
{
SolarMutexGuard aSolarGuard;
- m_sText = OUString();
+ m_sText.clear();
m_nRange = 0;
m_nValue = 0;
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 6f53eb69aa38..198af2d038af 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -207,7 +207,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sModuleId = OUString(); }
+ { sModuleId.clear(); }
return sModuleId;
}
@@ -248,7 +248,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sCurrentHelpURL = OUString(); }
+ { sCurrentHelpURL.clear(); }
return sCurrentHelpURL;
}
@@ -331,7 +331,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sHelpURL = OUString(); }
+ { sHelpURL.clear(); }
return sHelpURL;
}
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index fae5556ec31f..2dacc370893b 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -128,7 +128,7 @@ bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
{
SolarMutexGuard g;
- sEvent = OUString();
+ sEvent.clear();
bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEvent = m_sEvent;
@@ -156,7 +156,7 @@ bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
{
SolarMutexGuard g;
- sAlias = OUString();
+ sAlias.clear();
bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAlias = m_sAlias;
@@ -184,7 +184,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const
{
SolarMutexGuard g;
- sService = OUString();
+ sService.clear();
bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sService = m_sService;
@@ -541,7 +541,7 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const
{
SolarMutexGuard g;
- sServiceArgs = OUString();
+ sServiceArgs.clear();
sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sServiceArgs = m_sServiceArgs;
@@ -553,7 +553,7 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const
{
SolarMutexGuard g;
- sEventArgs = OUString();
+ sEventArgs.clear();
sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEventArgs = m_sEventArgs;
@@ -565,7 +565,7 @@ sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const
{
SolarMutexGuard g;
- sAliasArgs = OUString();
+ sAliasArgs.clear();
sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAliasArgs = m_sAliasArgs;
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index ca623fff4730..dd6b12e0984a 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -93,7 +93,7 @@ OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow )
if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() ))
aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name
else
- aToolbarName = OUString();
+ aToolbarName.clear();
}
}
return aToolbarName;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index ad8187d310bf..e8d466b878a7 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -367,7 +367,7 @@ void LayoutManager::implts_reset( bool bAttached )
xModuleCfgMgr.clear();
xDocCfgMgr.clear();
xPersistentWindowState.clear();
- aModuleIdentifier = OUString();
+ aModuleIdentifier.clear();
}
Reference< XUIConfigurationManager > xModCfgMgr( xModuleCfgMgr, UNO_QUERY );
@@ -813,7 +813,7 @@ void LayoutManager::implts_destroyStatusBar()
Reference< XComponent > xCompStatusBar;
SolarMutexClearableGuard aWriteLock;
- m_aStatusBarElement.m_aName = OUString();
+ m_aStatusBarElement.m_aName.clear();
xCompStatusBar = Reference< XComponent >( m_aStatusBarElement.m_xUIElement, UNO_QUERY );
m_aStatusBarElement.m_xUIElement.clear();
aWriteLock.clear();
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index b7c5cfa50863..1138184a2f55 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2096,7 +2096,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception
// If may be later somewhere change the disposed-behaviour of this implementation
// and doesn't throw any DisposedExceptions we must guarantee best matching default values ...
m_eActiveState = E_INACTIVE;
- m_sName = OUString();
+ m_sName.clear();
m_bIsFrameTop = false;
m_bConnected = false;
m_nExternalLockCount = 0;
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index e248e77ba083..55cfc7a180a7 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1222,7 +1222,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID ,
if ( !lList.empty() )
aChangePath.sWritePath = *(lList.begin());
else
- aChangePath.sWritePath = OUString();
+ aChangePath.sWritePath.clear();
}
else
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 3546c9ad4588..4ef0f208b356 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -174,7 +174,7 @@ throw ( NoSuchElementException, RuntimeException, std::exception)
}
catch( const Exception& )
{
- sShort = OUString();
+ sShort.clear();
}
if (sShort.isEmpty())
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index c11c2e50d0d3..848e60d225fa 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -454,7 +454,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
{
osl::ResettableMutexGuard aLock( m_aMutex );
svt::PopupMenuControllerBase::initialize(aArguments);
- m_aBaseURL = OUString();
+ m_aBaseURL.clear();
}
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 76f4bcdd11a0..64b179e12083 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1317,7 +1317,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
{
MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, true, false );
AddMenu(pSubMenuManager,aItemCommand,nItemId);
- pSubMenuManager->m_aMenuItemCommand = OUString();
+ (pSubMenuManager->m_aMenuItemCommand).clear();
// Set image for the addon popup menu item
if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index f1bfb18f161d..6b0dedf7e83f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -961,7 +961,7 @@ Label_Override_Lang_Locale:
{
rLocale.Language = OUString::createFromAscii( pEntry->maLanguage );
rLocale.Country = OUString::createFromAscii( pEntry->maCountry );
- rLocale.Variant = OUString();
+ rLocale.Variant.clear();
return;
}
else if (pEntry->mnOverride && pEntryOverride != pEntry)
@@ -980,7 +980,7 @@ Label_Override_Lang_Locale:
if (pPrivateEntry->mnLang == nLang)
{
rLocale.Language = I18NLANGTAG_QLT;
- rLocale.Country = OUString();
+ rLocale.Country.clear();
rLocale.Variant = OUString::createFromAscii( pPrivateEntry->mpLanguage );
return;
}
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 7f6c42f5353e..38951c14b6a7 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -166,7 +166,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
// None found but resolve requested, last resort is "en-US".
aLocale.Language = "en";
aLocale.Country = "US";
- aLocale.Variant = OUString();
+ aLocale.Variant.clear();
}
}
return aLocale;
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 3db9aad72ba5..b3f76ceac6af 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -238,7 +238,7 @@ void LiblantagDataRef::setupDataPath()
static void handleVendorVariant( com::sun::star::lang::Locale & rLocale )
{
if (!rLocale.Variant.isEmpty() && rLocale.Language != I18NLANGTAG_QLT)
- rLocale.Variant = OUString();
+ rLocale.Variant.clear();
}
@@ -1008,7 +1008,7 @@ void LanguageTag::resetVars()
{
mpImpl.reset();
maLocale = lang::Locale();
- maBcp47 = OUString();
+ maBcp47.clear();
mnLangID = LANGUAGE_SYSTEM;
mbSystemLocale = true;
mbInitializedBcp47 = false;
@@ -1324,7 +1324,7 @@ void LanguageTagImpl::convertLocaleToBcp47()
}
if (maLocale.Language.isEmpty())
{
- maBcp47 = OUString(); // bad luck
+ maBcp47.clear(); // bad luck
}
else if (maLocale.Language == I18NLANGTAG_QLT)
{
@@ -1394,7 +1394,7 @@ void LanguageTagImpl::convertBcp47ToLocale()
{
maLocale.Language = getLanguageFromLangtag();
maLocale.Country = getRegionFromLangtag();
- maLocale.Variant = OUString();
+ maLocale.Variant.clear();
}
else
{
@@ -1842,7 +1842,7 @@ OUString LanguageTagImpl::getCountry() const
{
maCachedCountry = const_cast<LanguageTagImpl*>(this)->getRegionFromLangtag();
if (!LanguageTag::isIsoCountry( maCachedCountry))
- maCachedCountry = OUString();
+ maCachedCountry.clear();
mbCachedCountry = true;
}
return maCachedCountry;
@@ -2340,7 +2340,9 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
if (nHyph1 < 0)
{
rLanguage = rBcp47.toAsciiLowerCase();
- rScript = rCountry = rVariants = OUString();
+ rScript.clear();
+ rCountry.clear();
+ rVariants.clear();
eRet = EXTRACTED_LSC;
}
}
@@ -2351,7 +2353,8 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
{
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
rCountry = rBcp47.copy( nHyph1 + 1, 2).toAsciiUpperCase();
- rScript = rVariants = OUString();
+ rScript.clear();
+ rVariants.clear();
eRet = EXTRACTED_LSC;
}
}
@@ -2365,7 +2368,8 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
{
// (DIGIT 3ALNUM) vvvv variant instead of Ssss script
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
- rScript = rCountry = OUString();
+ rScript.clear();
+ rCountry.clear();
rVariants = rBcp47.copy( nHyph1 + 1);
eRet = EXTRACTED_LV;
}
@@ -2374,7 +2378,8 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
rScript = rBcp47.copy( nHyph1 + 1, 1).toAsciiUpperCase() +
rBcp47.copy( nHyph1 + 2, 3).toAsciiLowerCase();
- rCountry = rVariants = OUString();
+ rCountry.clear();
+ rVariants.clear();
eRet = EXTRACTED_LSC;
}
}
@@ -2387,7 +2392,7 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
rScript = rBcp47.copy( nHyph1 + 1, 1).toAsciiUpperCase() + rBcp47.copy( nHyph1 + 2, 3).toAsciiLowerCase();
rCountry = rBcp47.copy( nHyph2 + 1, 2).toAsciiUpperCase();
- rVariants = OUString();
+ rVariants.clear();
eRet = EXTRACTED_LSC;
}
}
@@ -2413,7 +2418,7 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
if (nHyph3 - nHyph2 > 4 && nHyph3 - nHyph2 <= 9)
{
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
- rScript = OUString();
+ rScript.clear();
rCountry = rBcp47.copy( nHyph1 + 1, 2).toAsciiUpperCase();
rVariants = rBcp47.copy( nHyph2 + 1);
eRet = EXTRACTED_LV;
@@ -2427,7 +2432,8 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
if (nHyph2 - nHyph1 > 5 && nHyph2 - nHyph1 <= 9)
{
rLanguage = rBcp47.copy( 0, nHyph1).toAsciiLowerCase();
- rScript = rCountry = OUString();
+ rScript.clear();
+ rCountry.clear();
rVariants = rBcp47.copy( nHyph1 + 1);
eRet = EXTRACTED_LV;
}
@@ -2439,7 +2445,7 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
if (rBcp47.equalsIgnoreAsciiCase( "en-GB-oed"))
{
rLanguage = "en";
- rScript = OUString();
+ rScript.clear();
rCountry = "GB";
rVariants = "oed";
eRet = EXTRACTED_LV;
@@ -2449,7 +2455,10 @@ LanguageTagImpl::Extraction LanguageTagImpl::simpleExtract( const OUString& rBcp
if (eRet == EXTRACTED_NONE)
{
SAL_INFO( "i18nlangtag", "LanguageTagImpl::simpleExtract: did not extract '" << rBcp47 << "'");
- rLanguage = rScript = rCountry = rVariants = OUString();
+ rLanguage.clear();
+ rScript.clear();
+ rCountry.clear();
+ rVariants.clear();
}
return eRet;
}
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 48b25fda158b..08c127e4c940 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -958,7 +958,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
r = ParseResult();
pSym = pTextStart;
pSrc = pSym;
- aSymbol = OUString();
+ aSymbol.clear();
c = *pSrc;
cLast = 0;
nDecSeps = 0;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 685a756efefb..56da33bc5784 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -194,7 +194,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
if (key_count > 0 && i + 1 < len ) {
for (curr = keyStr[++i]; key_count < MAX_KEYS && keys[key_count-1].key < curr; key_count++) {
keys[key_count].key = keys[key_count-1].key+1;
- keys[key_count].desc = OUString();
+ keys[key_count].desc.clear();
}
} else
throw RuntimeException();
@@ -228,7 +228,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
mkeys[mkey_count++]=key_count;
keys[key_count].key = 0;
keys[key_count].mkey = keyStr.copy(i+1, end-i-1);
- keys[key_count++].desc=OUString();
+ keys[key_count++].desc.clear();
}
i=end+1;
} else
@@ -236,7 +236,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
break;
default:
keys[key_count].key = curr;
- keys[key_count++].desc = OUString();
+ keys[key_count++].desc.clear();
break;
}
}
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 95a271c4dcbf..4fabd5fecbb9 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -76,7 +76,7 @@ protected:
void WriteReset()
{
aUsedTypes.clear();
- aIFaceName = OString();
+ aIFaceName.clear();
}
public:
OUString sSlotMapFile;
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index f770e9dcbd15..4bf23589e4f0 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -161,7 +161,7 @@ int SvTokenStream::GetNextChar()
}
else
{
- aBufStr = OString();
+ aBufStr.clear();
nColumn = 0;
nBufPos = 0;
return '\0';
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index 97d21f1d3cef..f5adfeaa8e0b 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -91,7 +91,7 @@ void AstDeclaration::setPredefined(bool bPredefined)
m_bPredefined = bPredefined;
if ( m_bPredefined )
{
- m_fileName = OString();
+ m_fileName.clear();
m_bInMainFile = false;
}
}
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 75a71dfa6a6b..f6a449506cc6 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -248,10 +248,10 @@ void Idlc::reset()
m_lineNumber = 0;
m_parseState = PS_NoState;
- m_fileName = OString();
- m_mainFileName = OString();
- m_realFileName = OString();
- m_documentation = OString();
+ m_fileName.clear();
+ m_mainFileName.clear();
+ m_realFileName.clear();
+ m_documentation.clear();
m_pScopes->clear();
if ( m_pRoot)
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 9a163867c931..21cca1083914 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -316,6 +316,16 @@ public:
return *this;
}
#endif
+
+ /**
+ Clears the string, i.e, makes a zero-character string
+ @since LibreOffice 4.4
+ */
+ void clear()
+ {
+ rtl_string_new( &pData );
+ }
+
/**
Returns the length of this string.
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 9815f9fe277e..b9a868b314a0 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -376,6 +376,15 @@ public:
#endif
/**
+ Clears the string, i.e, makes a zero-character string
+ @since LibreOffice 4.4
+ */
+ void clear()
+ {
+ rtl_uString_new( &pData );
+ }
+
+ /**
Returns the length of this string.
The length is equal to the number of Unicode characters in this string.
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 84dcbb5d0eca..95d7f3fd1d08 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -134,7 +134,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor)
m_xmlPathContextVendorSettings);
if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval))
{
- aVersionInfo.sMinVersion = OUString();
+ aVersionInfo.sMinVersion.clear();
}
else
{
@@ -156,7 +156,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor)
m_xmlPathContextVendorSettings);
if (xmlXPathNodeSetIsEmpty(xPathObjectMax->nodesetval))
{
- aVersionInfo.sMaxVersion = OUString();
+ aVersionInfo.sMaxVersion.clear();
}
else
{
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index cfd471be5c1e..d68327d29e70 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -286,7 +286,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
{
AddText( sCurrentText, sCurrentIsoLang, sCurrentResTyp );
Output( sCurrentText );
- sCurrentText = OString();
+ sCurrentText.clear();
pStackData->sEndTextTag = sToken;
}
@@ -441,7 +441,7 @@ void CfgMerge::WorkOnText(OString &, const OString& rLangIndex)
OString sGroupId;
if ( aStack.size() == 1 ) {
sGroupId = sLocalId;
- sLocalId = OString();
+ sLocalId.clear();
}
else {
sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 6cd87c239993..c8d767b05cc1 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -1123,7 +1123,7 @@ void DicEntry::splitDicFileWord(const OUString &rDicFileWord,
else
{
rDicWord = rDicFileWord;
- rReplacement = OUString();
+ rReplacement.clear();
}
}
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 36a8068aaa57..41018e3fb6fe 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -615,7 +615,7 @@ void GrammarCheckingIterator::DequeueAndCheck()
// ---- THREAD SAFE START ----
{
::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() );
- m_aCurCheckedDocId = OUString();
+ m_aCurCheckedDocId.clear();
}
// ---- THREAD SAFE END ----
}
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index a1ce6d2ba61e..8a1aca42edbd 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -148,7 +148,7 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc
sal_Int32 nLen = SAL_N_ELEMENTS( header );
if ( !( ( nLen == xInputStream->readBytes( aData, nLen ) )
&& ( memcmp( ( void* )header, (void*) aData.getConstArray(), nLen ) == 0 ) ) )
- sTypeName = OUString();
+ sTypeName.clear();
return sTypeName;
}
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 081b3549efcc..00de2bd1ea3b 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -104,7 +104,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
OUString aDbName;
m_settings.encoding = m_rDriver.getDefaultEncoding();
- m_settings.quoteIdentifier = OUString();
+ m_settings.quoteIdentifier.clear();
// parse url. Url has the following format:
// external server: sdbc:mysqlc:[hostname]:[port]/[dbname]
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index f79bab8eef55..f15086df7e51 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -400,7 +400,7 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel )
}
else
{
- maAutoTitle = OUString();
+ maAutoTitle.clear();
}
}
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index a3e7254df380..aae50e80c45c 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -99,7 +99,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent,
}
else if ( aPPAction.match( sHlinksldjump ) )
{
- sURL = OUString();
+ sURL.clear();
sal_Int32 nIndex2 = 0;
while ( nIndex2 < sHref.getLength() )
diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx
index 742f020c2ace..b689d830836e 100644
--- a/oox/source/drawingml/textfont.cxx
+++ b/oox/source/drawingml/textfont.cxx
@@ -64,7 +64,7 @@ void TextFont::setAttributes( const AttributeList& rAttribs )
void TextFont::setAttributes( const OUString& sFontName )
{
maTypeface = sFontName;
- maPanose = OUString();
+ maPanose.clear();
mnPitch = 0;
mnCharset = WINDOWS_CHARSET_DEFAULT;
}
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index aa0000c3bd3a..2dac7bc006b4 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -155,7 +155,7 @@ void ItemFormat::set( DataType eDataType, FormatType eFmtType, const OUString& r
meDataType = eDataType;
meFmtType = eFmtType;
maItemName = rItemName;
- maListName = OUString();
+ maListName.clear();
}
OUStringVector::const_iterator ItemFormat::parse( const OUStringVector& rFormatVec )
@@ -843,7 +843,7 @@ ConfigItemBase::LineType ConfigItemBase::readConfigLine(
// ignore comments (starting with hash or semicolon)
sal_Unicode cChar = aLine[ 0 ];
if( (cChar == '#') || (cChar == ';') )
- aLine = OUString();
+ aLine.clear();
}
}
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 7a50b82b7daa..a16ea7121d54 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -1933,7 +1933,7 @@ void VbaDirStreamObject::implDumpRecordBody()
break;
case 0x0019:
dumpByteString( "name" );
- maCurrStream = OUString();
+ maCurrStream.clear();
mnCurrOffset = 0;
break;
case 0x001A:
@@ -1945,7 +1945,7 @@ void VbaDirStreamObject::implDumpRecordBody()
case 0x002B:
if( !maCurrStream.isEmpty() )
mrVbaData.maStrmOffsets[ maCurrStream ] = mnCurrOffset;
- maCurrStream = OUString();
+ maCurrStream.clear();
mnCurrOffset = 0;
break;
case 0x002F:
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 76cc98927d87..d3d029773c79 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -533,7 +533,7 @@ void ControlConverter::convertToAxState( PropertySet& rPropSet,
// control is awt or not )
rPropSet.getProperty( nState, PROP_State );
- rValue = OUString(); // empty e.g. 'don't know'
+ rValue.clear(); // empty e.g. 'don't know'
if ( nState == API_STATE_UNCHECKED )
rValue = OUString('0');
else if ( nState == API_STATE_CHECKED )
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index e715f8ba8697..f61da9e1d9c4 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -131,7 +131,7 @@ namespace oox { namespace ppt {
if( mbInAttrList )
{
mbIsInAttrName = true;
- msCurrentAttribute = OUString();
+ msCurrentAttribute.clear();
}
else
{
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 0471573db09d..f3ed601f8eed 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -168,7 +168,7 @@ ContextHandlerRef ClientDataContext::onCreateContext( sal_Int32 /*nElement*/, co
{
if( isRootElement() )
{
- maElementText = OUString();
+ maElementText.clear();
return this;
}
return 0;
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index eabedbf2210b..02c8ee8196a8 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -278,7 +278,7 @@ OWriteStream_Impl::~OWriteStream_Impl()
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
CleanCacheStream();
@@ -606,14 +606,14 @@ OUString OWriteStream_Impl::FillTempGetFileName()
catch( const packages::WrongPasswordException& )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
throw;
}
catch( const uno::Exception& )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
}
}
@@ -835,7 +835,7 @@ void OWriteStream_Impl::Commit()
// TODO/NEW: Let the temporary file be removed after commit
xNewPackageStream->setDataStream( xInStream );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
else // if ( m_bHasInsertedStreamOptimization )
{
@@ -909,7 +909,7 @@ void OWriteStream_Impl::Revert()
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
m_aProps.realloc( 0 );
@@ -1330,7 +1330,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
if ( m_xCacheStream.is() )
CleanCacheStream();
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 4ddaf10e1ee1..ad335c72a449 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -1040,8 +1040,8 @@ OStoreDirectory ORegKey::getStoreDir()
if ( m_name.equals(m_pRegistry->ROOT) )
{
- fullPath = OUString();
- relativName = OUString();
+ fullPath.clear();
+ relativName.clear();
} else
{
fullPath = m_name.copy(0, m_name.lastIndexOf('/') + 1);
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1966f7bcbfef..59733116c6d8 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -783,21 +783,21 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
if ( aSettings.get( "Font" ) >>= aAwtFont )
{
OUString sTemp = aAwtFont.Name;
- aAwtFont.Name = OUString(); // hack to
+ aAwtFont.Name.clear(); // hack to
_rxReportControlFormat->setFontDescriptor( aAwtFont );
_rxReportControlFormat->setCharFontName( sTemp );
}
if ( aSettings.get( "FontAsian" ) >>= aAwtFont )
{
OUString sTemp = aAwtFont.Name;
- aAwtFont.Name = OUString(); // hack to
+ aAwtFont.Name.clear(); // hack to
_rxReportControlFormat->setFontDescriptorAsian( aAwtFont );
_rxReportControlFormat->setCharFontNameAsian( sTemp );
}
if ( aSettings.get( "FontComplex" ) >>= aAwtFont )
{
OUString sTemp = aAwtFont.Name;
- aAwtFont.Name = OUString(); // hack to
+ aAwtFont.Name.clear(); // hack to
_rxReportControlFormat->setFontDescriptorComplex( aAwtFont );
_rxReportControlFormat->setCharFontNameComplex( sTemp );
}
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 5c37481d706a..4b48405b76cf 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -216,7 +216,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
}
else if( !rsc_stricmp( (*ppStr) + 1, "lg" ) )
{
- m_aOutputFiles.back().aLangName = OString();
+ m_aOutputFiles.back().aLangName.clear();
}
else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) )
{
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index 652b804bcdb6..005c058916c0 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.cxx
@@ -23,7 +23,7 @@
AtomContainer::AtomContainer()
{
m_aStringToID[ OString() ] = 0;
- m_aIDToString[ 0 ] = OString();
+ m_aIDToString[ 0 ].clear();
m_nNextID = 1;
}
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index becbd3437af6..b15342ffb1db 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2270,7 +2270,7 @@ void Test::testFormulaRefUpdateName()
// Delete the inserted sheet, which will shift the 'Formula' sheet to the left.
m_pDoc->DeleteTab(0);
- aName = OUString();
+ aName.clear();
m_pDoc->GetName(0, aName);
CPPUNIT_ASSERT_EQUAL(OUString("Formula"), aName);
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 6adef02ddcbb..3af6849b9573 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -412,7 +412,7 @@ bool ScRangeItem::GetPresentation
const IntlWrapper* /* pIntl */
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -530,7 +530,7 @@ bool ScTableListItem::GetPresentation
return true;
case SFX_ITEM_PRESENTATION_COMPLETE:
- rText = OUString();
+ rText.clear();
return false;
default:
@@ -847,7 +847,7 @@ bool ScViewObjectModeItem::GetPresentation
) const
{
OUString aDel(": ");
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -1019,7 +1019,7 @@ void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages )
bool ScPageScaleToItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const
{
- rText = OUString();
+ rText.clear();
if( !IsValid())
return false;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0cfbaa12edc7..794fb5695add 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -460,7 +460,7 @@ void ScConditionEntry::CompileXML()
if ( aNew.Parse( aSrcString, mpDoc ) & SCA_VALID )
aSrcPos = aNew;
// if the position is invalid, there isn't much we can do at this time
- aSrcString = OUString();
+ aSrcString.clear();
}
// Convert the text tokens that were created during XML import into real tokens.
@@ -667,7 +667,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
{
bIsStr1 = false;
nVal1 = pEff1->GetValue();
- aStrVal1 = OUString();
+ aStrVal1.clear();
}
else
{
@@ -696,7 +696,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
{
bIsStr2 = false;
nVal2 = pEff2->GetValue();
- aStrVal2 = OUString();
+ aStrVal2.clear();
}
else
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 5a6af4ba40e2..1693ad7e54d3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1278,7 +1278,7 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aTrackText,bool &bLeftEdge)
{
- aTrackText = OUString();
+ aTrackText.clear();
// Change-Tracking
ScChangeTrack* pTrack = GetChangeTrack();
ScChangeViewSettings* pSettings = GetChangeViewSettings();
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index c5602d99d5df..b0b0d82361fd 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1380,7 +1380,7 @@ void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetUpperCellString( nCol, nRow, rStr );
else
- rStr = OUString();
+ rStr.clear();
}
bool ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam)
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index d064c0dcf950..b01d9558eb7b 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -211,7 +211,7 @@ bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName
}
}
- rName = OUString();
+ rName.clear();
return false; // nothing found
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c8c8af7fc87a..6c37a5a190a9 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -197,7 +197,7 @@ bool ScDocument::GetName( SCTAB nTab, OUString& rName ) const
maTabs[nTab]->GetName( rName );
return true;
}
- rName = OUString();
+ rName.clear();
return false;
}
@@ -231,7 +231,7 @@ bool ScDocument::GetCodeName( SCTAB nTab, OUString& rName ) const
maTabs[nTab]->GetCodeName( rName );
return true;
}
- rName = OUString();
+ rName.clear();
return false;
}
@@ -3256,7 +3256,7 @@ void ScDocument::GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& r
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetInputString( nCol, nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, OUString& rString )
@@ -3429,7 +3429,7 @@ void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rForm
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
maTabs[nTab]->GetFormula( nCol, nRow, rFormula );
else
- rFormula = OUString();
+ rFormula.clear();
}
const ScFormulaCell* ScDocument::GetFormulaCell( const ScAddress& rPos ) const
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 679fbae307c5..c5f46df808dc 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -214,7 +214,7 @@ ScSheetSourceDesc::ScSheetSourceDesc(ScDocument* pDoc) :
void ScSheetSourceDesc::SetSourceRange(const ScRange& rRange)
{
maSourceRange = rRange;
- maRangeName = OUString(); // overwrite existing range name if any.
+ maRangeName.clear(); // overwrite existing range name if any.
}
const ScRange& ScSheetSourceDesc::GetSourceRange() const
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index ded0bf590840..14b504e1f64b 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -100,7 +100,7 @@ void ScFuncDesc::Clear()
nFIndex = 0;
nCategory = 0;
- sHelpId = OString();
+ sHelpId.clear();
bIncomplete = false;
bHasSuppressedArgs = false;
}
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 1e265b3e9a7f..15e423f8ae29 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -54,7 +54,7 @@ void ScSortParam::Clear()
bHasHeader=bCaseSens=bUserDef=bNaturalSort = false;
bByRow=bIncludePattern=bInplace = true;
aCollatorLocale = ::com::sun::star::lang::Locale();
- aCollatorAlgorithm = OUString();
+ aCollatorAlgorithm.clear();
aKeyState.bDoSort = false;
aKeyState.nField = 0;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f6871f6767e6..97d894f91b1a 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -356,7 +356,7 @@ void ScTable::GetName( OUString& rName ) const
void ScTable::SetName( const OUString& rNewName )
{
aName = rNewName;
- aUpperName = OUString(); // invalidated if the name is changed
+ aUpperName.clear(); // invalidated if the name is changed
// SetStreamValid is handled in ScDocument::RenameTab
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 381d32bcfbb5..fd3c045b9f4e 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1448,7 +1448,7 @@ void ScTable::GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetString( nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow )
@@ -1464,7 +1464,7 @@ void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetInputString( nRow, rString );
else
- rString = OUString();
+ rString.clear();
}
double ScTable::GetValue( SCCOL nCol, SCROW nRow ) const
@@ -1495,7 +1495,7 @@ void ScTable::GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const
if (ValidColRow(nCol,nRow))
aCol[nCol].GetFormula( nRow, rFormula );
else
- rFormula = OUString();
+ rFormula.clear();
}
const ScFormulaCell* ScTable::GetFormulaCell( SCCOL nCol, SCROW nRow ) const
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index cf02241ec117..835cbfed8062 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -847,7 +847,7 @@ bool lcl_maybeReplaceCellString(
!rSearchItem.GetReplaceString().isEmpty())
{
rColObj.SetRawString(nRow, rSearchItem.GetReplaceString());
- rUndoStr = OUString();
+ rUndoStr.clear();
}
return true;
}
@@ -1003,7 +1003,7 @@ bool ScTable::SearchRangeForAllEmptyCells(
pUndoDoc->SetString(ScAddress(nCol, i, nTab), EMPTY_OUSTRING);
}
}
- rUndoStr = OUString();
+ rUndoStr.clear();
}
}
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 479e0d98ccd9..a17cc88161ce 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -398,8 +398,8 @@ bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam
}
if ( !bRet )
{
- aName = OUString();
- aDesc = OUString();
+ aName.clear();
+ aDesc.clear();
}
return bRet;
#endif
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 3f5d5c9b2c11..a2d080cf6e43 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1720,7 +1720,7 @@ void ScChangeActionContent::SetValue(
OUString& rStr, ScCellValue& rCell, sal_uLong nFormat, const ScCellValue& rOrgCell,
const ScDocument* pFromDoc, ScDocument* pToDoc )
{
- rStr = OUString();
+ rStr.clear();
if (GetContentCellType(rOrgCell))
{
@@ -1748,7 +1748,7 @@ void ScChangeActionContent::SetValue(
void ScChangeActionContent::SetCell( OUString& rStr, ScCellValue& rCell, sal_uLong nFormat, const ScDocument* pDoc )
{
- rStr = OUString();
+ rStr.clear();
if (rCell.isEmpty())
return;
@@ -1794,7 +1794,7 @@ void ScChangeActionContent::GetValueString(
break;
case CELLTYPE_NONE:
default:
- rStr = OUString();
+ rStr.clear();
}
}
@@ -2199,7 +2199,7 @@ void ScChangeTrack::Clear()
aGeneratedMap.clear();
aPasteCutMap.clear();
maUserCollection.clear();
- maUser = OUString();
+ maUser.clear();
Init();
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 7cca6e8aa009..26e8d60683e4 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -755,11 +755,11 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
if( nNo < 4000 )
aTmpStr = SvxNumberFormat::CreateRomanString( nNo, ( eType == SVX_ROMAN_UPPER ) );
else
- aTmpStr = OUString();
+ aTmpStr.clear();
break;
case SVX_NUMBER_NONE:
- aTmpStr = OUString();
+ aTmpStr.clear();
break;
// CHAR_SPECIAL:
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 31ea9a2ab6aa..4598bdf5a275 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -398,7 +398,7 @@ void ScRangeStringConverter::GetTokenByOffset(
sal_Int32 nLength = rString.getLength();
if( nOffset == -1 || nOffset >= nLength )
{
- rToken = OUString();
+ rToken.clear();
nOffset = -1;
}
else
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 8b009f48da96..52ea17d77f20 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -373,7 +373,7 @@ TOPIC DifParser::GetNextTopic( void )
if( aLine.getLength() > 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
- aData = OUString();
+ aData.clear();
eS = S_END;
break;
case S_END:
@@ -444,7 +444,7 @@ bool DifParser::ReadNextLine( OUString& rStr )
else
{
rStr = aLookAheadLine;
- aLookAheadLine = OUString();
+ aLookAheadLine.clear();
return true;
}
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 4f136eedc1bd..bf5ca8ac0552 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -550,7 +550,7 @@ void XclImpDrawObjBase::PostProcessSdrObject( XclImpDffConverter& rDffConv, SdrO
void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen )
{
- maObjName = OUString();
+ maObjName.clear();
if( nNameLen > 0 )
{
// name length field is repeated before the name
@@ -562,7 +562,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen )
void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
{
- maMacroName = OUString();
+ maMacroName.clear();
rStrm.Ignore( nMacroSize );
// skip padding byte for word boundaries, not contained in nMacroSize
if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 );
@@ -570,19 +570,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize )
{
- maMacroName = OUString();
+ maMacroName.clear();
rStrm.Ignore( nMacroSize );
}
void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize )
{
- maMacroName = OUString();
+ maMacroName.clear();
rStrm.Ignore( nMacroSize );
}
void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm )
{
- maMacroName = OUString();
+ maMacroName.clear();
if( rStrm.GetRecLeft() > 6 )
{
// macro is stored in a tNameXR token containing a link to a defined name
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index cce7b0226f98..2b48bcb116b0 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -650,7 +650,7 @@ void XclImpPivotCache::ReadDConName( XclImpStream& rStrm )
if (!mbSelfRef)
// External name is not supported yet.
- maSrcRangeName = OUString();
+ maSrcRangeName.clear();
}
void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 52307ac5b2f5..63aeb55d7f34 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -607,7 +607,7 @@ OUString XclChObjectTable::InsertObject( const Any& rObj )
catch( Exception& )
{
OSL_FAIL( "XclChObjectTable::InsertObject - cannot insert object" );
- aObjName = OUString();
+ aObjName.clear();
}
}
return aObjName;
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 4acdf8ae1fa5..1112d62b7c36 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -49,7 +49,7 @@ XclPCItem::~XclPCItem()
void XclPCItem::SetEmpty()
{
meType = EXC_PCITEM_EMPTY;
- maText = OUString();
+ maText.clear();
}
void XclPCItem::SetText( const OUString& rText )
@@ -62,7 +62,7 @@ void XclPCItem::SetDouble( double fValue )
{
meType = EXC_PCITEM_DOUBLE;
//! TODO convert double to string
- maText = OUString();
+ maText.clear();
mfValue = fValue;
}
@@ -70,7 +70,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime )
{
meType = EXC_PCITEM_DATETIME;
//! TODO convert date to string
- maText = OUString();
+ maText.clear();
maDateTime = rDateTime;
}
@@ -84,7 +84,7 @@ void XclPCItem::SetInteger( sal_Int16 nValue )
void XclPCItem::SetError( sal_uInt16 nError )
{
meType = EXC_PCITEM_ERROR;
- maText = OUString();
+ maText.clear();
mnError = nError;
switch( nError )
{
@@ -103,7 +103,7 @@ void XclPCItem::SetBool( bool bValue )
{
meType = EXC_PCITEM_BOOL;
//! TODO convert boolean to string
- maText = OUString();
+ maText.clear();
mbValue = bValue;
}
@@ -184,7 +184,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo )
if( rStrm.GetRecLeft() >= 3 )
rInfo.maName = rStrm.ReadUniString();
else
- rInfo.maName = OUString();
+ rInfo.maName.clear();
return rStrm;
}
@@ -392,7 +392,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName )
rStrm >> nStrLen;
rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING;
if( rCachedName.mbUseCache )
- rCachedName.maName = OUString();
+ rCachedName.maName.clear();
else
rCachedName.maName = rStrm.ReadUniString( nStrLen );
return rStrm;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 246528afc127..60cda8547d53 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1399,7 +1399,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
if ( !pActEntry->bHasGraphic )
{ // discard any ALT text in this cell if we have any image
pActEntry->bHasGraphic = true;
- pActEntry->aAltText = OUString();
+ (pActEntry->aAltText).clear();
}
pImage->aFilterName = rFilter.GetImportFormatName( nFormat );
pImage->pGraphic = pGraphic;
@@ -1563,7 +1563,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
case HTML_TITLE_ON:
{
bInTitle = true;
- aString = OUString();
+ aString.clear();
}
break;
case HTML_TITLE_OFF:
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index d0d3c37d3106..0464e55c01da 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1898,7 +1898,7 @@ void NumberFormat::setFormatCode( const Locale& rLocale, const sal_Char* pcFmtCo
void NumberFormat::setPredefinedId( const Locale& rLocale, sal_Int16 nPredefId )
{
maModel.maLocale = rLocale;
- maModel.maFmtCode = OUString();
+ maModel.maFmtCode.clear();
maModel.mnPredefId = nPredefId;
}
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 7149358bc883..ca8b97706a60 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -366,7 +366,7 @@ bool RichString::extractPlainString( OUString& orString, const oox::xls::Font* p
return false;
if( maTextPortions.empty() )
{
- orString = OUString();
+ orString.clear();
return true;
}
if( (maTextPortions.size() == 1) && !maTextPortions.front()->hasFont() && !lclNeedsRichTextFormat( pFirstPortionFont ) )
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 5105d2561f35..cbd7c9dcda88 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -335,7 +335,7 @@ bool SheetDataContext::importCell( const AttributeList& rAttribs )
maCellData.mbShowPhonetic = rAttribs.getBool( XML_ph, false );
// reset cell value, formula settings, and inline string
- maCellValue = OUString();
+ maCellValue.clear();
mxInlineStr.reset();
mbHasFormula = false;
@@ -363,7 +363,7 @@ void SheetDataContext::importFormula( const AttributeList& rAttribs )
maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false );
}
- maFormulaStr = OUString();
+ maFormulaStr.clear();
}
void SheetDataContext::importRow( SequenceInputStream& rStrm )
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 99b086777910..afc66f95d2a4 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -313,7 +313,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim)
}
else
{
- sValueStr = OUString();
+ sValueStr.clear();
switch(pRef->ReferenceItemType)
{
case sheet::DataPilotFieldReferenceItemType::PREVIOUS :
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index fa3f6e81ce86..de76274c6aa9 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -282,7 +282,7 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
}
else
if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN)
- sCondition = OUString();
+ sCondition.clear();
}
if (!sCondition.isEmpty())
{
diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx
index 0120c49bf449..3f6c64b53a18 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -48,7 +48,7 @@ SvXMLImportContext* ScXMLCellTextParaContext::CreateChildContext(
if (!maContent.isEmpty())
{
mrParentCxt.PushParagraphSpan(maContent, OUString());
- maContent = OUString();
+ maContent.clear();
}
const SvXMLTokenMap& rTokenMap = GetScImport().GetCellTextParaElemTokenMap();
@@ -152,7 +152,7 @@ SvXMLImportContext* ScXMLCellTextSpanContext::CreateChildContext(
if (!maContent.isEmpty())
{
mrParentCxt.PushSpan(maContent, maStyleName);
- maContent = OUString();
+ maContent.clear();
}
const SvXMLTokenMap& rTokenMap = GetScImport().GetCellTextSpanElemTokenMap();
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 68fb1fe9e71d..997275a0a288 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1382,7 +1382,7 @@ void ScXMLTableRowCellContext::PutFormulaCell( const ScAddress& rCellPos )
OUString aFormulaNmsp = maFormula->second;
if( eGrammar != formula::FormulaGrammar::GRAM_EXTERNAL )
- aFormulaNmsp = OUString();
+ aFormulaNmsp.clear();
pCode->AssignXMLString( aText, aFormulaNmsp );
rDoc.getDoc().IncXMLImportedFormulaCount( aText.getLength() );
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index ba5f1fc99de8..9f154db7feb8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3348,18 +3348,18 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar(
const OUString& rAttrValue, bool bRestrictToExternalNmsp ) const
{
// parse the attribute value, extract namespace ID, literal namespace, and formula string
- rFormulaNmsp = OUString();
+ rFormulaNmsp.clear();
sal_uInt16 nNsId = GetNamespaceMap()._GetKeyByAttrName( rAttrValue, 0, &rFormula, &rFormulaNmsp, false );
// check if we have an ODF formula namespace
if( !bRestrictToExternalNmsp ) switch( nNsId )
{
case XML_NAMESPACE_OOOC:
- rFormulaNmsp = OUString(); // remove namespace string for built-in grammar
+ rFormulaNmsp.clear(); // remove namespace string for built-in grammar
reGrammar = FormulaGrammar::GRAM_PODF;
return;
case XML_NAMESPACE_OF:
- rFormulaNmsp = OUString(); // remove namespace string for built-in grammar
+ rFormulaNmsp.clear(); // remove namespace string for built-in grammar
reGrammar = FormulaGrammar::GRAM_ODFF;
return;
}
@@ -3398,7 +3398,7 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar(
/* All attempts failed (e.g. no namespace and no leading equality sign, or
an invalid namespace prefix), continue with the entire attribute value. */
rFormula = rAttrValue;
- rFormulaNmsp = OUString(); // remove any namespace string
+ rFormulaNmsp.clear(); // remove any namespace string
reGrammar = eDefaultGrammar;
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 1e9a82e88cd7..05a718641997 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -776,7 +776,7 @@ void ScInputHandler::HideTip()
nTipVisible = 0;
pTipVisibleParent = NULL;
}
- aManualTip = OUString();
+ aManualTip.clear();
}
void ScInputHandler::HideTipBelow()
{
@@ -788,7 +788,7 @@ void ScInputHandler::HideTipBelow()
nTipVisibleSec = 0;
pTipVisibleSecParent = NULL;
}
- aManualTip = OUString();
+ aManualTip.clear();
}
void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& rSelText, const ESelection& rSel,
@@ -1948,7 +1948,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
pEngine->SetText(aCurrentText);
aStr = aCurrentText;
bTextValid = false;
- aCurrentText = OUString();
+ aCurrentText.clear();
}
else
aStr = GetEditText(pEngine);
@@ -2717,7 +2717,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
HideTipBelow();
nFormSelStart = nFormSelEnd = 0;
- aFormText = OUString();
+ aFormText.clear();
bInOwnChange = false;
bInEnterHandler = false;
@@ -2769,7 +2769,7 @@ void ScInputHandler::CancelHandler()
NotifyChange( pLastState, true );
nFormSelStart = nFormSelEnd = 0;
- aFormText = OUString();
+ aFormText.clear();
bInOwnChange = false;
}
@@ -3435,7 +3435,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
aString = GetEditText(pEngine);
lcl_RemoveTabs(aString);
bTextValid = false;
- aCurrentText = OUString();
+ aCurrentText.clear();
}
else
{
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index abbcb21e0771..c0a9c901e691 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -635,11 +635,11 @@ void ScModule::ResetDragObject()
mpDragData->pCellTransfer = NULL;
mpDragData->pDrawTransfer = NULL;
mpDragData->pJumpLocalDoc = NULL;
- mpDragData->aLinkDoc = OUString();
- mpDragData->aLinkTable = OUString();
- mpDragData->aLinkArea = OUString();
- mpDragData->aJumpTarget = OUString();
- mpDragData->aJumpText = OUString();
+ (mpDragData->aLinkDoc).clear();
+ (mpDragData->aLinkTable).clear();
+ (mpDragData->aLinkArea).clear();
+ (mpDragData->aJumpTarget).clear();
+ (mpDragData->aJumpText).clear();
}
void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj )
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 00d4f16deee3..2efceafc93be 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -725,7 +725,7 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl)
break;
}
for (; i < CSV_PREVIEW_LINES; i++)
- maPreviewLine[i] = OUString();
+ maPreviewLine[i].clear();
mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount);
bool bMergeSep = pCkbAsOnce->IsChecked();
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 47f4682d985e..baf3c69b0ebe 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2810,13 +2810,13 @@ void ScExternalRefManager::breakLink(sal_uInt16 nFileId)
void ScExternalRefManager::switchSrcFile(sal_uInt16 nFileId, const OUString& rNewFile, const OUString& rNewFilter)
{
maSrcFiles[nFileId].maFileName = rNewFile;
- maSrcFiles[nFileId].maRelativeName = OUString();
- maSrcFiles[nFileId].maRealFileName = OUString();
+ maSrcFiles[nFileId].maRelativeName.clear();
+ maSrcFiles[nFileId].maRealFileName.clear();
if (!maSrcFiles[nFileId].maFilterName.equals(rNewFilter))
{
// Filter type has changed.
maSrcFiles[nFileId].maFilterName = rNewFilter;
- maSrcFiles[nFileId].maFilterOptions = OUString();
+ maSrcFiles[nFileId].maFilterOptions.clear();
}
refreshSrcDocument(nFileId);
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f136d1a3147b..ca4a6ef912a1 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -323,7 +323,7 @@ bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt )
rText = OUString( (const sal_Unicode*) aStrm.GetData() );
return true;
}
- rText = OUString();
+ rText.clear();
return false;
// ExportStream must handle RTL_TEXTENCODING_UNICODE
@@ -352,7 +352,7 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa
return true;
}
}
- rText = OString();
+ rText.clear();
return false;
}
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index f8595834abca..765a232b3922 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -185,7 +185,7 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter,
// wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
if (!aFilterName.equals(rNewFilter))
- aOptions = OUString();
+ aOptions.clear();
if ( pNewOptions ) // Optionen hart angegeben?
aOptions = *pNewOptions;
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 33db5b31cde4..5b79c98535d6 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -373,7 +373,7 @@ void ScExtIButton::Click()
void ScExtIButton::StartPopup()
{
nSelected=0;
- aSelectedIdent = OString();
+ aSelectedIdent.clear();
if(pPopupMenu!=NULL)
{
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 3120b284a672..89fcd26aef25 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -701,10 +701,10 @@ void ScTableValidationObj::ClearData_Impl()
maExprNmsp1 = "";
maExprNmsp2 = "";
meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overridden when needed
- aInputTitle = OUString();
- aInputMessage = OUString();
- aErrorTitle = OUString();
- aErrorMessage = OUString();
+ aInputTitle.clear();
+ aInputMessage.clear();
+ aErrorTitle.clear();
+ aErrorMessage.clear();
}
ScTableValidationObj::~ScTableValidationObj()
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index efd991534abd..3728135d78b9 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -568,7 +568,7 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
OUString aName = itr->first;
if (aName.equals(ScGlobal::GetRscString(STR_EMPTYDATA)))
// Translate the special empty name into an empty string.
- aName = OUString();
+ aName.clear();
aResult.insert(
ScCheckListMenuWindow::ResultType::value_type(
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b4666dd9b4ce..f81eb3d7463d 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -534,7 +534,7 @@ bool ScDrawStringsVars::SetText( ScRefCellValue& rCell )
}
else
{
- aString = OUString();
+ aString.clear();
maLastCell.clear();
aTextSize = Size(0,0);
nOriginalWidth = 0;
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index ff58bacf53f2..69793e09e4ff 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -344,7 +344,7 @@ void ScTabControl::UpdateStatus()
}
else
{
- aString = OUString();
+ aString.clear();
}
if ( !aString.equals(GetPageText(static_cast<sal_uInt16>(i)+1)) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) )
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index f8b92a95068e..1278444df3ec 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -251,7 +251,8 @@ OUString Ppt97Animation::GetPresetSubType() const
void Ppt97Animation::ClearCacheData() const
{
- m_aPresetId = m_aSubType = OUString();
+ m_aPresetId.clear();
+ m_aSubType.clear();
m_bHasSpecialDuration = false;
m_fDurationInSeconds = 0.001;
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5f0faeb0f9cc..64c64bad7ca2 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -325,14 +325,14 @@ bool ImplSdPPTImport::Import()
OUString aString( aUString );
if ( aString == "No Slide Title" )
- aString = OUString();
+ aString.clear();
else
{
std::vector<OUString>::const_iterator pIter =
std::find(maSlideNameList.begin(),maSlideNameList.end(),aString);
if (pIter != maSlideNameList.end())
- aString = OUString();
+ aString.clear();
}
maSlideNameList.push_back( aString );
}
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 00c62388a5e3..a8cb6dda470b 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -108,7 +108,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
rString = OUString(pWString, lcl_getMaxSafeStrLen(nItemSize));
}
else
- rString = OUString();
+ rString.clear();
bRetValue = true;
}
else
@@ -119,7 +119,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
if ( nItemSize > 1 )
rString = OUString(pString, rtl_str_getLength(pString), mnTextEnc);
else
- rString = OUString();
+ rString.clear();
bRetValue = true;
}
}
@@ -149,7 +149,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
if ( (sal_uInt16)nItemSize > 1 )
rString = OUString(pString, lcl_getMaxSafeStrLen(nItemSize));
else
- rString = OUString();
+ rString.clear();
bRetValue = true;
}
delete[] pString;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 8221625f765a..9bee8f3726da 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -821,7 +821,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
aResult.mbSoundOn = nPos > 1;
if( aResult.mbStopSound )
{
- aResult.maSound = OUString();
+ aResult.maSound.clear();
aResult.mbSoundAmbiguous = false;
}
else
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 4deac8d75f45..5f9741fb56e4 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -390,7 +390,7 @@ void SdPageObjsTLB::Clear()
//Save the expanded tree item
if (mbSaveTreeItemState)
{
- maSelectionEntryText = OUString();
+ maSelectionEntryText.clear();
maTreeItem.clear();
if (GetCurEntry())
maSelectionEntryText = GetSelectEntry();
@@ -1536,7 +1536,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
if (pDocShell != NULL)
aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass();
else
- aObjectDescriptor.maDisplayName = OUString();
+ aObjectDescriptor.maDisplayName.clear();
aObjectDescriptor.mbCanLink = false;
rTransferable.SetStartPos(aDragPos);
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index dbfda6e62fd1..54ba78f37496 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -390,7 +390,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr
// this is for insertion of slides from other files with standard
// name. They get a new standard name, if the string is set to an
// empty one.
- rInOutPageName = OUString();
+ rInOutPageName.clear();
bCanUseNewName = true;
}
else
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 76c4bbf1fd86..14901db3044e 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -198,7 +198,7 @@ void ResourceManager::HandleMainViewSwitch (
if (bIsActivated)
msCurrentMainViewURL = rsViewURL;
else
- msCurrentMainViewURL = OUString();
+ msCurrentMainViewURL.clear();
UpdateForMainViewShell();
}
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 4177c6ed27c2..53e992ae0ce5 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -805,7 +805,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
sURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
}
else if( !sURL.isEmpty() )
- sURL = OUString();
+ sURL.clear();
if (!sURL.isEmpty())
{
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 020e29ab91d2..954052c0b3e7 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -87,7 +87,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
}
else
{
- msCurrentHelpText = OUString();
+ msCurrentHelpText.clear();
}
}
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 589e45bf3761..9d745a1d3292 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2297,13 +2297,13 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
}
if( nPageNumber == ( ( GetPage()->GetPageNum() - 1 ) >> 1 ) + 1 )
- aName = OUString();
+ aName.clear();
}
else
{
OUString aDefaultPageName( SD_RESSTR(STR_PAGE) + " " );
if( aName.startsWith( aDefaultPageName ) )
- aName = OUString();
+ aName.clear();
}
GetPage()->SetName( aName );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6b9c3f7c9329..04a96d83e238 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -210,7 +210,7 @@ OutlineViewShell::OutlineViewShell (
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OutlineText));
- m_StrOldPageName = OUString();
+ m_StrOldPageName.clear();
doShow();
}
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 6eb6e3b2143b..c271cdb51b23 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -77,12 +77,12 @@ void PresenterPaneContainer::PreparePane (
if (rsTitle.indexOf('%') < 0)
{
pDescriptor->msTitle = rsTitle;
- pDescriptor->msTitleTemplate = OUString();
+ (pDescriptor->msTitleTemplate).clear();
}
else
{
pDescriptor->msTitleTemplate = rsTitle;
- pDescriptor->msTitle = OUString();
+ (pDescriptor->msTitle).clear();
}
pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
pDescriptor->maViewInitialization = rViewInitialization;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 706612262492..50d69f4dca79 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -412,7 +412,7 @@ void PresenterProtocolHandler::Dispatch::disposing (void)
mbIsListeningToWindowManager = false;
}
- msURLPath = OUString();
+ msURLPath.clear();
mpCommand.reset();
}
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 795843c2426b..531e2277da3a 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -245,9 +245,9 @@ void PresenterSlideShowView::disposing (void)
mxController = NULL;
mxCanvas = NULL;
mpBackground.reset();
- msClickToExitPresentationText = OUString();
- msClickToExitPresentationTitle = OUString();
- msTitleTemplate = OUString();
+ msClickToExitPresentationText.clear();
+ msClickToExitPresentationTitle.clear();
+ msTitleTemplate.clear();
mxCurrentSlide = NULL;
}
@@ -290,7 +290,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
if (pDescriptor.get() != NULL)
{
pDescriptor->msTitleTemplate = msTitleTemplate;
- pDescriptor->msTitle = OUString();
+ (pDescriptor->msTitle).clear();
mpPresenterController->UpdatePaneTitles();
}
}
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 5f49f59fcd77..e3c5ee4b245d 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1578,7 +1578,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
{
if (mxSlides.get() != NULL)
{
- msText = OUString();
+ msText.clear();
Reference<beans::XPropertySet> xSlideProperties(mxSlides->getByIndex(nSlideIndex), UNO_QUERY);
if (xSlideProperties.is())
@@ -1590,7 +1590,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
}
else
{
- msText = OUString();
+ msText.clear();
}
mxBitmap = NULL;
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 8444682ac3c5..3cfe055323c1 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -101,7 +101,7 @@ Image SAL_CALL GetImage(
aCommandURL += OUString::createFromAscii( pSlot->GetUnoName() );
}
else
- aCommandURL = OUString();
+ aCommandURL.clear();
}
Reference< XImageManager > xDocImgMgr;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f2d935fb3635..baec605a2cad 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -647,7 +647,7 @@ void IndexTabPage_Impl::InitializeIndex()
}
}
else
- aIndex = OUString();
+ aIndex.clear();
// Assume the token is trimed
UNIFY_AND_INSERT_TOKEN( aKeywordPair );
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index e9cab42faad7..5cd81b44b9f7 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -463,7 +463,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p
}
if (bIsDebug && sHelpText.isEmpty())
- aNewHelpId = OString();
+ aNewHelpId.clear();
}
// add some debug information?
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 30c2df5afce2..e20eb0d011d1 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -249,7 +249,7 @@ static void deleteSystrayMenu( HMENU hMenu )
pMyItem = (MYITEM*) mi.dwItemData;
if( pMyItem )
{
- pMyItem->text = OUString();
+ (pMyItem->text).clear();
delete pMyItem;
}
mi.fMask = MIIM_DATA;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index e84f772c943e..33ab223a27a3 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -102,7 +102,7 @@ bool SfxEventNamesItem::GetPresentation( SfxItemPresentation,
OUString &rText,
const IntlWrapper* ) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 28e9be991a25..ea3ed0249991 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -125,7 +125,7 @@ void TemplateLocalView::showRootRegion()
{
mnHeaderHeight = 0;
mnCurRegionId = 0;
- maCurRegionName = OUString();
+ maCurRegionName.clear();
// Clone root region items so they dont get invalidated when we open another region
std::vector<ThumbnailViewItem*> items(maRegions.size());
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 10bec557a1cf..c7a70ca630d9 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -570,7 +570,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
OUString aParentEntry( m_pBaseLb->GetSelectEntry() );
if ( SfxResId(STR_NONE).toString().equals(aParentEntry) || aParentEntry == pStyle->GetName() )
- aParentEntry = OUString();
+ aParentEntry.clear();
if ( pStyle->GetParent() != aParentEntry )
{
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 6c999dc88f72..cff6c8ca14b2 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -249,7 +249,7 @@ splitPath(OUString const & i_rPath,
{
const sal_Int32 idx(i_rPath.indexOf(static_cast<sal_Unicode>('/')));
if (idx < 0 || idx >= i_rPath.getLength()) {
- o_rDir = OUString();
+ o_rDir.clear();
o_rRest = i_rPath;
return true;
} else if (idx == 0 || idx == i_rPath.getLength() - 1) {
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 2e8e65ff75fb..cbbf0b7a5eac 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -186,7 +186,7 @@ OUString SfxFilter::GetTypeFromStorage(
if ( pFilterName )
{
aName = *pFilterName;
- *pFilterName = OUString();
+ pFilterName->clear();
}
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xProps( xStorage, com::sun::star::uno::UNO_QUERY );
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 7066374169db..3a257c63c30a 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -207,7 +207,7 @@ bool SfxFrameDescriptorItem::GetPresentation
const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index f3e2001790d9..c8993f47d11d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -574,7 +574,7 @@ bool SfxObjectShell::SwitchToShared( bool bShared, bool bSave )
{
OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
GetMedium()->SwitchDocumentToFile( GetSharedFileURL() );
- pImp->m_aSharedFileURL = OUString();
+ (pImp->m_aSharedFileURL).clear();
// now remove the temporary file the document was based on
::utl::UCBContentHelper::Kill( aTempFileURL );
@@ -650,7 +650,7 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL )
// now remove the temporary file the document is based currently on
::utl::UCBContentHelper::Kill( aTempFileURL );
- pImp->m_aSharedFileURL = OUString();
+ (pImp->m_aSharedFileURL).clear();
}
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 9ab266871d06..aad386757fb7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -288,7 +288,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb
SAL_WARN( "sfx.doc", "Creation of a storage copy is failed!" );
::utl::UCBContentHelper::Kill( aTempURL );
- aTempURL = OUString();
+ aTempURL.clear();
// TODO/LATER: may need error code setting based on exception
SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) );
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 1909a9d24443..5e9fb2a81aea 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -145,7 +145,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame)
// Release objects that are tied to the old frame.
mxCachedDocumentAcceleratorConfiguration = NULL;
mxCachedModuleAcceleratorConfiguration = NULL;
- msCachedModuleIdentifier = OUString();
+ msCachedModuleIdentifier.clear();
mxCachedDataFrame = rxFrame;
// Connect to the new frame.
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 1b4971f4ea86..3220762be330 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -529,8 +529,8 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame)
rDeckDescriptor.msId = rsNodeName;
rDeckDescriptor.msIconURL = ::comphelper::getString(aChildNode.getNodeValue("ImageURL"));
rDeckDescriptor.msHighContrastIconURL = rDeckDescriptor.msIconURL;
- rDeckDescriptor.msTitleBarIconURL = OUString();
- rDeckDescriptor.msHighContrastTitleBarIconURL = OUString();
+ rDeckDescriptor.msTitleBarIconURL.clear();
+ rDeckDescriptor.msHighContrastTitleBarIconURL.clear();
rDeckDescriptor.msHelpURL = ::comphelper::getString(aChildNode.getNodeValue("HelpURL"));
rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle;
rDeckDescriptor.mbIsEnabled = true;
@@ -542,8 +542,8 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame)
rPanelDescriptor.mbIsTitleBarOptional = true;
rPanelDescriptor.msId = rsNodeName;
rPanelDescriptor.msDeckId = rsNodeName;
- rPanelDescriptor.msTitleBarIconURL = OUString();
- rPanelDescriptor.msHighContrastTitleBarIconURL = OUString();
+ rPanelDescriptor.msTitleBarIconURL.clear();
+ rPanelDescriptor.msHighContrastTitleBarIconURL.clear();
rPanelDescriptor.msHelpURL = ::comphelper::getString(aChildNode.getNodeValue("HelpURL"));
rPanelDescriptor.msImplementationURL = rsNodeName;
rPanelDescriptor.mnOrderIndex = 100000 + nReadIndex;
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 044fb1c15e5f..644c37b5eaa4 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -241,7 +241,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& s
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- sFilter = OUString();
+ sFilter.clear();
}
const SfxFilter* pFilter = 0;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 356cc9c7e53c..03d26ccc9baa 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1466,7 +1466,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic
get(m_pSymbolSetDisplay, "symbolsetdisplay");
get(m_pSymbolDisplay, "preview");
- aSymbolSetName = OUString();
+ aSymbolSetName.clear();
aSymbolSet.clear();
FillSymbolSets();
if (m_pSymbolSets->GetEntryCount() > 0)
@@ -1516,7 +1516,7 @@ bool SmSymbolDialog::SelectSymbolSet(const OUString &rSymbolSetName)
bool bRet = false;
sal_Int32 nPos = m_pSymbolSets->GetEntryPos(rSymbolSetName);
- aSymbolSetName = OUString();
+ aSymbolSetName.clear();
aSymbolSet.clear();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 7f8115680737..0282214c8b32 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -298,7 +298,7 @@ void SmDocShell::ArrangeFormula()
SetFormulaArranged(true);
// invalidate accessible text
- aAccText = OUString();
+ aAccText.clear();
}
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index a46bef3fa34b..bd2812d161b3 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -790,7 +790,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " nroot";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
rRet += " {";
@@ -874,7 +874,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if ( (nVariation != 0) && (nVariation != 3))
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if (((nVariation == 1) ||
@@ -896,7 +896,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if ( (nVariation != 0) && (nVariation != 2))
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if (((nVariation == 1) ||
@@ -914,7 +914,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if ( (nVariation != 0) && (nVariation != 2))
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if (((nVariation == 1) ||
@@ -930,7 +930,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
else
rRet += " Int";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if (((nVariation == 1) ||
(nVariation == 2)) && (nPart==1))
@@ -949,7 +949,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
else
rRet += " iInt";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if (nPart==1)
rRet += " cSub";
@@ -963,7 +963,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
else
rRet += " iiInt";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if (nPart==1)
rRet += " cSub";
@@ -980,7 +980,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if ((nVariation == 0) && (nPart==1))
@@ -996,7 +996,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " Sum";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==1))
rRet += " rSub";
@@ -1013,7 +1013,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if ((nVariation == 0) && (nPart==1))
@@ -1029,7 +1029,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " Prod";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==1))
rRet += " rSub";
@@ -1046,7 +1046,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if ((nVariation == 0) && (nPart==1))
@@ -1062,7 +1062,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " coProd";
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==1))
rRet += " rSub";
@@ -1079,7 +1079,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if ((nVariation == 0) && (nPart==1))
@@ -1095,7 +1095,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " union"; //union
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==1))
rRet += " rSub";
@@ -1112,7 +1112,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
if ((nVariation == 0) && (nPart==1))
@@ -1128,7 +1128,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
rRet += " intersect"; //intersect
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==1))
rRet += " rSub";
@@ -1155,7 +1155,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
}
rRet += " {";
@@ -1176,7 +1176,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==0))
rRet += " rSup";
@@ -1192,7 +1192,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sPush = rRet;
- rRet = OUString();
+ rRet.clear();
}
if ((nVariation == 0) && (nPart==0))
rRet += " cSup";
@@ -1351,7 +1351,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
{
newline--;
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
}
else
{
@@ -1464,7 +1464,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
}
else
{
@@ -1511,7 +1511,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nVariation != 2)
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
}
newline--;
}
@@ -1540,7 +1540,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if ((nVariation != 0) && (nVariation != 3))
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
}
newline--;
}
@@ -1571,7 +1571,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if ((nVariation != 0) && (nVariation != 2))
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
}
newline--;
}
@@ -1590,7 +1590,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
newline--;
}
else if ((nPart == 1) &&
@@ -1618,7 +1618,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
if (nPart == 0)
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
newline--;
}
else if (nPart == 1)
@@ -1638,7 +1638,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
((nVariation == 0) || (nVariation == 1)))
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
newline--;
}
else if ((nPart == 0) && (nVariation == 2))
@@ -1646,7 +1646,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
else if ((nPart == 1) && (nVariation == 2))
{
sMainTerm = rRet;
- rRet = OUString();
+ rRet.clear();
newline--;
}
else if ((nPart == 2) || ((((nPart == 1) &&
@@ -2898,7 +2898,7 @@ int MathType::HandleChar(sal_Int32 &rTextStart,int &rSetSize,int nLevel,
//follows the char and nPostSup and nPostlSup are the
//indexes at which this class of emblishment is
//collated together
- sPost = OUString();
+ sPost.clear();
nPostSup = nPostlSup = 0;
int nOriglen=rRet.getLength()-rTextStart;
rRet += " {"; // #i24340# make what would be "vec {A}_n" become "{vec {A}}_n"
@@ -2914,7 +2914,7 @@ int MathType::HandleChar(sal_Int32 &rTextStart,int &rSetSize,int nLevel,
aStr += "\"";
rRet = rRet.replaceAt(rTextStart,0,aStr);
- aStr = OUString();
+ aStr.clear();
TypeFaceToString(aStr,nTypeFace);
rRet += aStr + "{";
}
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index c63e8bb0531c..4b724b6afce4 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -657,7 +657,7 @@ void SmParser::NextToken()
m_aCurToken.cMathChar = '\0';
m_aCurToken.nGroup = 0;
m_aCurToken.nLevel = 5;
- m_aCurToken.aText = OUString();
+ m_aCurToken.aText.clear();
m_aCurToken.nRow = m_Row;
m_aCurToken.nCol = nTmpStart - m_nColOff;
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index a1dff888b4a0..57d950e842ba 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -175,7 +175,7 @@ void UriReference::setFragment(OUString const & fragment)
void UriReference::clearFragment() throw (css::uno::RuntimeException) {
osl::MutexGuard g(m_mutex);
m_hasFragment = false;
- m_fragment = OUString();
+ m_fragment.clear();
}
void UriReference::appendSchemeSpecificPart(OUStringBuffer & buffer) const
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index b856cb65b36e..3135631e1e5c 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1415,7 +1415,10 @@ namespace svgio
void readImageLink(const OUString& rCandidate, OUString& rXLink, OUString& rUrl, OUString& rMimeType, OUString& rData)
{
- rXLink = rUrl = rMimeType = rData = OUString();
+ rXLink.clear();
+ rUrl.clear();
+ rMimeType.clear();
+ rData.clear();
if('#' == rCandidate[0])
{
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index b9f591b945b3..3f8b9fba11ec 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -118,7 +118,7 @@ public:
m_aName = aRecord.m_aName;
m_aMemPass.clear();
- m_aPersPass = OUString();
+ m_aPersPass.clear();
InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass );
return *this;
@@ -177,7 +177,7 @@ public:
else if ( nStatus == PERSISTENT_RECORD )
{
m_bHasPersPass = false;
- m_aPersPass = OUString();
+ m_aPersPass.clear();
}
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index b734f071c827..c713ad00e4cb 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -115,7 +115,7 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal )
{
// De-initialize enum type and presentation.
_eType = CONTENT_TYPE_NOT_INIT;
- _aPresentation = OUString();
+ _aPresentation.clear();
CntUnencodedStringItem::SetValue( rNewVal );
}
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index bd9c5b968973..3ea30e125aa3 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -59,7 +59,7 @@ bool SfxFlagItem::GetPresentation
const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
rText += GetFlag(nFlag) ? OUString("true") : OUString("false");
return true;
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 8fa633bbe1f3..98e9a980da81 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -228,7 +228,7 @@ bool SvxMacroItem::GetPresentation
rText += cpDelim;
}
*/
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 6c09ef373d64..cf719786a286 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -687,7 +687,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// If not own Pool, then no name
if ( aExternName != pImp->aName )
- pImp->aName = OUString();
+ (pImp->aName).clear();
pImp->bStreaming = false;
return rStream;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index ca1f554e9cab..21d004b52715 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1349,7 +1349,7 @@ void SvNumberFormatter::GetOutputString(const double& fOutNumber,
{
if (bNoZero && fOutNumber == 0.0)
{
- sOutString = OUString();
+ sOutString.clear();
return;
}
SvNumberformat* pFormat = GetFormatEntry( nFIndex );
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index bbb59cdbcf3e..b402a35e2cdc 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -154,7 +154,7 @@ namespace
}
while( removeLastSegment( aUrl ) && !aUrl.isEmpty() );
}
- aResult = OUString();
+ aResult.clear();
return false;
}
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 1409b9d74cd4..24492be85a3a 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -227,7 +227,7 @@ found:
if ( pItem )
pTopic->aItem = pItem->GetName();
else
- pTopic->aItem = OUString();
+ (pTopic->aItem).clear();
bool bRes = false;
pInst->hCurConvSvr = (sal_IntPtr)hConv;
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 266b195f01eb..88c7b10d6532 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -205,7 +205,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const OUString& rStr,SvTreeLi
aCurEntry = aStr.copy(++nEnd);
}
else
- aCurEntry = OUString();
+ aCurEntry.clear();
return SvTreeListBox::InsertEntry( aFirstStr, pParent, false, nPos, pUser );
}
@@ -231,7 +231,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr,
aCurEntry = aStr.copy(++nEnd);
}
else
- aCurEntry = OUString();
+ aCurEntry.clear();
return SvTreeListBox::InsertEntry(
aFirstStr,
@@ -999,7 +999,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox
case ::svt::BBTYPE_TABLE:
case ::svt::BBTYPE_COLUMNHEADERBAR:
// should be empty now (see #i63983)
- aRetText = OUString();
+ aRetText.clear();
break;
case ::svt::BBTYPE_TABLECELL:
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index c26beda45b00..8f3c2626287b 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -435,7 +435,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
if ( pItem->maOutText.getLength() == 3 )
{
nTxtWidth = 0;
- pItem->maOutText = OUString();
+ (pItem->maOutText).clear();
}
}
@@ -1131,7 +1131,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
if ( pItem->maOutText != pItem->maText )
aStr = pItem->maText;
else if (!pItem->maText.isEmpty())
- aStr = OUString();
+ aStr.clear();
}
if (!aStr.isEmpty())
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index e2d018997066..9fa8b99f7d23 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2345,7 +2345,7 @@ void TabBar::EndEditMode( bool bCancel )
}
// reset
- maEditText = OUString();
+ maEditText.clear();
mbEditCanceled = false;
}
}
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index a35fe0f9e7d9..bfc972a50bf0 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -882,7 +882,7 @@ void AssignmentPersistentData::Commit()
// set the old table, if the new data source knows a table with this name, too. Else reset the tables edit field.
if (!bKnowOldTable)
- sOldTable = OUString();
+ sOldTable.clear();
m_pTable->SetText(sOldTable);
resetFields();
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 2ea8773dd5ec..8b5fa7b490f2 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -97,7 +97,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
::GraphicDescriptor aDescriptor( rIStm, &aURL );
mpGraphic = NULL;
- maMimeType = OUString();
+ maMimeType.clear();
meType = GRAPHIC_NONE;
mnBitsPerPixel = 0;
mbTransparent = false;
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 228ad1f26fc4..eb2aea48fd50 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -418,7 +418,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
if ( bUpdate )
{
DELETEZ( mpImpl->pGraphic );
- mpImpl->aMediaType = OUString();
+ (mpImpl->aMediaType).clear();
mpImpl->pGraphic = new Graphic;
mpImpl->mnGraphicVersion++;
}
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 92a70e40cc40..59bbbb7a95b9 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -170,7 +170,7 @@ namespace svx
const sal_Unicode cSeparator = sal_Unicode(11);
const OUString sSeparator(&cSeparator, 1);
- m_sCompatibleFormat = OUString();
+ m_sCompatibleFormat.clear();
m_sCompatibleFormat += _rDatasource;
m_sCompatibleFormat += sSeparator;
m_sCompatibleFormat += _rCommand;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index bd51defa89d3..c7a218447045 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2892,7 +2892,7 @@ bool DbFilterField::commitControl()
case ::com::sun::star::form::FormComponentType::CHECKBOX:
return true;
case ::com::sun::star::form::FormComponentType::LISTBOX:
- aText = OUString();
+ aText.clear();
if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount())
{
sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 461c11d1cf24..a9813718e8d0 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2339,7 +2339,7 @@ namespace svxform
if ( bIsChecked && sTemp.isEmpty() )
sTemp = TRUE_VALUE;
else if ( !bIsChecked && !sTemp.isEmpty() )
- sTemp = OUString();
+ sTemp.clear();
m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) );
}
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 5d9eb264a3e8..b4dee519966c 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -100,7 +100,7 @@ namespace svxform
BorderDescriptor::clear();
UnderlineDescriptor::clear();
xControl.clear();
- sOriginalHelpText = OUString();
+ sOriginalHelpText.clear();
}
};
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index d01a620f5cc9..694609caacc3 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -567,7 +567,7 @@ public:
virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement) SAL_OVERRIDE;
virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const SAL_OVERRIDE;
- virtual void Invalidate() SAL_OVERRIDE { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); }
+ virtual void Invalidate() SAL_OVERRIDE { IndexAccessIterator::Invalidate(); m_sCurrentValue.clear(); }
};
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index d221873862f7..295067326353 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -284,7 +284,7 @@ private:
SdrUnoObj*& _rpControl,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL,
const OUString& _rDataSourceName = OUString(),
- const OUString& _rCommand= OUString(),
+ const OUString& _rCommand = OUString(),
const sal_Int32 _nCommandType = -1
);
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index d21a57b217d3..ba185ced9d5f 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -56,7 +56,7 @@ bool SvxColorListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -119,7 +119,7 @@ bool SvxGradientListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -167,7 +167,7 @@ bool SvxHatchListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -210,7 +210,7 @@ bool SvxBitmapListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -252,7 +252,7 @@ bool SvxDashListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -293,7 +293,7 @@ bool SvxLineEndListItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 44ef7f8f4bea..4e485f04f052 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -129,7 +129,7 @@ bool SvxGrfCrop::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/,
OUString &rText, const IntlWrapper* pIntl ) const
{
- rText = OUString();
+ rText.clear();
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 36665d3789d5..4cc527b6ce7c 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -123,7 +123,7 @@ bool SvxNumberInfoItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index c051c0a61bc9..80447b992892 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -89,7 +89,7 @@ bool SvxPageItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
OUString cpDelimTmp = OUString(cpDelim);
switch ( ePres )
@@ -285,7 +285,7 @@ bool SvxSetItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 3897d2f3d757..692219355848 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -642,7 +642,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
if(!nMarkPtObjAnz)
{
- rName = OUString();
+ rName.clear();
rNameOk = true;
}
else if(!rNameOk)
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index e5a6e670e4d0..fea86370ea5a 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -1030,7 +1030,7 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr)
case FUNIT_NONE :
case FUNIT_CUSTOM :
{
- rStr = OUString();
+ rStr.clear();
break;
}
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 63e0cf3558ba..d42073403081 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -153,7 +153,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ?
{
- aFontWorkShapeType = OUString();
+ aFontWorkShapeType.clear();
break;
}
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 263ec03e8b7d..3f8c7b7447e7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1532,7 +1532,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
if( rValue >>= aStreamURL )
{
if( !aStreamURL.startsWith( UNO_NAME_GRAPHOBJ_URLPKGPREFIX ) )
- aStreamURL = OUString();
+ aStreamURL.clear();
if( mpObj.is() )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 9d0abd5388de..81e167d5107e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -449,7 +449,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
if( !maShapeName.isEmpty() )
{
mpObj->SetName( maShapeName );
- maShapeName = OUString();
+ maShapeName.clear();
}
}
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index b5586b3378d1..6b307c398747 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -378,7 +378,7 @@ bool XLineStyleItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -2130,7 +2130,7 @@ bool XFillStyleItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index eb478fef5142..ac87203aa363 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -62,7 +62,7 @@ bool XLineTransparenceItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -112,7 +112,7 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -316,7 +316,7 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const
bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
sal_uInt16 nId = 0;
@@ -420,7 +420,7 @@ bool XFillTransparenceItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
switch ( ePres )
{
@@ -489,7 +489,7 @@ bool XGradientStepCountItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
rText += OUString::number(GetValue());
return true;
@@ -525,7 +525,7 @@ bool XFillBmpTileItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -561,7 +561,7 @@ bool XFillBmpPosItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -602,7 +602,7 @@ bool XFillBmpSizeXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -643,7 +643,7 @@ bool XFillBmpSizeYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -684,7 +684,7 @@ bool XFillBmpSizeLogItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -720,7 +720,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -756,7 +756,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -790,7 +790,7 @@ bool XFillBmpStretchItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -826,7 +826,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -862,7 +862,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -891,7 +891,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
{
- rText = OUString();
+ rText.clear();
return true;
}
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 63c1d3c1d829..1027651721ad 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -82,7 +82,7 @@ public:
void Reset()
{
- sFont = OUString();
+ sFont.clear();
eCRLF_Flag = GetSystemLineEnd();
eCharSet = ::osl_getThreadTextEncoding();
nLanguage = 0;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 290784e627a2..da6a6eb207bd 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1563,7 +1563,7 @@ bool SwCalc::IsValidVarName( const OUString& rStr, OUString* pValidName )
}
}
else if( pValidName )
- *pValidName = OUString();
+ pValidName->clear();
}
return bRet;
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 8b53daf4ce72..7cc04eb8b64b 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -977,7 +977,7 @@ namespace
}
}
rRet = rStr;
- rStr = OUString();
+ rStr.clear();
return false;
}
}
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index 340396fbe2f4..784b38f6043c 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -107,7 +107,7 @@ SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyle
OUString sListId( pNumRule->GetDefaultListId() ); // can be empty String
if ( getListByName( sListId ) )
{
- sListId = OUString();
+ sListId.clear();
}
SwList* pNewList = createList( sListId, sListStyleName );
maListStyleLists[sListStyleName] = pNewList;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 0faa281a7c8b..0a340bf045e5 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -941,7 +941,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
else
break;
- sFormula = OUString();
+ sFormula.clear();
// trigger formatting
((SwFmtFld*)pFmtFld)->ModifyNotification( 0, 0 );
}
@@ -958,7 +958,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
else
break;
- sFormula = OUString();
+ sFormula.clear();
// evaluate field
((SwHiddenTxtField*)pFld)->Evaluate(&rDoc);
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 67e263c81a2e..929e986979b1 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -769,7 +769,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
if ( !mbKeepExpression )
{
- maMSTOCExpression = OUString();
+ maMSTOCExpression.clear();
}
SwDoc* pDoc = (SwDoc*)pSectNd->GetDoc();
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 530f0ff7d03c..d70d70e577d6 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -694,7 +694,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
if (sSectName != pSection->GetSectionName())
sSectName = GetUniqueSectionName( &sSectName );
else
- sSectName = OUString();
+ sSectName.clear();
/// In SwSection::operator=(..) class member bCondHiddenFlag is always set to sal_True.
/// IMHO this have to be changed, but I can't estimate the consequences:
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index fc7bed25b660..27edc52800f6 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -736,7 +736,7 @@ static sal_Int32 lcl_GetLongBoxNum( OUString& rStr )
if ( nPos<0 )
{
nRet = rStr.toInt32();
- rStr = OUString();
+ rStr.clear();
}
else
{
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index d1552abffb13..273d48c0e41e 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -120,10 +120,10 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
{
- sNumber = OUString();
- sTitle = OUString();
- sPost = OUString();
- sPre = OUString();
+ sNumber.clear();
+ sTitle.clear();
+ sPost.clear();
+ sPre.clear();
SwDoc* pDoc = (SwDoc*)rTxtNd.GetDoc();
const SwTxtNode *pTxtNd = rTxtNd.FindOutlineNodeOfLevel( nLevel );
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 23f00f8087ff..4645c0785667 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2239,7 +2239,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
pDoc->GetNodes().GetEndOfExtras().GetIndex() )
return;
- sTxt = OUString();
+ sTxt.clear();
OSL_ENSURE( !pFrm->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index c6840191c6a2..013ad4af5762 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -102,7 +102,7 @@ void SwDropDownField::SetPar2(const OUString & rName)
void SwDropDownField::SetItems(const vector<OUString> & rItems)
{
aValues = rItems;
- aSelectedItem = OUString();
+ aSelectedItem.clear();
}
void SwDropDownField::SetItems(const uno::Sequence<OUString> & rItems)
@@ -113,7 +113,7 @@ void SwDropDownField::SetItems(const uno::Sequence<OUString> & rItems)
for (int i = 0; i < aCount; i++)
aValues.push_back(rItems[i]);
- aSelectedItem = OUString();
+ aSelectedItem.clear();
}
uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
@@ -144,7 +144,7 @@ bool SwDropDownField::SetSelectedItem(const OUString & rItem)
if (aIt != aValues.end())
aSelectedItem = *aIt;
else
- aSelectedItem = OUString();
+ aSelectedItem.clear();
return (aIt != aValues.end());
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c7f1a00caaaf..6c9e20223e37 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -272,7 +272,7 @@ OUString SwGetRefField::GetFieldName() const
// #i81002# - parameter <pFldTxtAttr> added
void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
{
- sTxt = OUString();
+ sTxt.clear();
SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
// finding the reference target (the number)
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index f84d21028567..01c707a215bf 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2294,7 +2294,7 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
// redo only for values!
nW = RES_BOXATR_VALUE;
- sFields = OUString();
+ sFields.clear();
// restore previous spaces!
for( size_t i = aCells.size(); n+1 < i; )
{
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 64b70f67139b..e2867c745937 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -405,7 +405,7 @@ void SwImplProtocol::FileInit()
aLine = aLine.trim();
if( !aLine.isEmpty() )
CheckLine( aLine ); // evaluate line
- aLine = OString();
+ aLine.clear();
}
else
aLine = OString(c);
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 79a1c65bc6cf..fe4b25218b49 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1376,7 +1376,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
{
nRet = static_cast<sal_uInt16>(rStr.toInt32());
}
- rStr = OUString();
+ rStr.clear();
}
else
{
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index f3e59e0c189c..fe90c4d33047 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -27,7 +27,7 @@ sal_Int32 SwExpandPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
{
- rTxt = OUString();
+ rTxt.clear();
// Nicht etwa: return 0 != rTxt.Len();
// Weil: leere Felder ersetzen CH_TXTATR gegen einen Leerstring
return true;
@@ -234,7 +234,7 @@ bool SwPostItsPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) co
if( rInf.OnWin() && rInf.GetOpt().IsPostIts() )
rTxt = OUString(' ');
else
- rTxt = OUString();
+ rTxt.clear();
return true;
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index fbf8b91862db..02deb0dfd605 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1104,7 +1104,7 @@ bool SwTxtNode::Convert( SwConversionArgs &rArgs )
? ::std::min(rArgs.pEndIdx->GetIndex(), m_Text.getLength())
: m_Text.getLength();
- rArgs.aConvText = OUString();
+ rArgs.aConvText.clear();
// modify string according to redline information and hidden text
const OUString aOldTxt( m_Text );
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 757167266649..470abe183a30 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -373,7 +373,7 @@ SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const
}
if (o_pStr) // not repeatable -> clear comment
{
- *o_pStr = OUString();
+ o_pStr->clear();
}
return UNDO_EMPTY;
}
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index cb2e42ed70de..39e5d2c9a985 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -345,7 +345,7 @@ SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode)
{
try { setString(m_pImpl->m_sText); }
catch(...){}
- m_pImpl->m_sText = OUString();
+ (m_pImpl->m_sText).clear();
}
}
}
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index bd137b174b85..1d2bc1b828f9 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1489,7 +1489,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
if (m_pImpl->m_bIsDescriptor)
{
- m_pImpl->m_pProps->m_sCondition = OUString();
+ (m_pImpl->m_pProps->m_sCondition).clear();
}
else
{
@@ -1505,9 +1505,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
if (m_pImpl->m_bIsDescriptor)
{
m_pImpl->m_pProps->m_bDDE = false;
- m_pImpl->m_pProps->m_sLinkFileName = OUString();
- m_pImpl->m_pProps->m_sSectionRegion = OUString();
- m_pImpl->m_pProps->m_sSectionFilter = OUString();
+ (m_pImpl->m_pProps->m_sLinkFileName).clear();
+ (m_pImpl->m_pProps->m_sSectionRegion).clear();
+ (m_pImpl->m_pProps->m_sSectionFilter).clear();
}
else
{
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index c9b4293b1010..aca2c381df25 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1359,7 +1359,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
{
// if the default for the level is existing, but its
// level is different, then it cannot be the default.
- sValue = OUString();
+ sValue.clear();
}
}
SwStyleNameMapper::FillProgName(sValue, aUString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
@@ -1399,7 +1399,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
//char style name
OUString CharStyleName(rCharFormatName);
- aUString = OUString();
+ aUString.clear();
SwStyleNameMapper::FillProgName( CharStyleName, aUString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
aPropertyValues.push_back(makePropertyValue(aUString, "CharStyleName"));
@@ -1507,7 +1507,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
aAny >>= aUString;
}
else
- aUString = OUString();
+ aUString.clear();
aPropertyValues.push_back(
makePropertyValue(aUString, UNO_NAME_GRAPHIC_URL));
@@ -1792,7 +1792,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
// #i51842#
// If the character format has been found its name should not be in the
// char style names array
- rCharStyleName = OUString();
+ rCharStyleName.clear();
}
else
rCharStyleName = sCharFmtName;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5d6191159dcf..57ab928ac3a1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3316,7 +3316,7 @@ void SwXStyle::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
void SwXStyle::Invalidate()
{
- m_sStyleName = OUString();
+ m_sStyleName.clear();
pBasePool = 0;
m_pDoc = 0;
mxStyleData.clear();
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 1f6f2a67bbb9..37e61ed54d7d 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -616,7 +616,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
OUString *pPseudo )
{
sal_uInt16 nDeep = 0;
- rToken = OString();
+ rToken.clear();
rClass = "";
rRefPoolId = 0;
if( pPseudo )
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 826c7cce1d57..b25020687de1 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -642,7 +642,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
// nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang
// ausgeben
- rInfo.aToken = OString(); // kein End-Tag ausgeben
+ rInfo.aToken.clear(); // kein End-Tag ausgeben
rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
return;
@@ -962,7 +962,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// wenn kein End-Tag geschrieben werden soll, es loeschen
if( bNoEndTag )
- rInfo.aToken = OString();
+ rInfo.aToken.clear();
}
if( nBulletGrfLvl != 255 )
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 65c924abc2fc..4f9c9ef670b9 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -234,7 +234,8 @@ void SwHTMLParser::NewDivision( int nToken )
SwNodeIndex aTmpSwNodeIndex = SwNodeIndex(*pCNd);
SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) );
SaveDocContext( pCntxt, CONTEXT_FLAGS_FTN, &aNewPos );
- aId = aPropInfo.aId = OUString();
+ aId.clear();
+ aPropInfo.aId.clear();
}
}
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 56324f571182..34c57958c911 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -887,7 +887,7 @@ bool SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStartCp,
OSL_ENSURE(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?");
if (nStartCp == nEndCp)
- rString = OUString(); // leerer String: durchaus denkbar!
+ rString.clear(); // leerer String: durchaus denkbar!
else if (nStartCp < nEndCp)
{
// den Text einlesen: kann sich ueber mehrere Pieces erstrecken!!!
@@ -1113,7 +1113,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
MapWrapIntoFlyFmt(pRecord, pFlyFmt);
}
}
- aString = OUString();
+ aString.clear();
rbEraseTextObj = (0 != pFlyFmt);
}
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c071cbd1378c..28525bde172c 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1927,7 +1927,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr,
WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const
{
// Read in plain text, which can extend over several pieces
- rStr = OUString();
+ rStr.clear();
long nTotalRead = 0;
WW8_CP nBehindTextCp = nAktStartCp + nTotalLen;
@@ -6175,7 +6175,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd )
}
}
else
- *pString = OUString(); // Kann keinen Namen liefern
+ pString->clear(); // Kann keinen Namen liefern
}
return pStd;
}
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 6554cc496256..218422ecf53d 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -105,7 +105,7 @@ SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl()
void SwXMLImportTableItemMapper_Impl::Reset()
{
- m_FoMarginValue = OUString();
+ m_FoMarginValue.clear();
for (int i = 0; i < 3; ++i)
{
m_bHaveMargin[i] = false;
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 8fa98e1a8938..7355613e3ad2 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -499,7 +499,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl)
if( nPos > 0 )
aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry();
else
- aAssignment[MM_PART_GENDER] = OUString();
+ aAssignment[MM_PART_GENDER].clear();
rConfigItem.SetColumnAssignment( rDBData, aAssignment );
}
if(m_pFemaleFieldCB->IsValueChangedFromSaved())
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 3581bc3d8b80..830bc1e14fcf 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -706,7 +706,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
if (!bSpecialFmt)
{
m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
- sOldNumSel = OUString();
+ sOldNumSel.clear();
}
else if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD)
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 3c57f1d0b839..93424cf6fcc7 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -283,7 +283,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
{
OUString sFldTypeName = m_pCategoryBox->GetText();
if(sFldTypeName == m_sNone)
- sFldTypeName = OUString();
+ sFldTypeName.clear();
SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName );
aDlg.SetApplyBorderAndShadow(bCopyAttributes);
aDlg.SetCharacterStyle( sCharacterStyle );
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 085ca163820f..1daede431e21 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1177,7 +1177,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
if (pBox->GetSelectEntry().isEmpty())
{
for(int i = 0; i < AUTH_FIELD_END; i++)
- m_sFields[i] = OUString();
+ m_sFields[i].clear();
}
m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]);
m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index d669783bb769..2cab3c57fe44 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -601,14 +601,14 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
pCollNames[i] = aSaveCollNames[i];
if(aCollName == aNoFmtName)
- pCollNames[nTmpLevel] = OUString();
+ pCollNames[nTmpLevel].clear();
else
{
pCollNames[nTmpLevel] = aCollName;
// template already in use?
for( i = 0; i < MAXLEVEL; ++i)
if(i != nTmpLevel && pCollNames[i] == aCollName )
- pCollNames[i] = OUString();
+ pCollNames[i].clear();
}
// search the oldname and put it into the current entries
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 5b5fca7be5f3..542302e0ccc0 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -318,14 +318,14 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
@@ -353,21 +353,21 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
case 6:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
@@ -464,14 +464,14 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
case 0:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
sal_Int16 nParentNumbering = 0;
setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
@@ -494,35 +494,35 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
case 4:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
@@ -568,28 +568,28 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
case 0:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 1:
{
nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( '.' );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
case 3:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString();
+ sPrefix.clear();
sSuffix = OUString( ')' );
break;
}
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index 6fe21b8c2148..b0be1ef15f90 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -82,7 +82,7 @@ IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
{
SfxFloatingWindow::FillInfo(rInfo);
- rInfo.aWinState = OString();
+ rInfo.aWinState.clear();
rInfo.bVisible = false;
}
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 361d1af0b7ad..e7514f7dca0b 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -407,7 +407,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead
//doesn't use ReplaceAll to prevent expansion of numbers inside of the headers
OUString sBlock(rBlock.replaceAll("\\n", OUString('\n')));
SwAddressIterator aGreetingIter(sBlock);
- sBlock = OUString();
+ sBlock.clear();
while(aGreetingIter.HasMore())
{
SwMergeAddressItem aNext = aGreetingIter.Next();
@@ -1601,7 +1601,7 @@ void SwMailMergeConfigItem::DocumentReloaded()
m_bMergeDone = false;
m_bGreetingInserted = false;
m_bAddressInserted = false;
- m_rAddressBlockFrame = OUString();
+ m_rAddressBlockFrame.clear();
}
bool SwMailMergeConfigItem::IsMailAvailable() const
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 12d7cfb9282f..4e62f0a17c33 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -170,7 +170,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle )
else
{
delete pGroup;
- sRet = OUString();
+ sRet.clear();
}
}
return sRet;
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index bdd6c4aa3b02..917a778cdbb2 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -711,7 +711,7 @@ void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs )
bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs )
{
bool bProgress = !m_bIsDrawObj && !m_bIsSelection;
- pConversionArgs->aConvText = OUString();
+ (pConversionArgs->aConvText).clear();
pConversionArgs->nConvTextLang = LANGUAGE_NONE;
m_pView->GetWrtShell().SpellContinue( &m_nPageCount, bProgress ? &m_nPageStart : NULL, pConversionArgs );
return !pConversionArgs->aConvText.isEmpty();
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 6ef7dfb73ee4..6d64d753dceb 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -575,7 +575,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
rSh.Unchain(*pFlyFmt);
}
else
- sPrevName = OUString();
+ sPrevName.clear();
}
if (!sPrevName.isEmpty())
@@ -609,7 +609,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
rSh.Unchain(*((SwFlyFrmFmt*) pCurrFlyFmt));
}
else
- sNextName = OUString();
+ sNextName.clear();
}
if (!sNextName.isEmpty())
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index e44215dbf1d9..da77563d6525 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -252,7 +252,7 @@ void PageMarginControl::FillValueSet(
}
else
{
- aHelpText = OUString();
+ aHelpText.clear();
}
mpMarginValueSet->AddItem(
Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)), 0,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 3e2bfbe3a09a..1a96ef53906b 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -737,7 +737,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() );
aSearchOpt.Locale = GetAppLanguageTag().getLocale();
if( !bDoReplace )
- aSearchOpt.replaceString = OUString();
+ aSearchOpt.replaceString.clear();
sal_uLong nFound;
if( aSrchSet.Count() || ( pReplSet && pReplSet->Count() ))
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 162ec5751e07..8f04c4a4ef15 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -696,8 +696,8 @@ void SwXAutoTextGroup::removeVetoableChangeListener(
void SwXAutoTextGroup::Invalidate()
{
pGlossaries = 0;
- sName = OUString();
- m_sGroupName = OUString();
+ sName.clear();
+ m_sGroupName.clear();
}
OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException, std::exception )
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 5984a257cde1..52a04adf4150 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -69,7 +69,7 @@ void SwAttrSet::GetPresentation(
{
static sal_Char const sComma[] = ", ";
- rText = OUString();
+ rText.clear();
OUString aStr;
if( Count() )
{
@@ -122,7 +122,7 @@ bool SwFmtAutoFmt::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- rText = OUString(); //TODO
+ rText.clear(); //TODO
return true;
}
@@ -143,7 +143,7 @@ bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
- rText = OUString();
+ rText.clear();
return true;
}
@@ -156,7 +156,7 @@ bool SwFmtDrop::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
if ( GetLines() > 1 )
{
if ( GetChars() > 1 )
@@ -500,7 +500,7 @@ bool SwFmtCol::GetPresentation
}
}
else
- rText = OUString();
+ rText.clear();
return true;
}
@@ -515,7 +515,7 @@ bool SwFmtURL::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
if ( pMap )
rText += "Client-Map";
if ( !sURL.isEmpty() )
@@ -542,7 +542,7 @@ bool SwFmtEditInReadonly::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
if ( GetValue() )
rText = SW_RESSTR(STR_EDIT_IN_READONLY);
return true;
@@ -702,7 +702,7 @@ bool SwRotationGrf::GetPresentation(
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
rText = SW_RESSTR( STR_ROTATION );
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
rText = rText + OUString::number( GetValue() ) + "\xB0";
return true;
}
@@ -714,7 +714,7 @@ bool SwLuminanceGrf::GetPresentation(
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
rText = SW_RESSTR( STR_LUMINANCE );
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
@@ -727,7 +727,7 @@ bool SwContrastGrf::GetPresentation(
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
rText = SW_RESSTR( STR_CONTRAST );
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
@@ -750,10 +750,10 @@ bool SwChannelGrf::GetPresentation(
if( nId )
rText = SW_RESSTR( nId );
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
}
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
@@ -776,7 +776,7 @@ bool SwInvertGrf::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
OUString &rText, const IntlWrapper* /*pIntl*/) const
{
- rText = OUString();
+ rText.clear();
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
{
const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT;
@@ -792,7 +792,7 @@ bool SwTransparencyGrf::GetPresentation(
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
rText = SW_RESSTR( STR_TRANSPARENCY );
else if( rText.getLength() )
- rText = OUString();
+ rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
@@ -802,7 +802,7 @@ bool SwDrawModeGrf::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
OUString &rText, const IntlWrapper* /*pIntl*/) const
{
- rText = OUString();
+ rText.clear();
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
{
sal_uInt16 nId;
@@ -825,7 +825,7 @@ bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
OUString &rText,
const IntlWrapper* /*pIntl*/ ) const
{
- rText = OUString();
+ rText.clear();
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
{
const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index f1f96e04952d..2402fd3c56c7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -264,7 +264,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
pMarkAccess->getBookmarksBegin(),
pMarkAccess->getBookmarksEnd(),
&lcl_IsUiVisibleBookmark));
- sTypeToken = OUString();
+ sTypeToken.clear();
bEdit = true;
}
break;
@@ -406,14 +406,14 @@ void SwContentType::Init(bool* pbInvalidateWindow)
}
}
}
- sTypeToken = OUString();
+ sTypeToken.clear();
bEdit = true;
nOldMemberCount = nMemberCount;
}
break;
case CONTENT_TYPE_DRAWOBJECT:
{
- sTypeToken = OUString();
+ sTypeToken.clear();
nMemberCount = 0;
SwDrawModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel();
if(pModel)
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 41449c9b5f8f..ad506f5fcf0b 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -360,7 +360,8 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries)
{
SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName);
pGroup->nCount = pBlock ? pBlock->GetCount() : 0;
- pGroup->sLongNames = pGroup->sShortNames = OUString();
+ (pGroup->sLongNames).clear();
+ (pGroup->sShortNames).clear();
if(pBlock)
pGroup->sTitle = pBlock->GetName();
diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx
index 50640d89611c..3faa4a64f29e 100644
--- a/sw/source/uibase/utlui/zoomctrl.cxx
+++ b/sw/source/uibase/utlui/zoomctrl.cxx
@@ -50,7 +50,7 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
}
else
{
- sPreviewZoom = OUString();
+ sPreviewZoom.clear();
SvxZoomStatusBarControl::StateChanged(nSID, eState, pState);
}
}
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index fec7e867e12d..786ce997ad29 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -524,7 +524,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
}
else
{
- sURL = OUString();
+ sURL.clear();
}
}
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 2b34b9d856cf..9dfd49532a3a 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -873,7 +873,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
{
OSL_TRACE( "ControlModelContainerBase::getGroup: invalid argument and I am not allowed to throw an exception!" );
_rGroup.realloc( 0 );
- _rName = OUString();
+ _rName.clear();
}
else
{
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index e654f56671d8..9cc65f54f8bc 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -229,7 +229,8 @@ namespace toolkit
{
::osl::MutexGuard aGuard( m_aMutex );
m_aIdentifier.clear();
- m_sTitle = m_sHelpText = OUString();
+ m_sTitle.clear();
+ m_sHelpText.clear();
}
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index a94a83c78d49..40c78865fde1 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -313,7 +313,7 @@ bool parseParameters(ParameterList const & rInput,
while (pNext && pNext->m_nSection > 0);
if (bBadEncoding)
{
- aValue = OUString();
+ aValue.clear();
for (pNext = p;;)
{
if (pNext->m_bExtended)
diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx
index c219adf0ce73..dfe0b6d13a94 100644
--- a/tools/source/misc/getprocessworkingdir.cxx
+++ b/tools/source/misc/getprocessworkingdir.cxx
@@ -33,7 +33,7 @@ namespace tools {
bool getProcessWorkingDir(OUString &rUrl)
{
- rUrl = OUString();
+ rUrl.clear();
OUString s("$OOO_CWD");
rtl::Bootstrap::expandMacros(s);
if (s.isEmpty())
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 1a9ee6b28929..327dda5fd201 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -535,7 +535,7 @@ bool SvStream::ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead )
{
// Exit on first block-read error
bIsEof = true;
- rStr = OString();
+ rStr.clear();
return false;
}
else
@@ -612,7 +612,7 @@ bool SvStream::ReadUniStringLine( OUString& rStr, sal_Int32 nMaxCodepointsToRead
{
// exit on first BlockRead error
bIsEof = true;
- rStr = OUString();
+ rStr.clear();
return false;
}
else
@@ -2005,7 +2005,7 @@ SvScriptStream::~SvScriptStream()
bool SvScriptStream::ReadLine(OString &rStr, sal_Int32)
{
- rStr = OString();
+ rStr.clear();
if (!good())
return false;
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index fad490d17877..467baf580228 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -161,7 +161,7 @@ TeleConference* TeleManager::getConference()
pConference = it->second;
SAL_WARN_IF( !pConference, "tubes", "TeleManager::getConference: "
<< pImpl->msCurrentUUID.getStr() << " not found!" );
- pImpl->msCurrentUUID = OString();
+ (pImpl->msCurrentUUID).clear();
return pConference;
}
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index d7a1c4c7904b..c306989b838e 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -98,7 +98,8 @@ namespace ftp {
m_nSize((sal_uInt32)(-1)) { }
void clear() {
- m_aURL = m_aName = OUString();
+ m_aURL.clear();
+ m_aName.clear();
m_aDate = DateTime(0,0,0,0,0,0,0);
m_nMode = INETCOREFTP_FILEMODE_UNKNOWN;
m_nSize = sal_uInt32(-1);
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index c1467d8a8cfc..2a6be256c622 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -55,7 +55,7 @@ public:
{ init(); return m_aUri; }
void setUri( const OUString & rUri )
- { m_aPath = OUString(); m_aUri = rUri; m_bValid = false; }
+ { m_aPath.clear(); m_aUri = rUri; m_bValid = false; }
const OUString & getParentUri() const
{ init(); return m_aParentUri; }
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index 59a983699991..306c0f67bd97 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -69,8 +69,11 @@ void PackageUri::init() const
if ( !m_aUri.isEmpty() && m_aPath.isEmpty() )
{
// Note: Maybe it's a re-init, setUri only resets m_aPath!
- m_aPackage = m_aParentUri = m_aName = m_aParam = m_aScheme
- = OUString();
+ m_aPackage.clear();
+ m_aParentUri.clear();
+ m_aName.clear();
+ m_aParam.clear();
+ m_aScheme.clear();
// URI must match at least: <sheme>://<non_empty_url_to_file>
if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) )
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 6711fe3f6668..edd6fee303ee 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -58,7 +58,7 @@ public:
{ init(); return m_aUri; }
void setUri( const OUString & rPackageUri )
- { m_aPath = OUString(); m_aUri = rPackageUri; m_bValid = false; }
+ { m_aPath.clear(); m_aUri = rPackageUri; m_bValid = false; }
const OUString & getParentUri() const
{ init(); return m_aParentUri; }
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index c046df8120a5..df3ea9c93895 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -591,7 +591,7 @@ ContentProvider::queryStorageTitle( const OUString & rUri ) const
if ( aUri.isRoot() )
{
// always empty.
- aTitle = OUString();
+ aTitle.clear();
}
else if ( aUri.isDocument() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 8930a9d60a1e..d4ecdd2f528b 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -95,8 +95,12 @@ inline void Uri::setUri( const OUString & rUri )
{
m_eState = UNKNOWN;
m_aUri = rUri;
- m_aParentUri = m_aDocId = m_aInternalPath = m_aPath = m_aName
- = m_aDecodedName = OUString();
+ m_aParentUri.clear();
+ m_aDocId.clear();
+ m_aInternalPath.clear();
+ m_aPath.clear();
+ m_aName.clear();
+ m_aDecodedName.clear();
}
inline bool Uri::isRoot() const
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index 93c2278a156e..e3d331b95a82 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -106,8 +106,8 @@ int DAVAuthListener_Impl::authenticate(
{
// This is the (strange) way to tell neon to use
// system credentials.
- inoutUserName = OUString();
- outPassWord = OUString();
+ inoutUserName.clear();
+ outPassWord.clear();
}
else
{
@@ -1052,7 +1052,7 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aURL = rNewURL;
- m_aPath = OUString(); // Next initialize() will create new session.
+ m_aPath.clear(); // Next initialize() will create new session.
}
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 021d80b4d61d..b18a50456a06 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -98,8 +98,8 @@ int DAVAuthListener_Impl::authenticate(
{
// This is the (strange) way to tell neon to use
// system credentials.
- inoutUserName = OUString();
- outPassWord = OUString();
+ inoutUserName.clear();
+ outPassWord.clear();
}
else
{
@@ -1040,7 +1040,7 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aURL = rNewURL;
- m_aPath = OUString(); // Next initialize() will create new session.
+ m_aPath.clear(); // Next initialize() will create new session.
}
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index c0bda26f683c..06088d20a99f 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -76,8 +76,8 @@ void SerfRequestProcessor::prepareProcessor()
delete mpDAVException;
mpDAVException = 0;
mnHTTPStatusCode = SC_NONE;
- mHTTPStatusCodeText = OUString();
- mRedirectLocation = OUString();
+ mHTTPStatusCodeText.clear();
+ mRedirectLocation.clear();
mnSuccessfulCredentialAttempts = 0;
mbInputOfCredentialsAborted = false;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 8b819a5549b0..222d0aa9119a 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2038,7 +2038,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
// Do not set new title!
- aNewTitle = OUString();
+ aNewTitle.clear();
// Set error .
aRet[ nTitlePos ] <<= uno::Exception(
@@ -2049,7 +2049,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
catch ( DAVException const & e )
{
// Do not set new title!
- aNewTitle = OUString();
+ aNewTitle.clear();
// Set error .
aRet[ nTitlePos ] <<= MapDAVException( e, true );
@@ -2724,7 +2724,7 @@ void Content::transfer(
if ( aTitle == "/" )
{
// kso: ???
- aTitle = OUString();
+ aTitle.clear();
}
targetURI.AppendPath( aTitle );
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 81ab1d1b97cd..df64f1d32f36 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -88,7 +88,7 @@ short generateNamespace(std::ostream & o,
o << "namespace comp_" << implname << " {\n\n";
count=1;
} else {
- nm = OString();
+ nm.clear();
}
} else {
sal_Int32 nPos=0;
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 3c30a250228a..de38a3b2a00a 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -244,7 +244,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Pa
case ::com::sun::star::uno::TypeClass_SEQUENCE :
{
// single paths
- aFullPath = OUString();
+ aFullPath.clear();
Sequence < OUString > aList;
if ( pValues[nProp] >>= aList )
{
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 732d17084ffb..ff45cfb77cc6 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -281,7 +281,7 @@ OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName )
}
catch(const css::uno::Exception& ex)
{
- sWindowState = OUString();
+ sWindowState.clear();
SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex)
}
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 1d2dedb36a8c..4d08c63a58e7 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -75,7 +75,7 @@ bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& r
bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn)
{
- rReturn = OUString();
+ rReturn.clear();
Reference< XUniversalContentBroker > pBroker(
UniversalContentBroker::create(
comphelper::getProcessComponentContext() ) );
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index bb8477e3eded..248cf4375f58 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -68,7 +68,7 @@ namespace DOM
InputSource is;
is.sPublicId = sPublicId;
is.sSystemId = sSystemId;
- is.sEncoding = OUString();
+ is.sEncoding.clear();
try {
Reference< XCommandEnvironment > aEnvironment(
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 80100d238591..47371312994c 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -242,7 +242,7 @@ namespace DOM
aPrefix = aName.copy(0, idx);
}
else
- aPrefix = OUString();
+ aPrefix.clear();
NSMap::const_iterator result = aNSMap.find(aPrefix);
if ( result != aNSMap.end())
@@ -262,8 +262,8 @@ namespace DOM
m_aNodeStack.push(aElement);
// set non xmlns attributes
- aPrefix = OUString();
- aURI = OUString();
+ aPrefix.clear();
+ aURI.clear();
AttrMap::const_iterator a = aAttrMap.begin();
while (a != aAttrMap.end())
{
@@ -273,7 +273,7 @@ namespace DOM
if (idx != -1)
aPrefix = attr_qname.copy(0, idx);
else
- aPrefix = OUString();
+ aPrefix.clear();
result = aNSMap.find(aPrefix);
if (result != aNSMap.end())
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 1a9dd396fe4c..128193c26889 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -979,7 +979,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
//if the codepoint is impossible for this lang tag, then clear it
//and autodetect something useful
if (!aLangAttrib.isEmpty() && isImpossibleCodePointForLang(aLangTag, nCode))
- aLangAttrib = OString();
+ aLangAttrib.clear();
//#i105784#/rhbz#527719 improve selection of fallback font
if (aLangAttrib.isEmpty())
{
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index 3a313190ea80..aadfa0f29beb 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -206,7 +206,7 @@ OUString psp::getFontPath()
struct stat aStat;
if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat )
|| ! S_ISDIR( aStat.st_mode ) )
- aConfigPath = OUString();
+ aConfigPath.clear();
else
{
aPathBuffer.append(aConfigPath);
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d215a1de9750..910997ea00af 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -873,8 +873,11 @@ bool PspSalPrinter::StartJob(
OSL_TRACE("PspSalPrinter::StartJob");
GetSalData()->m_pInstance->jobStartedPrinterUpdate();
m_bPdf = false;
- m_aFileName = pFileName ? *pFileName : OUString();
- m_aTmpFile = OUString();
+ if (pFileName)
+ m_aFileName = *pFileName;
+ else
+ m_aFileName.clear();
+ m_aTmpFile.clear();
m_nCopies = nCopies;
m_bCollate = bCollate;
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 9635aa3c78d6..80d52b1ad1ed 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -385,7 +385,7 @@ PrinterJob::StartJob (
aTitle = rFileName.getToken( 0, '/', nIndex );
aTitle = WhitespaceToSpace( aTitle, false );
if( ! isAscii( aTitle ) )
- aTitle = OUString();
+ aTitle.clear();
}
maJobTitle = aFilterWS;
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index a228aa9bd50b..a262b826d8e2 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -114,7 +114,7 @@ PrinterGfx::SetFont(
// font and encoding will be set by drawText again immediately
// before PSShowText
mnFontID = nFontID;
- maVirtualStatus.maFont = OString();
+ maVirtualStatus.maFont.clear();
maVirtualStatus.maEncoding = RTL_TEXTENCODING_DONTKNOW;
maVirtualStatus.mnTextHeight = nHeight;
maVirtualStatus.mnTextWidth = nWidth;
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 33bd19b3c46c..26e8885f6802 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -497,7 +497,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
if( maOfficeOnlyTypes.find( aTryFlavor ) != maOfficeOnlyTypes.end() )
{
oOOFlavor.MimeType = aTryFlavor;
- oOOFlavor.HumanPresentableName = OUString();
+ oOOFlavor.HumanPresentableName.clear();
oOOFlavor.DataType = getCppuType((Sequence<sal_Int8>*)0);
}
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8f411f728390..aca5e8dc4a4d 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1088,7 +1088,7 @@ private:
{
SalExtTextInputEvent aEvent;
aEvent.mnTime = mpFrame->mnLastEventTime;
- aEvent.maText = OUString();
+ aEvent.maText.clear();
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = 0;
aEvent.mnCursorFlags = 0;
@@ -1641,7 +1641,7 @@ private:
aInputEvent.mpTextAttr = &aInputFlags[0];
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void *)&aInputEvent );
} else {
- aInputEvent.maText = OUString();
+ aInputEvent.maText.clear();
aInputEvent.mnCursorPos = 0;
aInputEvent.mnCursorFlags = 0;
aInputEvent.mpTextAttr = 0;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 174918035b25..53f0ac9a8eb2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1533,7 +1533,7 @@ void MetricFormatter::Reformat()
}
else
SetValue( mnLastValue );
- maCurUnitText = OUString();
+ maCurUnitText.clear();
}
sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index a0d3da11eccd..0dc4705428ce 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -225,7 +225,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
nTextStyle |= TEXT_DRAW_MONO;
if( bFillLayout )
- mpControlData->mpLayoutData->m_aDisplayText = OUString();
+ (mpControlData->mpLayoutData->m_aDisplayText).clear();
Rectangle aRect( Rectangle( aPos, rSize ) );
DrawControlText( *pDev, aRect, aText, nTextStyle,
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6d9c3ea51525..b41ecd8d4f51 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -395,7 +395,7 @@ void ImpGraphic::ImplClear()
mbSwapOut = false;
mnDocFilePos = 0UL;
- maDocFileURLStr = OUString();
+ maDocFileURLStr.clear();
// cleanup
ImplClearGraphics( false );
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index e81bafe54269..d58cc8d0cc6b 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -186,7 +186,7 @@ bool ImplImageTree::doLoadImage(
}
void ImplImageTree::shutDown() {
- m_style = OUString();
+ m_style.clear();
// for safety; empty m_style means "not initialized"
m_iconCache.clear();
m_linkHash.clear();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7e49bc2e4779..ad6d04d86603 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -730,7 +730,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// workaround: put the second terminal field as much up in the hierarchy as
// necessary to have a non-terminal field as parent (or none at all)
// since it->second already is terminal, we just need to use its parent
- aDomain = OString();
+ aDomain.clear();
aPartialName = aFullName.copy( aFullName.lastIndexOf( '.' )+1 );
if( nLastTokenIndex > 0 )
{
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 9904f375c573..f6dd207f679f 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1712,7 +1712,7 @@ bool Printer::EndJob()
mbPrinting = false;
mnCurPrintPage = 0;
- maJobName = OUString();
+ maJobName.clear();
mbDevOutput = false;
bRet = mpPrinter->EndJob();
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9431819075b7..bac546eda43d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -561,7 +561,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
}
if (res == xmlreader::XmlReader::RESULT_END)
- sID = OString();
+ sID.clear();
if (res == xmlreader::XmlReader::RESULT_DONE)
break;
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 4fb7526982d8..d6b680adf6dd 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -115,7 +115,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
aSalMIData.eType = MenuItemType::SEPARATOR;
aSalMIData.nBits = MenuItemBits::NONE;
aSalMIData.pMenu = NULL;
- aSalMIData.aText = OUString();
+ aSalMIData.aText.clear();
aSalMIData.aImage = Image();
// Native-support: returns NULL if not supported
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6934ed233703..ce5bc24cb900 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2184,7 +2184,7 @@ static void ImplHandleSurroundingTextRequest( vcl::Window *pWindow,
if ( !pChild )
{
- rText = OUString();
+ rText.clear();
rSelRange.setMin( 0 );
rSelRange.setMax( 0 );
}
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index d9a38386544d..08c138d477ae 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -589,7 +589,7 @@ OString SelectionManager::convertToCompound( const OUString& rText )
#endif
}
else
- aRet = OString();
+ aRet.clear();
return aRet;
}
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a9727e9f07ed..a6ed76d29db0 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -101,7 +101,7 @@ struct GetPPDAttribs
m_pSyncMutex->acquire();
OString aRetval = m_aResult;
- m_aResult = OString();
+ m_aResult.clear();
unref();
return aRetval;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index e8e2a7803fd2..c4d97a1d6142 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -144,8 +144,8 @@ namespace psp
if( nLen >=5 && aStr[2] == '_' )
aLoc.Country = OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 );
else
- aLoc.Country = OUString();
- aLoc.Variant = OUString();
+ aLoc.Country.clear();
+ aLoc.Variant.clear();
}
#endif
}
@@ -230,9 +230,9 @@ namespace psp
}
switch( nTry )
{
- case 0: aLoc.Variant = OUString();break;
- case 1: aLoc.Country = OUString();break;
- case 2: aLoc.Language = OUString();break;
+ case 0: aLoc.Variant.clear();break;
+ case 1: aLoc.Country.clear();break;
+ case 2: aLoc.Language.clear();break;
}
}
}
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index fecc6ada9054..8f80433276a7 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -486,7 +486,7 @@ void PrinterInfoManager::initialize()
aDefaultPrinter = m_aPrinters.begin()->first;
}
else
- aDefaultPrinter = OUString();
+ aDefaultPrinter.clear();
m_aDefaultPrinter = aDefaultPrinter;
if( m_eType != Default )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 6c98968f9a93..10310c0caf19 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3087,7 +3087,7 @@ bool X11SalFrame::endUnicodeSequence()
}
}
bool bWasInput = !rSeq.isEmpty();
- rSeq = OUString();
+ rSeq.clear();
if( bWasInput && ! aDeleteWatch.isDeleted() )
CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL);
return bWasInput;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 4eeafb1aeff7..967aa10d0d53 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -821,7 +821,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
if (filtername)
sFilterName = OUString(filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8);
else
- sFilterName = OUString();
+ sFilterName.clear();
}
else
sFilterName = m_aInitialFilter;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index dade3613a536..d42b0f540a4d 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5323,7 +5323,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
LRESULT nRet = 0;
SalSurroundingTextRequestEvent aEvt;
- aEvt.maText = OUString();
+ aEvt.maText.clear();
aEvt.mnStart = aEvt.mnEnd = 0;
UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR );
@@ -5375,7 +5375,7 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam )
WinSalFrame* pFrame = GetWindowPtr( hWnd );
LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
SalSurroundingTextRequestEvent aEvt;
- aEvt.maText = OUString();
+ aEvt.maText.clear();
aEvt.mnStart = aEvt.mnEnd = 0;
pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 1c7b19d00db6..e719805c9992 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -227,7 +227,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
//contains the bookmark identifier - has to be added to the bookmark name imported before
//if it is already available then the bookmark should be inserted
m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
- sLocalBookmarkName = OUString();
+ sLocalBookmarkName.clear();
break;
case NS_ooxml::LN_CT_MarkupRange_displacedByCustomXml:
break;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 51cfd9b6b815..3a9153c328dd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -846,7 +846,7 @@ void DomainMapperTableManager::endOfRowAction()
void DomainMapperTableManager::clearData()
{
m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = m_nLayoutType = 0;
- m_sTableStyleName = OUString();
+ m_sTableStyleName.clear();
m_pTableStyleTextProperies.reset();
}
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 7622d22f2400..727c57660974 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -95,7 +95,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
OSL_FAIL("exception while opening storage");
}
if( !bWord )
- sTypeName = OUString();
+ sTypeName.clear();
return sTypeName;
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2e98dd74b890..0b596592ecad 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5226,7 +5226,7 @@ int RTFDocumentImpl::popState()
if (aStr.getLength() > nLength)
aStr = aStr.copy(nLength+1); // zero-terminated string
else
- aStr = OString();
+ aStr.clear();
// extract default text
nLength = aStr.toChar();
if (!aStr.isEmpty())
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 825b1ee5d790..62b1b9cf9ebe 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -116,7 +116,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
int nCpy = 1 + idx;
if( nCpy >= query.getLength() )
- query = OUString();
+ query.clear();
else
query = query.copy( 1 + idx );
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 28e338f9552b..3c488a6bf467 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1060,12 +1060,12 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
OSL_ASSERT( msRowTrans.isEmpty() );
pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true ));
- msColTrans = OUString();
+ msColTrans.clear();
}
else if( !msRowTrans.isEmpty() )
{
pTableContext->setRowPermutation( lcl_getNumberSequenceFromString( msRowTrans, true ));
- msRowTrans = OUString();
+ msRowTrans.clear();
}
}
pContext = pTableContext;
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index cc3c27f684fa..8d1258bbeb71 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -230,7 +230,7 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPr
{
SvXMLImportContext *pContext = 0;
- rProp.Name = OUString();
+ rProp.Name.clear();
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
@@ -532,7 +532,7 @@ void XMLConfigItemContext::Characters( const OUString& rChars )
{
sChars = msValue;
sChars += sTrimmedChars;
- msValue = OUString();
+ msValue.clear();
}
else
{
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index 72b9893288e0..76b92f1bde22 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -58,7 +58,7 @@ void XMLBase64ImportContext::Characters( const OUString& rChars )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
- sBase64CharsLeft = OUString();
+ sBase64CharsLeft.clear();
}
else
{
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 000b3f04e8f2..d1aa755ce6f7 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -311,7 +311,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
if( -1L == nColonPos )
{
// case: no ':' found -> default namespace
- xEntry->sPrefix = OUString();
+ (xEntry->sPrefix).clear();
xEntry->sName = rAttrName;
}
else
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 6f00634c3d41..482857ffcfcc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -526,7 +526,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
OUString sCurrency;
sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard);
if(!bExportCurrencySymbol)
- sCurrency = OUString();
+ sCurrency.clear();
WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue, nNamespace);
}
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index a8c5aa4ab85b..8ac833da93e7 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -448,7 +448,7 @@ void XMLPropStyleContext::Finish( bool bOverwrite )
if( !sParent.isEmpty() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
if( !sParent.isEmpty() && !xFamilies->hasByName( sParent ) )
- sParent = OUString();
+ sParent.clear();
if( sParent != mxStyle->getParentStyle() )
{
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 72081d694a92..57f4c49d63eb 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -446,7 +446,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties()
|| ((300 == nUPD) && (nBuildId <= 9573))))
{
// #i93908# OOo < 3.4 wrote a bogus suffix for bullet chars
- sSuffix = OUString(); // clear it
+ sSuffix.clear(); // clear it
}
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 9231870a3f93..91717d8717ca 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1242,7 +1242,7 @@ void XMLTextFrameContext_Impl::Characters( const OUString& rChars )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
- sBase64CharsLeft = OUString();
+ sBase64CharsLeft.clear();
}
else
{
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index f8f47206ecb5..969be43bd4de 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -161,7 +161,7 @@ void XMLTextMarkImportContext::StartElement(
{
if (!FindName(GetImport(), xAttrList))
{
- m_sBookmarkName = OUString();
+ m_sBookmarkName.clear();
}
if (IsXMLToken(GetLocalName(), XML_FIELDMARK_END))
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 9dc4e7112070..7bfdbe318137 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -200,7 +200,7 @@ void XMLTextNumRuleInfo::Set(
}
}
- msListLabelString = OUString();
+ msListLabelString.clear();
if ( bExportTextNumberElement &&
xPropSetInfo->hasPropertyByName( msListLabelStringProp ) )
{
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 98638907015d..5fc9cc4b397b 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -57,7 +57,7 @@ void XMLTextExportPropertySetMapper::handleElementItem(
pThis->maDropCapExport.exportXML( rProperty.maValue, bDropWholeWord,
sDropCharStyle );
pThis->bDropWholeWord = false;
- pThis->sDropCharStyle = OUString();
+ (pThis->sDropCharStyle).clear();
break;
case CTF_TABSTOP:
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 05bbfb78a8c4..a5d715a16e2d 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1457,7 +1457,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
xPropSet->setPropertyValue( rPropName, makeAny(sStyleName) );
}
else
- sStyleName = OUString();
+ sStyleName.clear();
}
/* The outline level needs to be only applied as list level, if the heading
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 3a7c16db35d4..6eb17d4de451 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -984,7 +984,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
if (bMoveProtect || bSizeProtect || !aProtectAttrValue.isEmpty())
{
if( (bMoveProtect ||bSizeProtect) && IsXMLToken( aProtectAttrValue, XML_NONE ) )
- aProtectAttrValue = OUString();
+ aProtectAttrValue.clear();
const OUString& rPosition = GetXMLToken( XML_POSITION );
if( bMoveProtect && -1 == aProtectAttrValue.indexOf( rPosition ) )
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index d8d3bdb6b452..df6b4a97c4ba 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -573,7 +573,7 @@ void DocumentHandlerImpl::startElement(
}
else
{
- pPrefixes[ nPos ] = OUString();
+ pPrefixes[ nPos ].clear();
pLocalNames[ nPos ] = rQAttributeName;
// leave local names unmodified
}
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2d84e0fe1257..5407d3933ae7 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -163,7 +163,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
{
OSL_ASSERT(!sType.isEmpty());
retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
- sType = OUString();
+ sType.clear();
//The next char is the start of the new type
nTypeNameStart = i + 1;
bInType = true;
@@ -258,7 +258,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
{
OSL_ASSERT(!sType.isEmpty());
retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
- sType = OUString();
+ sType.clear();
//The next char is the start of the new type
nTypeNameStart = i + 1;
bInType = true;
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index de675e135c5d..ca8edf92c774 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -141,22 +141,22 @@ void SAL_CALL XSecParser::startElement(
}
else if (aName == TAG_X509ISSUERNAME)
{
- m_ouX509IssuerName = OUString();
+ m_ouX509IssuerName.clear();
m_bInX509IssuerName = true;
}
else if (aName == TAG_X509SERIALNUMBER)
{
- m_ouX509SerialNumber = OUString();
+ m_ouX509SerialNumber.clear();
m_bInX509SerialNumber = true;
}
else if (aName == TAG_X509CERTIFICATE)
{
- m_ouX509Certificate = OUString();
+ m_ouX509Certificate.clear();
m_bInX509Certificate = true;
}
else if (aName == TAG_SIGNATUREVALUE)
{
- m_ouSignatureValue = OUString();
+ m_ouSignatureValue.clear();
m_bInSignatureValue = true;
}
else if (aName == TAG_DIGESTVALUE)
@@ -173,7 +173,7 @@ void SAL_CALL XSecParser::startElement(
}
else if (aName == NSTAG_DC ":" TAG_DATE)
{
- m_ouDate = OUString();
+ m_ouDate.clear();
m_bInDate = true;
}