[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/source bridges/source chart2/source codemaker/source comphelper/qa comphelper/source configmgr/source connectivity/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source framework/inc framework/source i18nlangtag/source i18npool/source idlc/source idl/inc idl/source include/rtl jvmfwk/source l10ntools/source linguistic/source lotuswordpro/source mysqlc/source oox/source package/source registry/source reportdesign/source rsc/source sc/qa sc/source sdext/source sd/source sfx2/source starmath/source stoc/source svgio/source svl/source svtools/source svx/source sw/inc sw/source toolkit/source tools/source tubes/source ucb/source unodevtools/source unotools/source unoxml/source vcl/generic vcl/osx vcl/source vcl/unx vcl/win writerfilter/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Brij Mohan Lal Srivastava
contactbrijmohan at gmail.com
Fri Nov 14 00:24:14 PST 2014
accessibility/source/extended/accessibletabbarpage.cxx | 2
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 4
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 4
accessibility/source/standard/vclxaccessibletabpage.cxx | 2
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2
avmedia/source/framework/mediaitem.cxx | 2
avmedia/source/framework/modeltools.cxx | 4
avmedia/source/gstreamer/gstplayer.cxx | 2
avmedia/source/viewer/mediawindow.cxx | 2
avmedia/source/viewer/mediawindow_impl.cxx | 2
avmedia/source/win/framegrabber.cxx | 2
avmedia/source/win/player.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 2
basic/source/classes/errobject.cxx | 2
basic/source/classes/sbxmod.cxx | 2
basic/source/runtime/iosys.cxx | 6
bridges/source/cpp_uno/shared/vtablefactory.cxx | 2
chart2/source/controller/main/SelectionHelper.cxx | 2
chart2/source/tools/InternalDataProvider.cxx | 4
chart2/source/view/diagram/VDiagram.cxx | 2
codemaker/source/codemaker/global.cxx | 2
codemaker/source/javamaker/javatype.cxx | 2
comphelper/qa/string/test_string.cxx | 2
comphelper/source/misc/documentinfo.cxx | 2
configmgr/source/valueparser.cxx | 2
connectivity/source/commontools/CommonTools.cxx | 2
connectivity/source/commontools/TTableHelper.cxx | 2
connectivity/source/commontools/parameters.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 2
connectivity/source/drivers/postgresql/pq_statement.cxx | 4
connectivity/source/drivers/postgresql/pq_tools.cxx | 8 -
connectivity/source/sdbcx/VCatalog.cxx | 6
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfgutil.cxx | 10 -
cui/source/customize/selector.cxx | 2
cui/source/dialogs/insdlg.cxx | 2
cui/source/options/treeopt.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 8 -
dbaccess/source/core/dataaccess/datasource.cxx | 6
dbaccess/source/core/recovery/settingsimport.cxx | 2
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 2
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/inc/indexes.hxx | 2
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 3
dbaccess/source/ui/querydesign/QTableWindow.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 4
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 2
desktop/source/deployment/gui/dp_gui_service.cxx | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2
editeng/source/editeng/editattr.cxx | 2
editeng/source/editeng/textconv.cxx | 2
editeng/source/items/frmitems.cxx | 6
editeng/source/items/paraitem.cxx | 6
editeng/source/items/textitem.cxx | 10 -
editeng/source/misc/hangulhanja.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 12 -
embeddedobj/source/general/dummyobject.cxx | 2
embeddedobj/source/msole/oleembed.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 10 -
embeddedobj/source/msole/ownview.cxx | 4
extensions/source/bibliography/datman.hxx | 2
extensions/source/bibliography/general.cxx | 2
extensions/source/logging/loghandler.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/update/check/download.cxx | 6
extensions/source/update/check/updatecheck.cxx | 2
filter/source/config/cache/cacheupdatelistener.cxx | 6
filter/source/config/cache/typedetection.cxx | 14 +-
filter/source/msfilter/svdfppt.cxx | 8 -
filter/source/pdf/pdfexport.cxx | 4
filter/source/xsltdialog/typedetectionimport.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 4
forms/source/component/Button.cxx | 4
forms/source/component/ComboBox.cxx | 6
forms/source/component/File.cxx | 2
forms/source/component/Hidden.cxx | 2
forms/source/component/ImageButton.cxx | 4
forms/source/component/ImageControl.cxx | 2
forms/source/component/imgprod.cxx | 4
forms/source/xforms/datatypes.cxx | 2
forms/source/xforms/mip.cxx | 6
fpicker/source/office/iodlg.cxx | 2
fpicker/source/win32/filepicker/filepickerstate.cxx | 2
framework/inc/classes/filtercachedata.hxx | 24 +--
framework/inc/queries.h | 2
framework/source/accelerators/presethandler.cxx | 2
framework/source/fwe/xml/xmlnamespaces.cxx | 2
framework/source/helper/persistentwindowstate.cxx | 4
framework/source/helper/statusindicatorfactory.cxx | 2
framework/source/helper/vclstatusindicator.cxx | 2
framework/source/jobs/helponstartup.cxx | 6
framework/source/jobs/joburl.cxx | 12 -
framework/source/layoutmanager/helpers.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/services/frame.cxx | 2
framework/source/services/pathsettings.cxx | 2
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
i18nlangtag/source/isolang/isolang.cxx | 4
i18nlangtag/source/isolang/mslangid.cxx | 2
i18nlangtag/source/languagetag/languagetag.cxx | 37 +++--
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 2
i18npool/source/indexentry/indexentrysupplier_default.cxx | 6
idl/inc/database.hxx | 2
idl/source/cmptools/lex.cxx | 2
idlc/source/astdeclaration.cxx | 2
idlc/source/idlc.cxx | 8 -
include/rtl/string.hxx | 10 +
include/rtl/ustring.hxx | 9 +
jvmfwk/source/fwkbase.cxx | 4
l10ntools/source/cfgmerge.cxx | 4
linguistic/source/dicimp.cxx | 2
linguistic/source/gciterator.cxx | 2
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2
mysqlc/source/mysqlc_connection.cxx | 2
oox/source/drawingml/chart/plotareaconverter.cxx | 2
oox/source/drawingml/hyperlinkcontext.cxx | 2
oox/source/drawingml/textfont.cxx | 2
oox/source/dump/dumperbase.cxx | 4
oox/source/dump/oledumper.cxx | 4
oox/source/ole/axcontrol.cxx | 2
oox/source/ppt/commonbehaviorcontext.cxx | 2
oox/source/vml/vmlshapecontext.cxx | 2
package/source/xstor/owriteablestream.cxx | 12 -
registry/source/keyimpl.cxx | 4
reportdesign/source/ui/misc/UITools.cxx | 6
rsc/source/rsc/rsc.cxx | 2
rsc/source/tools/rschash.cxx | 2
sc/qa/unit/ucalc_formula.cxx | 2
sc/source/core/data/attrib.cxx | 8 -
sc/source/core/data/conditio.cxx | 6
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/documen5.cxx | 2
sc/source/core/data/document.cxx | 8 -
sc/source/core/data/dpshttab.cxx | 2
sc/source/core/data/funcdesc.cxx | 2
sc/source/core/data/sortparam.cxx | 2
sc/source/core/data/table1.cxx | 2
sc/source/core/data/table2.cxx | 6
sc/source/core/data/table6.cxx | 4
sc/source/core/tool/callform.cxx | 4
sc/source/core/tool/chgtrack.cxx | 8 -
sc/source/core/tool/editutil.cxx | 4
sc/source/core/tool/rangeutl.cxx | 2
sc/source/filter/dif/difimp.cxx | 4
sc/source/filter/excel/xiescher.cxx | 10 -
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/excel/xlchart.cxx | 2
sc/source/filter/excel/xlpivot.cxx | 14 +-
sc/source/filter/html/htmlpars.cxx | 4
sc/source/filter/oox/numberformatsbuffer.cxx | 2
sc/source/filter/oox/richstring.cxx | 2
sc/source/filter/oox/sheetdatacontext.cxx | 4
sc/source/filter/xml/XMLExportDataPilot.cxx | 2
sc/source/filter/xml/XMLStylesExportHelper.cxx | 2
sc/source/filter/xml/celltextparacontext.cxx | 4
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 8 -
sc/source/ui/app/inputhdl.cxx | 12 -
sc/source/ui/app/scmod.cxx | 10 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 6
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/docshell/tablink.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 8 -
sc/source/ui/view/gridwin2.cxx | 2
sc/source/ui/view/output2.cxx | 2
sc/source/ui/view/tabcont.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 3
sd/source/filter/ppt/pptin.cxx | 4
sd/source/filter/ppt/propread.cxx | 6
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/docshell/docshel2.cxx | 2
sd/source/ui/framework/module/ResourceManager.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 2
sdext/source/presenter/PresenterPaneContainer.cxx | 4
sdext/source/presenter/PresenterProtocolHandler.cxx | 2
sdext/source/presenter/PresenterSlideShowView.cxx | 8 -
sdext/source/presenter/PresenterSlideSorter.cxx | 4
sfx2/source/appl/imagemgr.cxx | 2
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/appl/shutdowniconw32.cxx | 2
sfx2/source/config/evntconf.cxx | 2
sfx2/source/control/templatelocalview.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 2
sfx2/source/doc/DocumentMetadataAccess.cxx | 2
sfx2/source/doc/docfilt.cxx | 2
sfx2/source/doc/frmdescr.cxx | 2
sfx2/source/doc/objmisc.cxx | 4
sfx2/source/doc/objstor.cxx | 2
sfx2/source/sidebar/CommandInfoProvider.cxx | 2
sfx2/source/sidebar/ResourceManager.cxx | 8 -
sfx2/source/view/frmload.cxx | 2
starmath/source/dialog.cxx | 4
starmath/source/document.cxx | 2
starmath/source/mathtype.cxx | 62 +++++-----
starmath/source/parse.cxx | 2
stoc/source/uriproc/UriReference.cxx | 2
svgio/source/svgreader/svgtools.cxx | 5
svl/source/inc/passwordcontainer.hxx | 4
svl/source/items/ctypeitm.cxx | 2
svl/source/items/flagitem.cxx | 2
svl/source/items/macitem.cxx | 2
svl/source/items/poolio.cxx | 2
svl/source/numbers/zforlist.cxx | 2
svl/source/passwordcontainer/syscreds.cxx | 2
svl/source/svdde/ddesvr.cxx | 2
svtools/source/contnr/svtabbx.cxx | 6
svtools/source/control/headbar.cxx | 4
svtools/source/control/tabbar.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 2
svtools/source/graphic/descriptor.cxx | 2
svtools/source/misc/embedhlp.cxx | 2
svx/source/fmcomp/dbaexchange.cxx | 2
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/inc/fmcontrolbordermanager.hxx | 2
svx/source/inc/fmshimp.hxx | 2
svx/source/inc/fmvwimp.hxx | 2
svx/source/items/drawitem.cxx | 12 -
svx/source/items/grfitem.cxx | 2
svx/source/items/numinf.cxx | 2
svx/source/items/pageitem.cxx | 4
svx/source/svdraw/svdmark.cxx | 2
svx/source/svdraw/svdtrans.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 2
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/xattr.cxx | 4
svx/source/xoutdev/xattr2.cxx | 32 ++---
sw/inc/shellio.hxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 2
sw/source/core/doc/DocumentListsManager.cxx | 2
sw/source/core/doc/docfld.cxx | 4
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/chpfld.cxx | 8 -
sw/source/core/fields/docufld.cxx | 2
sw/source/core/fields/flddropdown.cxx | 6
sw/source/core/fields/reffld.cxx | 2
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/layout/dbg_lay.cxx | 2
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/porexp.cxx | 4
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/undo/docundo.cxx | 2
sw/source/core/unocore/unoparagraph.cxx | 2
sw/source/core/unocore/unosect.cxx | 8 -
sw/source/core/unocore/unosett.cxx | 8 -
sw/source/core/unocore/unostyle.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlatr.cxx | 4
sw/source/filter/html/htmlsect.cxx | 3
sw/source/filter/ww8/ww8graf.cxx | 4
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/filter/xml/xmlitemi.cxx | 2
sw/source/ui/dbui/mmgreetingspage.cxx | 2
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 2
sw/source/ui/index/swuiidxmrk.cxx | 2
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/vba/vbalisthelper.cxx | 32 ++---
sw/source/uibase/dbui/mailmergechildwindow.cxx | 2
sw/source/uibase/dbui/mmconfigitem.cxx | 4
sw/source/uibase/dochdl/gloshdl.cxx | 2
sw/source/uibase/lingu/hhcwrp.cxx | 2
sw/source/uibase/shells/frmsh.cxx | 4
sw/source/uibase/sidebar/PageMarginControl.cxx | 2
sw/source/uibase/uiview/viewsrch.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 4
sw/source/uibase/utlui/attrdesc.cxx | 32 ++---
sw/source/uibase/utlui/content.cxx | 6
sw/source/uibase/utlui/gloslst.cxx | 3
sw/source/uibase/utlui/zoomctrl.cxx | 2
sw/source/uibase/wrtsh/wrtsh2.cxx | 2
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/grid/gridcolumn.cxx | 3
tools/source/inet/inetmime.cxx | 2
tools/source/misc/getprocessworkingdir.cxx | 2
tools/source/stream/stream.cxx | 6
tubes/source/manager.cxx | 2
ucb/source/ucp/ftp/ftpdirp.hxx | 3
ucb/source/ucp/hierarchy/hierarchyuri.hxx | 2
ucb/source/ucp/package/pkguri.cxx | 7 -
ucb/source/ucp/package/pkguri.hxx | 2
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
ucb/source/ucp/tdoc/tdoc_uri.hxx | 8 -
ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx | 6
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 6
ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 4
ucb/source/ucp/webdav/webdavcontent.cxx | 6
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 2
unotools/source/config/defaultoptions.cxx | 2
unotools/source/config/viewoptions.cxx | 2
unotools/source/ucbhelper/localfilehelper.cxx | 2
unoxml/source/dom/documentbuilder.cxx | 2
unoxml/source/dom/saxbuilder.cxx | 8 -
vcl/generic/fontmanager/fontconfig.cxx | 2
vcl/generic/fontmanager/helper.cxx | 2
vcl/generic/print/genprnpsp.cxx | 7 -
vcl/generic/print/printerjob.cxx | 2
vcl/generic/print/text_gfx.cxx | 2
vcl/osx/DataFlavorMapping.cxx | 2
vcl/osx/salframeview.mm | 4
vcl/source/control/field.cxx | 2
vcl/source/control/fixed.cxx | 2
vcl/source/gdi/impgraph.cxx | 2
vcl/source/gdi/impimagetree.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/print.cxx | 2
vcl/source/window/builder.cxx | 2
vcl/source/window/menuitemlist.cxx | 2
vcl/source/window/winproc.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 10 -
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/win/source/window/salframe.cxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 2
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2
writerfilter/source/filter/WriterFilterDetection.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 4
xmloff/source/core/DocumentSettingsContext.cxx | 4
xmloff/source/core/XMLBase64ImportContext.cxx | 2
xmloff/source/core/nmspmap.cxx | 2
xmloff/source/style/numehelp.cxx | 2
xmloff/source/style/prstylei.cxx | 2
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/text/XMLTextFrameContext.cxx | 2
xmloff/source/text/XMLTextMarkImportContext.cxx | 2
xmloff/source/text/XMLTextNumRuleInfo.cxx | 2
xmloff/source/text/txtexppr.cxx | 2
xmloff/source/text/txtimp.cxx | 2
xmloff/source/transform/StyleOOoTContext.cxx | 2
xmlscript/source/xml_helper/xml_impctx.cxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 4
xmlsecurity/source/helper/xsecparser.cxx | 10 -
357 files changed, 714 insertions(+), 667 deletions(-)
New commits:
commit d32be3ace8c8fd430bbecdf69f88a116b0ee91d1
Author: Brij Mohan Lal Srivastava <contactbrijmohan at gmail.com>
Date: Wed Nov 12 14:24:10 2014 +0530
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 at redhat.com>
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 9723d57..c3d6533 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 60c7b6b..73674c7 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 76044a2..96f8a24 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 6ed6ec6..089176f 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 5797ccc..61a091a 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 ba92960..111f957 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 7861446..3b33529 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 003c84c..524e37a 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 836e89e..cc44a4a 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 a52199a..22326a6 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 66a6251..6fb869c 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 aef5be2..1418276 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 9fc7664..baf72ad 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 c4f54e3..0f8c9d9 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 64f88a2..163336b 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 aff8576..91b98d7 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 4465743..4627218 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 2af1b62..f646c89 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 a7869d7..8389fe4e 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 1452af7..27de75e 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 7cd2789..9f5db99 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 6b15abb..ee12bc5 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 572ad4f..4dc7f5c 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 5e9f23f..6100a77 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 7456e64..4ddf1f2 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 183b510..487d914 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 d67a794..5aa7dc9 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 1312e7e..5f2b28f 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 72757fb..4bc8b46 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 4fbd217..5d0cc9d 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 0ce8ae4..d28fa19 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 937773d..4e44f5e 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 dcaa620..5a7bbe6 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 629d362..5c20b9a 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 17428fd..3f8e85f 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 fe4e13a..ef3880f 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 d324dfe..94f7d79 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 9f63afd..6cb2357 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 5541697..4bb467a 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 cf22d8d..10fa996 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 3e0644c..fd7810c 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 7b91232..ef3c0e0 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 25923c4..b6c5708 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 eda7eec..4c6ec3e 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 4b9d676..90f0b1f 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 a65a3a4..0403fba 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 d10b40c..a6ca7ae 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 57a0f2d..91f5d40 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 178a450..518ffea 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 85a3e45..6c3ab2d 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 3d78dee..1b66601da 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 98a72c8..546b4c9 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 3bdb494..70e5a6e 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 84bf5b7..d64fe67 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 871183f..f4aab63 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 ac55335..85676ab 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 dbf19b9..b7ac644 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 30253e4..de18d85 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 0b2e078..aeca389 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 c471b45..b4f5303 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 a4c12e1..0d2e6d7 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 e67cc77..e3f615d 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 236f12e..3f6c416 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 8151182..7bce91d 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 0422451..7b9fe78 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 b0ffa3e..277b0c4 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 fa52d0b..ea5738f 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 26a2512..a08caf9 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 c0b6958..7b8af0f 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 4495b84..41167b0 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 ac0c4b7..8c0d6d6 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 5c1399e..0ec3546 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 9bd5fb8..9e222f5 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 4919fba..a7d3068 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 4cc9956..d0b2103 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 635d64e..ffa9e42 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 781641e..386ab1b 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 2153d11..fc0da39 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 4c6adca..2bb0ea6 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 8e3bfff..76bc4cf 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 5274b1c..34e437e 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 deb58ce..5b84370 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 1802437..936c691 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 22d2c5a..f94b32e 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 b692155..948e8c8 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 84d9eb9..69d58fa 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 838d403..f37b991 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 c862a78..81ce17e 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 5403b81..8251ed9 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 c490d11..3122293 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 b43d65c..6311bc6 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 6396ecf..feed988 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 da01d4f..f52536e 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 1599447..ea25343 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 5067a66..c0ed698 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 856ad02..e02c4e7 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 6f53eb6..198af2d 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 fae5556..2dacc37 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 ca623ff..dd6b12e 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 ad8187d..e8d466b 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 b7c5cfa..1138184 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 e248e77..55cfc7a 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 3546c9a..4ef0f20 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 c11c2e5..848e60d 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 76f4bcd..64b179e 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 f1bfb18..6b0dedf 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 7f6c42f..38951c1 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 3db9aad..b3f76ce 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 48b25fd..08c127e 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 685a756..56da33b 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 95a271c..4fabd5f 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 f770e9d..4bf2358 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 97d21f1..f5adfea 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 75a71df..f6a4495 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 9a16386..21cca10 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 9815f9f..b9a868b 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 84dcbb5..95d7f3f 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 cfd471b..d68327d 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 6cd87c2..c8d767b 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 36a8068..41018e3 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 a1ce6d2..8a1aca4 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 081b354..00de2bd 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 f79bab8..f15086d 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 a3e7254..aae50e8 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() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list