[Libreoffice-commits] core.git: 37 commits - basctl/source basegfx/source basic/source chart2/source codemaker/source connectivity/source cui/source dbaccess/source drawinglayer/source editeng/source extensions/source filter/source forms/source framework/source i18npool/source lotuswordpro/source oox/source reportdesign/source rsc/source sax/source sc/qa sc/source sdext/source sd/source sfx2/source sot/source starmath/qa starmath/source svgio/source svl/qa svl/source svtools/source svx/source sw/qa sw/source test/source toolkit/source tools/source vcl/generic vcl/qa vcl/source vcl/unx vcl/workben writerfilter/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Tue Oct 20 02:48:17 PDT 2015
basctl/source/basicide/baside2b.cxx | 6 -
basegfx/source/tools/stringconversiontools.cxx | 3
basic/source/classes/sbxmod.cxx | 2
basic/source/runtime/runtime.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 4 -
chart2/source/inc/CommonFunctors.hxx | 2
chart2/source/tools/CharacterProperties.cxx | 6 -
chart2/source/view/charttypes/CandleStickChart.cxx | 4 -
codemaker/source/cppumaker/cpputype.cxx | 4 -
connectivity/source/drivers/dbase/DResultSet.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/mysql/Yservices.cxx | 2
connectivity/source/parse/sqliterator.cxx | 2
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 4 -
cui/source/customize/cfgutil.cxx | 14 +--
cui/source/customize/macropg.cxx | 4 -
cui/source/customize/selector.cxx | 8 +-
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/cuigrfflt.cxx | 2
cui/source/dialogs/linkdlg.cxx | 4 -
cui/source/options/connpoolconfig.cxx | 2
cui/source/options/dbregister.cxx | 4 -
cui/source/options/optpath.cxx | 2
cui/source/tabpages/autocdlg.cxx | 4 -
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/macroass.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 4 -
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/listviewitems.cxx | 4 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 -
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 2
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 5 -
drawinglayer/source/processor2d/vclprocessor2d.cxx | 3
editeng/source/editeng/editeng.cxx | 4 -
editeng/source/editeng/impedit2.cxx | 6 -
editeng/source/editeng/impedit3.cxx | 22 +++---
editeng/source/editeng/impedit4.cxx | 4 -
editeng/source/editeng/impedit5.cxx | 2
editeng/source/items/textitem.cxx | 2
extensions/source/abpilot/fieldmappingimpl.cxx | 6 -
extensions/source/bibliography/framectr.cxx | 2
extensions/source/bibliography/toolbar.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 2
filter/source/msfilter/escherex.cxx | 9 +-
filter/source/msfilter/eschesdo.cxx | 10 +-
filter/source/msfilter/msdffimp.cxx | 12 +--
filter/source/msfilter/msoleexp.cxx | 6 -
filter/source/msfilter/svdfppt.cxx | 16 ++--
filter/source/pdf/pdfexport.cxx | 4 -
filter/source/svg/svgexport.cxx | 6 -
filter/source/svg/svgwriter.cxx | 4 -
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
forms/source/richtext/richtextcontrol.cxx | 4 -
forms/source/xforms/convert.cxx | 2
framework/source/loadenv/loadenv.cxx | 3
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 2
oox/source/drawingml/shape.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 4 -
rsc/source/parser/rscicpx.cxx | 4 -
sax/source/tools/converter.cxx | 4 -
sc/qa/unit/ucalc.cxx | 6 -
sc/qa/unit/ucalc_formula.cxx | 6 -
sc/source/core/data/column.cxx | 8 +-
sc/source/core/data/column2.cxx | 6 -
sc/source/core/data/documen2.cxx | 4 -
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/dpcache.cxx | 2
sc/source/core/data/table1.cxx | 4 -
sc/source/core/data/table6.cxx | 4 -
sc/source/core/tool/address.cxx | 6 -
sc/source/core/tool/cellform.cxx | 2
sc/source/core/tool/chartarr.cxx | 4 -
sc/source/core/tool/chgtrack.cxx | 6 -
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/interpr2.cxx | 2
sc/source/core/tool/progress.cxx | 2
sc/source/core/tool/rangeutl.cxx | 2
sc/source/filter/excel/excform.cxx | 2
sc/source/filter/excel/impop.cxx | 4 -
sc/source/filter/excel/xepivotxml.cxx | 3
sc/source/filter/excel/xiescher.cxx | 4 -
sc/source/filter/excel/xilink.cxx | 2
sc/source/filter/rtf/rtfexp.cxx | 2
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 3
sc/source/filter/xml/xmlbodyi.cxx | 2
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 4 -
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4 -
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/app/seltrans.cxx | 4 -
sc/source/ui/app/transobj.cxx | 4 -
sc/source/ui/cctrl/checklistmenu.cxx | 6 -
sc/source/ui/docshell/docfunc.cxx | 4 -
sc/source/ui/docshell/docsh.cxx | 6 -
sc/source/ui/docshell/impex.cxx | 2
sc/source/ui/drawfunc/futext.cxx | 2
sc/source/ui/miscdlgs/sharedocdlg.cxx | 8 +-
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/namedlg/namemgrtable.cxx | 6 -
sc/source/ui/optdlg/calcoptionsdlg.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 8 +-
sc/source/ui/unoobj/chart2uno.cxx | 4 -
sc/source/ui/unoobj/docuno.cxx | 4 -
sc/source/ui/vba/vbafont.cxx | 18 ++---
sc/source/ui/vba/vbaformat.cxx | 4 -
sc/source/ui/vba/vbarange.cxx | 4 -
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/cellsh2.cxx | 4 -
sc/source/ui/view/drawvie4.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/printfun.cxx | 4 -
sc/source/ui/view/viewfun2.cxx | 2
sc/source/ui/view/viewfun3.cxx | 9 +-
sc/source/ui/view/viewfun5.cxx | 2
sd/source/core/drawdoc.cxx | 4 -
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/eppt/epptso.cxx | 19 ++---
sd/source/filter/ppt/pptin.cxx | 20 ++---
sd/source/filter/ppt/pptinanimations.cxx | 2
sd/source/ui/app/sdmod1.cxx | 4 -
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/dlg/vectdlg.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 4 -
sd/source/ui/func/fuinsfil.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/view/ViewShellManager.cxx | 2
sd/source/ui/view/drviews5.cxx | 4 -
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/sdview4.cxx | 2
sdext/source/pdfimport/services.cxx | 3
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/control/shell.cxx | 4 -
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/guisaveas.cxx | 5 -
sfx2/source/doc/objcont.cxx | 2
sfx2/source/doc/objserv.cxx | 6 -
sfx2/source/doc/objstor.cxx | 11 +--
sfx2/source/doc/sfxbasemodel.cxx | 4 -
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 2
sot/source/sdstor/stg.cxx | 2
starmath/qa/cppunit/test_starmath.cxx | 2
starmath/source/accessibility.cxx | 2
starmath/source/document.cxx | 8 +-
starmath/source/edit.cxx | 6 -
starmath/source/view.cxx | 2
svgio/source/svgreader/svgcharacternode.cxx | 10 +-
svgio/source/svgreader/svgcirclenode.cxx | 2
svgio/source/svgreader/svgstyleattributes.cxx | 14 +--
svgio/source/svgreader/svgtextnode.cxx | 2
svgio/source/svgreader/svgtextpathnode.cxx | 6 -
svgio/source/svgreader/svgtools.cxx | 2
svgio/source/svgreader/svgusenode.cxx | 2
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 3
svl/source/numbers/zforfind.cxx | 2
svtools/source/contnr/imivctl1.cxx | 6 -
svtools/source/contnr/imivctl2.cxx | 2
svtools/source/contnr/svimpbox.cxx | 4 -
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/control/asynclink.cxx | 2
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/filter/exportdialog.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 4 -
svtools/source/uno/popupwindowcontroller.cxx | 4 -
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/dialog/dlgctrl.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/delayedevent.cxx | 2
svx/source/form/fmobjfac.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmvwimp.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/gallery2/galobj.cxx | 2
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 4 -
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 4 -
svx/source/svdraw/svdmodel.cxx | 6 -
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdoole2.cxx | 4 -
svx/source/svdraw/svdotxln.cxx | 3
svx/source/svdraw/svdview.cxx | 4 -
svx/source/table/tablecontroller.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/unoshap2.cxx | 4 -
svx/source/unodraw/unoshtxt.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 2
sw/qa/core/macros-test.cxx | 2
sw/qa/core/uwriter.cxx | 4 -
sw/qa/extras/uiwriter/uiwriter.cxx | 6 -
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 2
sw/source/core/doc/docfmt.cxx | 4 -
sw/source/core/doc/docglbl.cxx | 2
sw/source/core/doc/docredln.cxx | 6 -
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/section.cxx | 4 -
sw/source/core/edit/edtox.cxx | 2
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/postithelper.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 4 -
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/frmedt/feshview.cxx | 14 +--
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 4 -
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/calcmove.cxx | 2
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/layout/ssfrm.cxx | 2
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 10 +-
sw/source/core/swg/SwXMLTextBlocks.cxx | 4 -
sw/source/core/text/frmform.cxx | 6 -
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/porrst.cxx | 4 -
sw/source/core/text/txtfrm.cxx | 14 +--
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 2
sw/source/core/tox/ToxTextGenerator.cxx | 2
sw/source/core/txtnode/atrftn.cxx | 2
sw/source/core/txtnode/thints.cxx | 2
sw/source/core/undo/undobj.cxx | 4 -
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/unins.cxx | 4 -
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoidx.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 2
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 16 +---
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 3
sw/source/filter/ww8/wrtww8gr.cxx | 12 +--
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 2
sw/source/filter/ww8/ww8graf2.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 5 -
sw/source/filter/ww8/ww8par2.cxx | 4 -
sw/source/filter/ww8/ww8par4.cxx | 5 -
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 4 -
sw/source/ui/dbui/mmoutputpage.cxx | 4 -
sw/source/ui/dialog/uiregionsw.cxx | 10 +-
sw/source/ui/frmdlg/frmpage.cxx | 4 -
sw/source/ui/index/cnttab.cxx | 3
sw/source/ui/misc/glosbib.cxx | 2
sw/source/uibase/app/appenv.cxx | 4 -
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/app/applab.cxx | 2
sw/source/uibase/app/docsh.cxx | 4 -
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/app/docstyle.cxx | 10 +-
sw/source/uibase/config/modcfg.cxx | 12 +--
sw/source/uibase/config/uinums.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 8 +-
sw/source/uibase/dochdl/swdtflvr.cxx | 6 -
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/PostItMgr.cxx | 6 -
sw/source/uibase/lingu/olmenu.cxx | 4 -
sw/source/uibase/misc/glshell.cxx | 4 -
sw/source/uibase/ribbar/drawbase.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/shells/textsh.cxx | 2
sw/source/uibase/shells/txtattr.cxx | 4 -
sw/source/uibase/shells/txtnum.cxx | 2
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 4 -
sw/source/uibase/uiview/viewprt.cxx | 2
sw/source/uibase/uiview/viewtab.cxx | 8 +-
sw/source/uibase/uno/unomailmerge.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 5 -
sw/source/uibase/uno/unotxvw.cxx | 4 -
sw/source/uibase/utlui/content.cxx | 2
test/source/sheet/xspreadsheets2.cxx | 2
toolkit/source/controls/unocontrolcontainer.cxx | 2
tools/source/fsys/urlobj.cxx | 2
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/generic/print/genprnpsp.cxx | 2
vcl/generic/print/glyphset.cxx | 2
vcl/generic/print/text_gfx.cxx | 2
vcl/qa/cppunit/complextext.cxx | 2
vcl/source/control/button.cxx | 4 -
vcl/source/edit/texteng.cxx | 8 +-
vcl/source/gdi/bitmap3.cxx | 6 -
vcl/source/gdi/gdimtf.cxx | 4 -
vcl/source/gdi/pdfwriter.cxx | 2
vcl/source/helper/evntpost.cxx | 2
vcl/source/outdev/text.cxx | 6 -
vcl/source/window/brdwin.cxx | 8 --
vcl/source/window/introwin.cxx | 2
vcl/source/window/menubarwindow.cxx | 2
vcl/source/window/toolbox.cxx | 2
vcl/source/window/window.cxx | 2
vcl/source/window/winproc.cxx | 2
vcl/source/window/wrkwin.cxx | 4 -
vcl/unx/kde4/VCLKDEApplication.cxx | 2
vcl/workben/svptest.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 36 +++++-----
xmloff/source/core/nmspmap.cxx | 2
xmloff/source/core/xmlexp.cxx | 3
xmloff/source/core/xmluconv.cxx | 6 -
xmloff/source/draw/ximpcustomshape.cxx | 2
xmloff/source/text/txtparae.cxx | 10 +-
xmloff/source/text/txtstyle.cxx | 4 -
335 files changed, 624 insertions(+), 664 deletions(-)
New commits:
commit 0500f7bcc868a6c9c5373e48f9e0b17328929433
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:26 2015 +0200
loplugin:defaultparams
Change-Id: I0f5d4deb3d6f8445251867638a4ec812762ced56
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index c05fd93..77fe129 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -430,7 +430,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName(
OUString *pLocalName,
sal_uInt16 /*nIdxGuess*/) const
{
- return _GetKeyByAttrName( rAttrName, 0, pLocalName, 0 );
+ return _GetKeyByAttrName( rAttrName, 0, pLocalName );
}
sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 505e52c..705fd4f 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2231,8 +2231,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
//conversion for matching schemes only
if( xUriRef->getScheme() == mpImpl->msPackageURIScheme )
{
- sValue = INetURLObject::GetRelURL( msOrigFileName, sValue,
- INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
+ sValue = INetURLObject::GetRelURL( msOrigFileName, sValue );
}
}
return sValue;
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index bbca3fe..27562d6 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -527,19 +527,19 @@ bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const
rtl_math_ConversionStatus eStatus;
rVector.setX(::rtl::math::stringToDouble(aContentX, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok )
return false;
rVector.setY(::rtl::math::stringToDouble(aContentY, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok )
return false;
rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
return ( eStatus == rtl_math_ConversionStatus_Ok );
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index e751697..5bb006c 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -144,7 +144,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r
{
rtl_math_ConversionStatus eStatus;
double fAttrDouble = ::rtl::math::stringToDouble( rValue,
- '.', ',', &eStatus, NULL );
+ '.', ',', &eStatus );
if ( eStatus == rtl_math_ConversionStatus_Ok )
{
beans::PropertyValue aProp;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index dcad869..fdca9f6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1528,7 +1528,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xTextFramesEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent, 0);
+ exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent);
}
// Export graphic objects:
@@ -1538,7 +1538,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xGraphicsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextGraphic(xTxtCntnt, true, 0);
+ exportTextGraphic(xTxtCntnt, true);
}
// Export embedded objects:
@@ -1548,7 +1548,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xEmbeddedsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextEmbedded(xTxtCntnt, true, 0);
+ exportTextEmbedded(xTxtCntnt, true);
}
// Export shapes:
@@ -1561,7 +1561,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XServiceInfo> xServiceInfo(xTxtCntnt, UNO_QUERY);
if( xServiceInfo->supportsService(sShapeService))
- exportShape(xTxtCntnt, true, 0);
+ exportShape(xTxtCntnt, true);
}
}
@@ -2147,7 +2147,7 @@ void XMLTextParagraphExport::exportParagraph(
if( bHasContentEnum )
exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
- bIsProgress, true, 0 );
+ bIsProgress );
if ( bHasPortions )
exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress );
}
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index 4ccef23..877efef 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -141,13 +141,13 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg )
}
}
exportStyleFamily( "ParagraphStyles", GetXMLToken(XML_PARAGRAPH), GetParaPropMapper(),
- bUsed, XML_STYLE_FAMILY_TEXT_PARAGRAPH, 0);
+ bUsed, XML_STYLE_FAMILY_TEXT_PARAGRAPH);
exportStyleFamily( "CharacterStyles", GetXMLToken(XML_TEXT), GetTextPropMapper(),
bUsed, XML_STYLE_FAMILY_TEXT_TEXT );
// get shape export to make sure the frame family is added correctly.
GetExport().GetShapeExport();
exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetFramePropMapper(),
- bUsed, XML_STYLE_FAMILY_TEXT_FRAME, 0);
+ bUsed, XML_STYLE_FAMILY_TEXT_FRAME);
exportNumStyles( bUsed );
if( !IsBlockMode() )
{
commit 5fd044fc61271e744b9a443002d95db9e99ca903
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:22 2015 +0200
loplugin:defaultparams
Change-Id: Ic6ff01ec54fde1c6ac9f8b52d2cbca3ee4085b51
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a343a2a..d8191cf 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4285,47 +4285,47 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
break;
case RTF_PAPERH: // fall through: set the default + current value
lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue);
case RTF_PGHSXN:
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue);
break;
case RTF_PAPERW: // fall through: set the default + current value
lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue);
case RTF_PGWSXN:
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue);
break;
case RTF_MARGL: // fall through: set the default + current value
lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue);
case RTF_MARGLSXN:
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue);
break;
case RTF_MARGR: // fall through: set the default + current value
lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue);
case RTF_MARGRSXN:
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
- NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue, RTFOverwrite::YES);
+ NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue);
break;
case RTF_MARGT: // fall through: set the default + current value
- lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue);
case RTF_MARGTSXN:
- lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue);
break;
case RTF_MARGB: // fall through: set the default + current value
- lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue);
case RTF_MARGBSXN:
- lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue);
break;
case RTF_HEADERY:
- lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_header, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_header, pIntValue);
break;
case RTF_FOOTERY:
- lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_footer, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_footer, pIntValue);
break;
case RTF_DEFTAB:
m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_defaultTabStop, pIntValue);
@@ -4487,10 +4487,10 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
m_aStates.top().aPicture.eWMetafile = nParam;
break;
case RTF_SB:
- lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_before, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_before, pIntValue);
break;
case RTF_SA:
- lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_after, pIntValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_after, pIntValue);
break;
case RTF_DPX:
m_aStates.top().aDrawingObject.nLeft = convertTwipToMm100(nParam);
@@ -4895,10 +4895,10 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n
}
break;
case RTF_SBAUTO:
- lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_beforeAutospacing, pBoolValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_beforeAutospacing, pBoolValue);
break;
case RTF_SAAUTO:
- lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_afterAutospacing, pBoolValue, RTFOverwrite::YES);
+ lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing, NS_ooxml::LN_CT_Spacing_afterAutospacing, pBoolValue);
break;
case RTF_FACINGP:
m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_evenAndOddHeaders, pBoolValue);
commit 666f732412e739fda6d0578752156dbb11931a2f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:18 2015 +0200
loplugin:defaultparams
Change-Id: I3e5ee77b51eb8e1207d3f95e6a1d9d8272532ba6
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index c44a7cd..11d53c7 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -275,7 +275,7 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
if (mbCheckedGraphite)
return mpGraphiteFace;
// test for graphite here so that it is cached most efficiently
- if (GetTable("Silf", 0))
+ if (GetTable("Silf"))
{
static const char* pGraphiteCacheStr = getenv( "SAL_GRAPHITE_CACHE_SIZE" );
int graphiteSegCacheSize = pGraphiteCacheStr ? (atoi(pGraphiteCacheStr)) : 0;
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index dffcd03..db35f31 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1146,7 +1146,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
TenMuToPt( aNewParm.maPageSize.Height() ),
vcl::PDFWriter::Portrait );
- xWriter->PlayMetafile( aPageFile, aMtfContext, NULL );
+ xWriter->PlayMetafile( aPageFile, aMtfContext );
}
}
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 0c835e8..da7d0a3 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -724,7 +724,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
aInfo.LoadFont( pSrcFont );
aInfo.CreateFontSubset( nTargetMask, pTmpFile, pGlyphSetName,
- &aRequestedGlyphs[0], &aEncoding[0], nGlyphCount, NULL );
+ &aRequestedGlyphs[0], &aEncoding[0], nGlyphCount );
}
bool
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 6b4e10f..30ae40d 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -501,7 +501,7 @@ bool PrinterGfx::drawVerticalizedText(
aPos.Y() += (sal_Int32)(-(nTextScale*fStretch - nD) * fCos);
break;
}
- drawText( aPos, pStr+i, 1, NULL );
+ drawText( aPos, pStr+i, 1 );
if( i < nLen-1 && pDeltaArray )
{
aPoint.X() = (sal_Int32)(rPoint.X() + ((double)pDeltaArray[i] * fCos));
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index ae778fe..a7c4e034 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -51,7 +51,7 @@ void VclComplexTextTest::testArabic()
vcl::Font aFont = OutputDevice::GetDefaultFont(
DefaultFontType::CTL_SPREADSHEET,
LANGUAGE_ARABIC_SAUDI_ARABIA,
- GetDefaultFontFlags::OnlyOne, 0 );
+ GetDefaultFontFlags::OnlyOne );
pOutDev->SetFont( aFont );
// normal orientation
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 78278c5..5a259d0 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2034,7 +2034,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
}
ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, 1,
- nDrawFlags, nTextStyle, NULL );
+ nDrawFlags, nTextStyle );
rMouseRect = Rectangle( aPos, aSize );
rMouseRect.Left() = rPos.X();
@@ -3109,7 +3109,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
}
ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, 1,
- nDrawFlags, nTextStyle, NULL );
+ nDrawFlags, nTextStyle );
nLineY = aPos.Y() + aSize.Height()/2;
rMouseRect = Rectangle( aPos, aSize );
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 316ee8d..c65b38d 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2589,7 +2589,7 @@ void TextEngine::RemoveAttribs( sal_uInt32 nPara, bool bIdleFormatAndUpdate )
if ( bIdleFormatAndUpdate )
IdleFormatAndUpdate( NULL, 0xFFFF );
else
- FormatAndUpdate( NULL );
+ FormatAndUpdate();
}
}
}
@@ -2613,7 +2613,7 @@ void TextEngine::RemoveAttribs( sal_uInt32 nPara, sal_uInt16 nWhich, bool bIdleF
if(bIdleFormatAndUpdate)
IdleFormatAndUpdate( NULL, 0xFFFF );
else
- FormatAndUpdate( NULL );
+ FormatAndUpdate();
}
}
}
@@ -2637,7 +2637,7 @@ void TextEngine::RemoveAttrib( sal_uInt32 nPara, const TextCharAttrib& rAttrib )
TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara );
pTEParaPortion->MarkSelectionInvalid( 0, pNode->GetText().getLength() );
mbFormatted = false;
- FormatAndUpdate( NULL );
+ FormatAndUpdate();
}
}
}
@@ -2668,7 +2668,7 @@ void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32
if ( bIdleFormatAndUpdate )
IdleFormatAndUpdate( NULL, 0xFFFF );
else
- FormatAndUpdate( NULL );
+ FormatAndUpdate();
}
}
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index e0da9aa..85c64a1 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -270,9 +270,9 @@ bool Bitmap::Convert( BmpConversion eConversion )
case( BMP_CONVERSION_4BIT_COLORS ):
{
if( nBitCount < 4 )
- bRet = ImplConvertUp( 4, NULL );
+ bRet = ImplConvertUp( 4 );
else if( nBitCount > 4 )
- bRet = ImplConvertDown( 4, NULL );
+ bRet = ImplConvertDown( 4 );
else
bRet = true;
}
@@ -318,7 +318,7 @@ bool Bitmap::Convert( BmpConversion eConversion )
case( BMP_CONVERSION_24BIT ):
{
if( nBitCount < 24 )
- bRet = ImplConvertUp( 24, NULL );
+ bRet = ImplConvertUp( 24 );
else
bRet = true;
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index c295549..37032f9 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1567,7 +1567,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
Rectangle aRect;
// hdu said base = index
aMapVDev->GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
- pAct->GetWidth(), NULL );
+ pAct->GetWidth() );
Point aPt( pAct->GetPoint() );
aRect.Move( aPt.X(), aPt.Y() );
ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev->GetMapMode(), GetPrefMapMode() ), aClipStack, 0 );
@@ -1582,7 +1582,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
OUString aStr( pStr );
Rectangle aRect;
- aMapVDev->GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL );
+ aMapVDev->GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength() );
Point aPt( pAct->GetStartPoint() );
aRect.Move( aPt.X(), aPt.Y() );
aRect.Right() = aRect.Left() + pAct->GetWidth();
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 885bf71..c90f41c 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -467,7 +467,7 @@ PDFWriter::InitEncryption( const OUString& i_rOwnerPassword,
void PDFWriter::PlayMetafile( const GDIMetaFile& i_rMTF, const vcl::PDFWriter::PlayMetafileContext& i_rPlayContext, PDFExtOutDevData* i_pData )
{
- xImplementation->playMetafile( i_rMTF, i_pData, i_rPlayContext, NULL);
+ xImplementation->playMetafile( i_rMTF, i_pData, i_rPlayContext );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 1d4a657..5331eca 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.cxx
@@ -43,7 +43,7 @@ void EventPoster::Post()
{
DBG_TESTSOLARMUTEX();
- m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), nullptr );
+ m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ) );
}
IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, /*p*/, void )
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index d03f3cb..dc1bcfc 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -914,7 +914,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
if ( !IsDeviceOutputNecessary() || pVector )
return;
- SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, NULL);
+ SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt);
if( pSalLayout )
{
ImplDrawText( *pSalLayout );
@@ -1184,7 +1184,7 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth,
if ( !IsDeviceOutputNecessary() )
return;
- SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, nWidth, NULL);
+ SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, nWidth);
if( pSalLayout )
{
ImplDrawText( *pSalLayout );
@@ -1428,7 +1428,7 @@ std::shared_ptr<vcl::TextLayoutCache> OutputDevice::CreateTextLayoutCache(
return nullptr;
OUString copyBecausePrepareModifiesIt(rString);
ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs(copyBecausePrepareModifiesIt,
- 0, rString.getLength(), 0, nullptr, SalLayoutFlags::NONE, nullptr);
+ 0, rString.getLength(), 0, nullptr);
SalLayout *const pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 );
if (!pSalLayout)
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9967e9c..adb0621 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -56,7 +56,7 @@ static void ImplGetPinImage( DrawButtonFlags nStyle, bool bPinIn, Image& rImage
Color aMaskColor( 0x00, 0x00, 0xFF );
pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap
( ResId( SV_RESID_BITMAP_PIN, *pResMgr ), 4,
- &aMaskColor, NULL, NULL );
+ &aMaskColor );
}
}
@@ -1937,8 +1937,7 @@ void ImplBorderWindow::Resize()
}
mpMenuBarWindow->setPosSizePixel(
nLeftBorder, nTopBorder,
- aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight,
- PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height);
+ aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight);
// shift the notebookbar down accordingly
nTopBorder += nMenuHeight;
@@ -1949,8 +1948,7 @@ void ImplBorderWindow::Resize()
long nNotebookBarHeight = mpNotebookBarWindow->GetSizePixel().Height();
mpNotebookBarWindow->setPosSizePixel(
nLeftBorder, nTopBorder,
- aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight,
- PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height);
+ aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight);
}
GetBorder( pClientWindow->mpWindowImpl->mnLeftBorder, pClientWindow->mpWindowImpl->mnTopBorder,
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index d8b4001..b7bd49b 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -35,7 +35,7 @@ IntroWindow::IntroWindow( ) :
WorkWindow( WINDOW_INTROWINDOW )
{
ImplInitIntroWindowData();
- WorkWindow::ImplInit( 0, WB_INTROWIN, NULL );
+ WorkWindow::ImplInit( 0, WB_INTROWIN );
}
IntroWindow::~IntroWindow()
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index ae6c6b8..67eba4e 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -148,7 +148,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
aCloseBtn->SetPaintTransparent(true);
aCloseBtn->SetParentClipMode(ParentClipMode::NoClip);
- aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage, ToolBoxItemBits::NONE);
+ aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage);
aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl));
aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl));
aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString());
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8b4308a..cfcf37e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2972,7 +2972,7 @@ void ToolBox::ImplDrawButton(vcl::RenderContext& rRenderContext, const Rectangle
}
if (!bNativeOk)
- vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2, NULL);
+ vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2);
}
void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, bool bLayout)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e039c6d..f770bda 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2536,7 +2536,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
// Since #104887#, the notifications for the access bridge are done in Impl(Set|Reset)ReallyVisible. Here, we
// now only notify with a NULL data pointer, for all other clients except the access bridge.
if ( !bRealVisibilityChanged )
- CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL );
+ CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE );
if( aDogTag.IsDead() )
return;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 1ee1661..ae72727 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1054,7 +1054,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
// ContextMenu
if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) )
- bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL );
+ bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu );
else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) ||
// #101999# no active help when focus in toolbox, simulate BallonHelp instead
( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) )
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 3977eee..3881f15 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -79,7 +79,7 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::su
ImplInit( pParent, 0, pData );
}
else
- ImplInit( pParent, nStyle, NULL );
+ ImplInit( pParent, nStyle );
}
WorkWindow::WorkWindow( WindowType nType ) :
@@ -92,7 +92,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
ImplInitWorkWindowData();
- ImplInit( pParent, nStyle, NULL );
+ ImplInit( pParent, nStyle );
}
WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index bb849be..17dcdd6 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -81,7 +81,7 @@ void VCLKDEApplication::postDialogCleanup()
if( clipboard->ownsSelection())
clipboard->clear( QClipboard::Selection );
if( clipboard->ownsClipboard())
- clipboard->clear( QClipboard::Clipboard );
+ clipboard->clear();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index f3e5380..1555764 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -229,7 +229,7 @@ void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
WorkWindow::Paint(rRenderContext, rRect);
- rRenderContext.Push(PushFlags::ALL);
+ rRenderContext.Push();
MapMode aMapMode(MAP_100TH_MM);
rRenderContext.SetMapMode(aMapMode);
commit 6017a8ee741ca8b192dda2fe2f853392bbf26614
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:14 2015 +0200
loplugin:defaultparams
Change-Id: Ia24ec98bfec36aa758fb1c5a6ec095c5047242a2
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index d003b9d..4263fc3 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -585,7 +585,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
}
OUString sURLPath = GetURLPath( DECODE_WITH_CHARSET, RTL_TEXTENCODING_ISO_8859_1 );
- sal_Unicode const * pSkippedMediatype = INetMIME::scanContentType( sURLPath.getStr(), sURLPath.getStr() + sURLPath.getLength(), NULL, NULL, NULL );
+ sal_Unicode const * pSkippedMediatype = INetMIME::scanContentType( sURLPath.getStr(), sURLPath.getStr() + sURLPath.getLength() );
sal_Int32 nCharactersSkipped = pSkippedMediatype == NULL
? 0 : pSkippedMediatype-sURLPath.getStr();
if (sURLPath.match(",", nCharactersSkipped))
commit 092a3907863b6b05fa94c7125714137760d5c33e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:11 2015 +0200
loplugin:defaultparams
Change-Id: I1d7e9bae07ff7bb13005d408522c6bb922ae00c6
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index ea48a42..6e9287c 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -496,7 +496,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain
1
);
- return impl_addControl( xControl, NULL );
+ return impl_addControl( xControl );
}
void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
commit d9e17c5b7670369e7bf90025b49a6569fa085bbc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:07 2015 +0200
loplugin:defaultparams
Change-Id: I742a25440d6c321549bb32a2e5ce86207bfb711c
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 1ecfe81..187a25e 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -335,7 +335,7 @@ bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const OUS
CPPUNIT_ASSERT(aDestContent.startsWith(aStart));
- return (aDestContent.endsWithIgnoreAsciiCase(aSrcContent, NULL) // same cell address
+ return (aDestContent.endsWithIgnoreAsciiCase(aSrcContent) // same cell address
&& aDestContent.indexOf(aSrcFileName)>0); // contains source file name
}
commit 0705f7da48bf36949dd323ba0103db86708e00e7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 20 11:47:00 2015 +0200
loplugin:defaultparams
Change-Id: I11ff551955c1ac291ab576f2f18c2dd410427eda
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 9619146..4aed8dc 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -464,7 +464,7 @@ void SwMacrosTest::testFindReplace()
// find newline on 1st paragraph
bool bFound = pPaM->Find(
- opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_BODY);
+ opts, false, DOCPOS_CURR, DOCPOS_END, bCancel);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 95d99d4..425a556 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -227,7 +227,7 @@ void SwDocTest::testFileNameFields()
CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected);
}
- m_xDocShRef->DoInitNew(0);
+ m_xDocShRef->DoInitNew();
}
//See http://lists.freedesktop.org/archives/libreoffice/2011-August/016666.html
@@ -1629,7 +1629,7 @@ void SwDocTest::setUp()
SwGlobals::ensure();
m_pDoc = new SwDoc;
m_xDocShRef = new SwDocShell(m_pDoc, SfxObjectCreateMode::EMBEDDED);
- m_xDocShRef->DoInitNew(0);
+ m_xDocShRef->DoInitNew();
}
void SwDocTest::tearDown()
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9cbbc07..d4ef3b7 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1707,14 +1707,14 @@ void SwUiWriterTest::testSearchWithTransliterate()
SearchOpt.insertedChars = 0;
SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
//transliteration option set so that at least one of the search strings is not found
- sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY);
+ sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
CPPUNIT_ASSERT_EQUAL(0,(int)case1);
SearchOpt.searchString = "paragraph";
SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
//transliteration option set so that all search strings are found
- sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY);
+ sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
pShellCrsr = pWrtShell->getShellCrsr(true);
CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText());
CPPUNIT_ASSERT_EQUAL(1,(int)case2);
@@ -2234,7 +2234,7 @@ void SwUiWriterTest::testTdf83798()
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->GotoNextTOXBase();
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
- pWrtShell->UpdateTableOf(*pTOXBase, nullptr);
+ pWrtShell->UpdateTableOf(*pTOXBase);
SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
pCrsr->SetMark();
pCrsr->Move(fnMoveForward, fnGoNode);
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 5383fe2..188399b 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -70,7 +70,7 @@ struct _PercentHdl
{
sal_uLong n = nStt; nStt = nEnd; nEnd = n;
}
- ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd, 0 );
+ ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd );
}
explicit _PercentHdl( const SwPaM& rPam )
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 1379360..0bfa49d 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -131,7 +131,7 @@ void SwVisCrsr::_SetPosAndShow()
}
// check if cursor should show the current cursor bidi level
- m_aTextCrsr.SetDirection( CursorDirection::NONE );
+ m_aTextCrsr.SetDirection();
const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr();
if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() )
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 302fb3e..0a721e9 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -75,7 +75,7 @@ namespace
::sfx2::SvBaseLinkRef xLink = pLnk;
OUString sFName;
- sfx2::LinkManager::GetDisplayNames( xLink, 0, &sFName, 0, 0 );
+ sfx2::LinkManager::GetDisplayNames( xLink, 0, &sFName );
INetURLObject aURL( sFName );
if( INetProtocol::File == aURL.GetProtocol() ||
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 4a6d7b3..0dad444 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -426,7 +426,7 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
SfxItemSet aSet(GetAttrPool(), RES_CHRATR_RSID, RES_CHRATR_RSID);
aSet.Put(aRsid);
bool const bRet(pTextNode->SetAttr(aSet, nStart,
- rRg.GetPoint()->nContent.GetIndex(), SetAttrMode::DEFAULT));
+ rRg.GetPoint()->nContent.GetIndex()));
if (bRet && GetIDocumentUndoRedo().DoesUndo())
{
@@ -1832,7 +1832,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet
// here, so insert the old attributes as an empty hint to stop expand
SwPaM endPam(*pTNd, nEnd);
endPam.SetMark();
- getIDocumentContentOperations().InsertItemSet(endPam, currentSet, SetAttrMode::DEFAULT);
+ getIDocumentContentOperations().InsertItemSet(endPam, currentSet);
getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
}
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index a16d4d0..e479b53 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -270,7 +270,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
if( pStartNd->GetIndex() + 1 < aEndIdx.GetIndex() )
{
SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::INTERNAL ));
- if( xDocSh->DoInitNew( 0 ) )
+ if( xDocSh->DoInitNew() )
{
SwDoc* pDoc = static_cast<SwDocShell*>(&xDocSh)->GetDoc();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 3a870a9..a329912 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1170,8 +1170,7 @@ void SwRangeRedline::MoveToSection()
}
else
{
- pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
- SwNormalStartNode );
+ pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ) );
SwPosition aPos( *pSttNd->EndOfSectionNode() );
pDoc->getIDocumentContentOperations().MoveRange( aPam, aPos,
@@ -1243,8 +1242,7 @@ void SwRangeRedline::CopyToSection()
}
else
{
- pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
- SwNormalStartNode );
+ pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ) );
if( pCEndNd )
{
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 2b5cf7d..fb67e0e 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1130,7 +1130,7 @@ bool SwTableAutoFormatTable::Load()
bool bRet = false;
OUString sNm(AUTOTABLE_FORMAT_NAME);
SvtPathOptions aOpt;
- if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
+ if( aOpt.SearchFile( sNm ))
{
SfxMedium aStream( sNm, STREAM_STD_READ );
bRet = Load( *aStream.GetInStream() );
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 0c09aa9..800c8ec 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1082,7 +1082,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
OSL_ENSURE( pUp->Lower()->IsLayoutFrm(),"Who's in there?" );
pUp = static_cast<SwLayoutFrm*>(pUp->Lower());
}
- pNew->Paste( pUp, NULL );
+ pNew->Paste( pUp );
// #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e8ec08f..0571943 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1161,7 +1161,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
{
// It's in the Section, so update. But only if it's not in the same File!
OUString sFName;
- sfx2::LinkManager::GetDisplayNames( pBLink, 0, &sFName, 0, 0 );
+ sfx2::LinkManager::GetDisplayNames( pBLink, 0, &sFName );
if( sFName != sName )
{
pBLink->DataChanged( sMimeType, aValue );
@@ -1351,7 +1351,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
if ( pSrcDoc != pDoc &&
rSection.IsProtectFlag() )
{
- pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false, true, false, 0 );
+ pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false );
}
if( pCpyRg )
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 5797241..e04d160 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -111,7 +111,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly)
SwSectionData aSectionData(rTOXSect);
aSectionData.SetProtectFlag(bReadonly);
- UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat() ), aSectionData, 0 );
+ UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat() ), aSectionData );
}
const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 9ea3c45..f4a5c85 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -201,7 +201,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
{
const SwTextInputField * pTextInputField =
dynamic_cast< const SwTextInputField* >(
- pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTextNode::DEFAULT ) );
+ pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD ) );
if ( pTextInputField == NULL )
break;
nRet = rCalcPara.rCalc.Calculate( pTextInputField->GetFieldContent() ).GetDouble();
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index f5d8514..82dd5af 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -60,7 +60,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
aRet = VISIBLE;
o_rInfo.mpAnchorFrm = pTextFrm;
- pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 );
+ pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos );
if ( pAnnotationStartPos != NULL )
{
o_rInfo.mnStartNodeIdx = pAnnotationStartPos->nNode.GetIndex();
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 2847c4f..afba625 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -168,7 +168,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
rIdx.GetIndex(), RES_TXTATR_FLYCNT));
if( pTextFly )
{
- const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat( 0 );
+ const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat();
pTextNd->EraseText( rIdx, 1 );
}
}
@@ -216,7 +216,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
bRet = true;
}
else
- bRet = _CopySelToDoc( pClpDoc, 0 ); // copy the selections
+ bRet = _CopySelToDoc( pClpDoc ); // copy the selections
pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 );
pClpDoc->getIDocumentFieldsAccess().UnlockExpFields();
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index d2b8455..8d4d269 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -523,7 +523,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
{
SwPosition pos = *aAnch.GetContentAnchor();
Point aTmpPnt( rAbsPos );
- if( pTextFrm->GetCrsrOfst( &pos, aTmpPnt, NULL ) )
+ if( pTextFrm->GetCrsrOfst( &pos, aTmpPnt ) )
{
SwRect aTmpRect;
pTextFrm->GetCharRect( aTmpRect, pos );
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index dbc3615..9597d84 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -663,7 +663,7 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
SdrHdl* pHdl = pView->PickHandle( *pPt );
if (pView->BegDragObj( *pPt, 0, pHdl ))
pView->GetDragMethod()->SetShiftPressed( bIsShift );
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
return 1;
}
return 0;
@@ -677,7 +677,7 @@ long SwFEShell::Drag( const Point *pPt, bool )
ScrollTo( *pPt );
Imp()->GetDrawView()->MovDragObj( *pPt );
Imp()->GetDrawView()->ShowDragAnchor();
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
return 1;
}
return 0;
@@ -719,7 +719,7 @@ long SwFEShell::EndDrag( const Point *, bool )
}
GetDoc()->getIDocumentState().SetModified();
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
return 1;
}
@@ -1510,7 +1510,7 @@ void SwFEShell::MoveCreate( const Point &rPos )
{
ScrollTo( rPos );
Imp()->GetDrawView()->MovCreateObj( rPos );
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
}
}
@@ -1535,7 +1535,7 @@ bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
if ( (SdrCreateCmd)eSdrCreateCmd == SDRCREATE_NEXTPOINT )
{
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
return true;
}
return ImpEndCreate();
@@ -1564,7 +1564,7 @@ bool SwFEShell::ImpEndCreate()
// OD 2004-04-05 #i26791# - direct object positioning for group members
rSdrObj.NbcSetRelativePos( aTmpPos - aNewAnchor );
rSdrObj.NbcSetAnchorPos( aNewAnchor );
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
return true;
}
@@ -2040,7 +2040,7 @@ void SwFEShell::ChgAnchor( int eAnchorId, bool bSameOnly, bool bPosCorr )
EndAllAction();
- ::FrameNotify( this, FLY_DRAG );
+ ::FrameNotify( this );
}
}
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index bdade3a..9baf445 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1885,7 +1885,7 @@ SwTab SwFEShell::WhichMouseTabCol( const Point &rPt ) const
bool bSelect = false;
// First try: Do we get the row/col move cursor?
- const SwCellFrm* pFrm = static_cast<const SwCellFrm*>(GetBox( rPt, &bRow, 0 ));
+ const SwCellFrm* pFrm = static_cast<const SwCellFrm*>(GetBox( rPt, &bRow ));
if ( !pFrm )
{
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 26488f4..7f098a1 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -1095,7 +1095,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) );
OUString sGrfNm;
- sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
+ sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm );
OUString sReferer;
SfxObjectShell * sh = GetDoc()->GetPersist();
if (sh != 0 && sh->HasName())
@@ -1150,7 +1150,7 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
if ( IsLinkedFile() )
{
OUString sGrfNm;
- sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
+ sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm );
if ( !sGrfNm.startsWith( "vnd.sun.star.pkg:" ) )
{
bRet = true;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index f86f0e1..f985b62 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2726,7 +2726,7 @@ SdrObject* SwFrameFormat::FindRealSdrObject()
{
Point aNullPt;
SwFlyFrm* pFly = static_cast<SwFlyFrm*>(::GetFrmOfModify( 0, *this, FRM_FLY,
- &aNullPt, 0 ));
+ &aNullPt ));
return pFly ? pFly->GetVirtDrawObj() : 0;
}
return FindSdrObject();
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 78c96d1..e404302 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -988,7 +988,7 @@ bool SwContentFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
// 4. The spacing for TextFrms corresponds to the interline lead,
// at a minimum.
- nUpper = CalcUpperSpace( &rAttrs, NULL );
+ nUpper = CalcUpperSpace( &rAttrs );
SwTwips nLower = CalcLowerSpace( &rAttrs );
if (IsCollapse()) {
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 2d854d6..99a79a0 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -500,7 +500,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
if( (pInva->Frm().*fnRect->fnBottomDist)( nBottom ) <= 0 )
{
pInva->InvalidateSize();
- pInva->Prepare( PREP_CLEAR );
+ pInva->Prepare();
pInva = pInva->FindPrev();
}
else
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 6bda3ef..205f01a 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1940,7 +1940,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob )
const sal_Int32 nEnd = pTextNode->GetText().getLength();
SwDocStat aStat;
pTextNode->CountWords( aStat, 0, nEnd );
- if ( Application::AnyInput( VCL_INPUT_ANY ) )
+ if ( Application::AnyInput() )
return true;
break;
}
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 45196fd..71ec07e 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -289,7 +289,7 @@ void SwPageFrm::CheckGrid( bool bInvalidate )
SwContentFrm* pFrm = pBody->ContainsContent();
while( pBody->IsAnLower( pFrm ) )
{
- static_cast<SwTextFrm*>(pFrm)->Prepare( PREP_CLEAR );
+ static_cast<SwTextFrm*>(pFrm)->Prepare();
pFrm = pFrm->GetNextContentFrm();
}
}
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index a236b1c..666161e 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -249,7 +249,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd )
pMod = 0;
Point aNullPt;
- return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0 )
+ return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt )
: 0;
}
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index dd82bac..21a67dc 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2483,7 +2483,7 @@ SwFootnoteContFrm* SwSectionFrm::ContainsFootnoteCont( const SwFootnoteContFrm*
void SwSectionFrm::InvalidateFootnotePos()
{
- SwFootnoteContFrm* pCont = ContainsFootnoteCont( NULL );
+ SwFootnoteContFrm* pCont = ContainsFootnoteCont();
if( pCont )
{
SwFrm *pTmp = pCont->ContainsContent();
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 4f06a38..462aef1 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -255,7 +255,7 @@ void SwFrm::CheckDirChange()
pBody->AdjustColumns( pCol, true );
}
else if( IsTextFrm() )
- static_cast<SwTextFrm*>(this)->Prepare( PREP_CLEAR );
+ static_cast<SwTextFrm*>(this)->Prepare();
// #i31698# - notify anchored objects also for page frames.
// Remove code above for special handling of page frames
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index e23ab20..3f9a488 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1318,7 +1318,7 @@ void SwInvalidateAll( SwFrm *pFrm, long nBottom )
::SwInvalidateAll( pToInvalidate->Lower(), nBottom);
}
else
- pFrm->Prepare( PREP_CLEAR );
+ pFrm->Prepare();
pFrm = pFrm->GetNext();
} while ( pFrm &&
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d2dcfd9..96b513e 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -267,7 +267,7 @@ bool SwOLENode::RestorePersistentData()
// What happens to this document?
OSL_ENSURE( false, "Why are we creating a DocShell here?" );
p = new SwDocShell( GetDoc(), SfxObjectCreateMode::INTERNAL );
- p->DoInitNew( NULL );
+ p->DoInitNew();
}
uno::Reference < container::XChild > xChild( aOLEObj.xOLERef.GetObject(), uno::UNO_QUERY );
@@ -427,7 +427,7 @@ SwContentNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
// the created document will be closed by pDoc ( should use SfxObjectShellLock )
pPersistShell = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL );
pDoc->SetTmpDocShell( pPersistShell );
- pPersistShell->DoInitNew( NULL );
+ pPersistShell->DoInitNew();
}
// We insert it at SvPersist level
@@ -519,7 +519,7 @@ bool SwOLENode::UpdateLinkURL_Impl()
if ( mpObjectLink )
{
OUString aNewLinkURL;
- sfx2::LinkManager::GetDisplayNames( mpObjectLink, 0, &aNewLinkURL, 0, 0 );
+ sfx2::LinkManager::GetDisplayNames( mpObjectLink, 0, &aNewLinkURL );
if ( !aNewLinkURL.equalsIgnoreAsciiCase( maLinkURL ) )
{
if ( !aOLEObj.xOLERef.is() )
@@ -609,7 +609,7 @@ void SwOLENode::CheckFileLink_Impl()
// this is a file link so the model link manager should handle it
mpObjectLink = new SwEmbedObjectLink( this );
maLinkURL = aLinkURL;
- GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL, NULL, NULL );
+ GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL );
mpObjectLink->Connect();
}
}
@@ -730,7 +730,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
// What happens to the document?
OSL_ENSURE( false, "Why are we creating a DocShell here??" );
p = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL );
- p->DoInitNew( NULL );
+ p->DoInitNew();
}
OUString aObjName;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index bae58e4..acc880d 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -63,7 +63,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
, nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
- if( !pDocSh->DoInitNew( 0 ) )
+ if( !pDocSh->DoInitNew() )
return;
bReadOnly = true;
pDoc = pDocSh->GetDoc();
@@ -109,7 +109,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg
, nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
- if( !pDocSh->DoInitNew( 0 ) )
+ if( !pDocSh->DoInitNew() )
return;
bReadOnly = false;
pDoc = pDocSh->GetDoc();
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 53e6ae0..a767b3c 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -284,7 +284,7 @@ bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst )
OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: cheesy follow" );
if( pMyFollow->GetPrev() )
{
- pMyFollow->Prepare( PREP_CLEAR );
+ pMyFollow->Prepare();
pMyFollow->Calc(pRenderContext);
OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: very cheesy follow" );
}
@@ -797,7 +797,7 @@ bool SwTextFrm::CalcPreps()
if( bPrepMustFit )
{
GetFollow()->SetJustWidow( true );
- GetFollow()->Prepare( PREP_CLEAR );
+ GetFollow()->Prepare();
}
else if ( bVert )
{
@@ -823,7 +823,7 @@ bool SwTextFrm::CalcPreps()
nChgHeight = (Prt().*fnRect->fnGetHeight)() - nChgHeight;
GetFollow()->SetJustWidow( true );
- GetFollow()->Prepare( PREP_CLEAR );
+ GetFollow()->Prepare();
Shrink( nChgHeight );
SwRect &rRepaint = pPara->GetRepaint();
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 88fc651..8363273 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1082,7 +1082,7 @@ void SwTextPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
void SwTextPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const
{
SwRect aIntersect;
- CalcRect( rPor, &aIntersect, 0 );
+ CalcRect( rPor, &aIntersect );
if ( aIntersect.HasArea() )
{
if (OnWin() && SwViewOption::IsFieldShadings() &&
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 5645b73..68bfd3b 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -154,9 +154,9 @@ void SwKernPortion::Paint( const SwTextPaintInfo &rInf ) const
OUString aTextDouble(" ");
SwRect aClipRect;
- rInf.CalcRect( *this, &aClipRect, 0 );
+ rInf.CalcRect( *this, &aClipRect );
SwSaveClip aClip( const_cast<OutputDevice*>(rInf.GetOut()) );
- aClip.ChgClip( aClipRect, 0 );
+ aClip.ChgClip( aClipRect );
rInf.DrawText( aTextDouble, *this, 0, 2, true );
}
}
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index ed54b5a..4dec517 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -623,7 +623,7 @@ void SwTextFrm::HideAndShowObjects()
sal_Int32 nHiddenStart;
sal_Int32 nHiddenEnd;
const sal_Int32 nObjAnchorPos = pContact->GetContentAnchorIndex().GetIndex();
- SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart, nHiddenEnd, 0 );
+ SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart, nHiddenEnd );
// #120729# - hotfix
// under certain conditions
if ( nHiddenStart != COMPLETE_STRING && bShouldBeHidden &&
@@ -918,7 +918,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
if( nWhich == RES_FMT_CHG && getRootFrm()->GetCurrShell() )
{
// collection has changed
- Prepare( PREP_CLEAR );
+ Prepare();
_InvalidatePrt();
lcl_SetWrong( *this, 0, COMPLETE_STRING, false );
SetDerivedR2L( false );
@@ -961,7 +961,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
if( nPos )
InvalidateSize();
else
- Prepare( PREP_CLEAR );
+ Prepare();
}
else
_InvalidateRange( SwCharRange( nPos, nLen ), nLen );
@@ -1170,7 +1170,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
if ( GetPrev() )
CheckKeep();
- Prepare( PREP_CLEAR );
+ Prepare();
InvalidateSize();
nClear |= 0x08;
--nCount;
@@ -1243,7 +1243,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
if( getRootFrm()->GetCurrShell() )
{
- Prepare( PREP_CLEAR );
+ Prepare();
_InvalidatePrt();
}
@@ -1316,7 +1316,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
case RES_PARATR_SPLIT:
if ( GetPrev() )
CheckKeep();
- Prepare( PREP_CLEAR );
+ Prepare();
bSetFieldsDirty = true;
break;
case RES_FRAMEDIR :
@@ -1325,7 +1325,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
break;
default:
{
- Prepare( PREP_CLEAR );
+ Prepare();
_InvalidatePrt();
if ( !nWhich )
{
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index 70b2838..8ac6c22 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -106,7 +106,7 @@ DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTextNode& targetNod
if (!pageDescription) {
return false;
}
- const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout, 0, 0);
+ const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout);
if (!pFrm) {
return false;
}
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 3fc431d..bea3a6e 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -279,7 +279,7 @@ ToxTextGenerator::CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& po
pItem->Which() == RES_CHRATR_POSTURE ||
pItem->Which() == RES_CHRATR_CJK_POSTURE ||
pItem->Which() == RES_CHRATR_CTL_POSTURE) {
- SfxPoolItem* clonedItem = pItem->Clone(NULL);
+ SfxPoolItem* clonedItem = pItem->Clone();
retval->Put(*clonedItem);
}
if (aIter.IsAtEnd()) {
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 4bcd387..fe0c97b 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -384,7 +384,7 @@ void SwTextFootnote::CopyFootnote(
SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
sal_uLong nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
- m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL );
+ m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd );
// in case the destination section was not empty, delete the old nodes
// before: Src: SxxxE, Dst: SnE
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 9c69382..0872df4 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1932,7 +1932,7 @@ bool SwTextNode::SetAttr(
static_cast<const SwFormatCharFormat*>(pItem)->GetCharFormat()))
{
SwIndex aIndex( this, nStt );
- RstTextAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT, 0 );
+ RstTextAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT );
DontExpandFormat( aIndex );
}
else
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index fd83a21..3f9b259 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -841,7 +841,7 @@ void SwUndoSaveSection::SaveSection(
// Keep positions as SwIndex so that this section can be deleted in DTOR
sal_uLong nEnd;
pMvStt = new SwNodeIndex( rRange.aStart );
- MoveToUndoNds(aPam, pMvStt, &nEnd, 0);
+ MoveToUndoNds(aPam, pMvStt, &nEnd);
nMvLen = nEnd - pMvStt->GetIndex() + 1;
}
@@ -870,7 +870,7 @@ void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos
{
SwPosition aInsPos( rInsPos );
sal_uLong nEnd = pMvStt->GetIndex() + nMvLen - 1;
- MoveFromUndoNds(*pDoc, pMvStt->GetIndex(), aInsPos, &nEnd, 0);
+ MoveFromUndoNds(*pDoc, pMvStt->GetIndex(), aInsPos, &nEnd);
// destroy indices again, content was deleted from UndoNodes array
DELETEZ( pMvStt );
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 5dd9949..dccacc7 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -621,7 +621,7 @@ void SwUndoSetFlyFormat::RedoImpl(::sw::UndoRedoContext & rContext)
rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, &aSet );
}
else
- rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, 0 );
+ rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat );
rContext.SetSelections(pFrameFormat, 0);
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 313d2a4..e4ccc79 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -811,13 +811,13 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
if( pOldNm )
{
- pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0 );
+ pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString() );
delete pOldNm;
delete pOldFltr;
}
else
{
- pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0 );
+ pGrfNd->ReRead( OUString(), OUString(), pOldGrf );
delete pOldGrf;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index c5d140c..b7cf85fc 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2018,7 +2018,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
SwFormatField aFormatField( *pPostItField );
delete pPostItField;
SwPaM aEnd( *aIntPam.End(), *aIntPam.End() );
- m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFormatField, SetAttrMode::DEFAULT );
+ m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFormatField );
// delete former annotation
{
const SwTextField* pTextField = m_pImpl->m_pFormatField->GetTextField();
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 76184e1..de13f04 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1376,7 +1376,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
}
//TODO: apply Section attributes (columns and background)
SwTOXBaseSection *const pTOX =
- pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0 );
+ pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase );
pDoc->SetTOXBaseName(*pTOX, m_pImpl->m_pProps->GetTOXBase().GetTOXName());
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index a0a6569..b4d4fb1 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -230,7 +230,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName)
return pFilter;
}
- return SwIoSystem::GetFilterOfFormat(FILTER_TEXT, 0);
+ return SwIoSystem::GetFilterOfFormat(FILTER_TEXT);
}
bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen,
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index d5b36ef..5001504 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -500,7 +500,7 @@ SwDoc* Reader::GetTemplateDoc()
SwDocShell *pDocSh =
new SwDocShell ( SfxObjectCreateMode::INTERNAL );
SfxObjectShellLock xDocSh = pDocSh;
- if( pDocSh->DoInitNew( 0 ) )
+ if( pDocSh->DoInitNew() )
{
pTemplate = pDocSh->GetDoc();
pTemplate->SetOle2Link( Link<bool,void>() );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7d9dd7d..061ce30 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -535,7 +535,7 @@ SvParserState SwHTMLParser::CallParser()
{
if( !bViewCreated )
{
- nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ), 0 );
+ nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ) );
}
else
{
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 4ed8ffd..aa12283 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -370,7 +370,7 @@ OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaTyp
{
uno::Reference <embed::XEmbeddedObject> xObj( rObject.GetOleRef() );
comphelper::EmbeddedObjectContainer* aContainer = rObject.GetObject().GetContainer();
- uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj, NULL );
+ uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj );
OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + "." + sFileExtension;
uno::Reference< io::XOutputStream > xOutStream = GetFilter().openFragmentStream( OUStringBuffer()
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 281278e..c055894 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1634,7 +1634,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf)
}
Point aEmptyPoint;
Rectangle aRect( aEmptyPoint, aSize );
- sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect, NULL, 0 );
+ sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect );
if (nBlibId)
aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true);
}
@@ -1726,7 +1726,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI
Rectangle aRect( aEmptyPoint, aSize );
sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(),
- aUniqueId, aRect, NULL, 0 );
+ aUniqueId, aRect );
if (nBlibId)
aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true);
}
@@ -1932,7 +1932,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush,
Rectangle aRect(aEmptyPoint, aSize);
sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(),
- aUniqueId, aRect, NULL, 0);
+ aUniqueId, aRect);
if (nBlibId)
rPropOpt.AddOpt(ESCHER_Prop_fillBlip,nBlibId,true);
}
@@ -2301,7 +2301,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
OpenContainer( ESCHER_DgContainer );
- EnterGroup( 0 );
+ EnterGroup();
sal_uLong nSecondShapeId = pSdrObjs == rWrt.m_pSdrObjs ? GenerateShapeId() : 0;
@@ -3057,7 +3057,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt,
aRect.Right() = DrawModelToEmu(aRect.Right());
aRect.Bottom() = DrawModelToEmu(aRect.Bottom());
sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(),
- aId, aRect, pVisArea, 0); // SJ: the fourth parameter (VisArea) should be set..
+ aId, aRect, pVisArea); // SJ: the fourth parameter (VisArea) should be set..
if (nBlibId)
rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true);
}
@@ -3192,15 +3192,13 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
//Open the ObjectPool
tools::SvRef<SotStorage> xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
- OUString(SL::aObjectPool), STREAM_READWRITE |
- StreamMode::SHARE_DENYALL);
+ OUString(SL::aObjectPool));
//Create a destination storage for the microsoft control
OUStringBuffer sStorageName;
sal_uInt32 nObjId = GenerateObjectID();
sStorageName.append('_').append( static_cast<sal_Int64>( nObjId ));
- tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(),
- STREAM_READWRITE|StreamMode::SHARE_DENYALL);
+ tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear());
if (!xOleStg.Is())
return false;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 66dfe4f..295bfb2 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2955,7 +2955,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFormat, const Po
{
/* Munge flys in fly into absolutely positioned elements for word 6 */
const SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode();
- const SwRect aPageRect = pParTextNode->FindPageFrmRect( false, 0 );
+ const SwRect aPageRect = pParTextNode->FindPageFrmRect();
aOffset = rFrameFormat.FindLayoutRect().Pos();
aOffset -= aPageRect.Pos();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 588dc5f..1cfab96 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2716,8 +2716,7 @@ void WW8Export::WriteFkpPlcUsw()
some magic.
*/
// avoid memory leak #i120098#, the unnamed obj will be released in destructor.
- xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool),
- STREAM_READWRITE | StreamMode::SHARE_DENYALL);
+ xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool));
}
// dggInfo - escher stream
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 8f9946a..56ed88c 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -210,8 +210,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well.
tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(
- OUString(SL::aObjectPool), STREAM_READWRITE |
- StreamMode::SHARE_DENYALL );
+ OUString(SL::aObjectPool) );
if( xObjStg.Is() )
{
@@ -232,8 +231,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
Set_UInt32(pDataAdr, nPictureId);
OUString sStorageName('_');
sStorageName += OUString::number( nPictureId );
- tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName,
- STREAM_READWRITE| StreamMode::SHARE_DENYALL );
+ tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName );
if( xOleStg.Is() )
{
/*
@@ -328,13 +326,11 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId )
tools::SvRef<SotStorage> xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, StreamMode::READ );
tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(
- OUString(SL::aObjectPool), STREAM_READWRITE |
- StreamMode::SHARE_DENYALL );
+ OUString(SL::aObjectPool) );
if( xObjStg.Is() && xObjSrc.Is() )
{
- tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId,
- STREAM_READWRITE | StreamMode::SHARE_DENYALL );
+ tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId );
if ( xOleDst.Is() )
xObjSrc->CopyTo( xOleDst );
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index f125f69..f89b8fd0 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -207,7 +207,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
if ( 0 != (nStrings = static_cast< sal_uInt16 >(aStrings.size())))
{
SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
- if (xDocSh->DoInitNew(0))
+ if (xDocSh->DoInitNew())
{
SwDoc *pD = static_cast<SwDocShell*>((&xDocSh))->GetDoc();
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 580dc90..de4bd8f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -3086,7 +3086,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj
if (rpOurNewObject)
{
if (!m_bHdFtFootnoteEdn)
- m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject, 0 );
+ m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject );
// Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit in
// SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden kann !!!
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 287d51b..d041ea3 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -269,7 +269,7 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic,
GDIMetaFile aWMF;
pSt->Seek( nPosFc );
- bool bOk = ReadWindowMetafile( *pSt, aWMF, NULL );
+ bool bOk = ReadWindowMetafile( *pSt, aWMF );
if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
return false;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f39e0fa..77409e5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -577,8 +577,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
uno::Reference < embed::XStorage > xDstStg;
if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
{
- tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName,
- STREAM_READWRITE| StreamMode::SHARE_DENYALL );
+ tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName );
OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!");
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) &&
@@ -6083,7 +6082,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL
SwGlobals::ensure();
SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
- xDocSh->DoInitNew(0);
+ xDocSh->DoInitNew();
SwDoc *pD = static_cast<SwDocShell*>((&xDocSh))->GetDoc();
SwNodeIndex aIdx(
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0089221..35ce862 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2375,7 +2375,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
// rows of a band can be duplicated easy.
pTable = pIo->m_rDoc.InsertTable(
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
- *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0 );
+ *pTmpPos, nBands, nDefaultSwCols, eOri );
OSL_ENSURE(pTable && pTable->GetFrameFormat(), "insert table failed");
if (!pTable || !pTable->GetFrameFormat())
@@ -3811,7 +3811,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
}
}
else if( pIo->m_bNewDoc && bStyExist )
- rSI.pFormat->SetDerivedFrom(0);
+ rSI.pFormat->SetDerivedFrom();
rSI.nFollow = nNextStyle; // remember Follow
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index ccf4e87..f14fcbc 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -156,7 +156,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
OSL_ENSURE( !pSt, "+OLE: size of 0?" );
return false;
}
- bool bOk = ReadWindowMetafile( *pSt, rWMF, NULL ); // read WMF
+ bool bOk = ReadWindowMetafile( *pSt, rWMF ); // read WMF
// *pSt >> aWMF doesn't work without the placable header
if (!bOk || pSt->GetError() || rWMF.GetActionSize() == 0)
{
@@ -348,8 +348,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
aSrcStgName += OUString::number( m_nObjLocFc );
tools::SvRef<SotStorage> xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
- tools::SvRef<SotStorage> xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
- STREAM_READWRITE| StreamMode::SHARE_DENYALL );
+ tools::SvRef<SotStorage> xSrc1 = xSrc0->OpenSotStorage( aSrcStgName );
if (pGrf)
{
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 189aa79..46bcedf 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2771,7 +2771,7 @@ void SwXMLTableContext::MakeTable()
pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat());
pBoxFormat = static_cast<SwTableBoxFormat*>(pBox1->GetFrameFormat());
- _MakeTable( 0 );
+ _MakeTable();
if( bSetHoriOrient )
pFrameFormat->SetFormatAttr( SwFormatHoriOrient( 0, eHoriOrient ) );
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 9d8447b..533f2fc 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -92,7 +92,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
m_pTbLinks->SetSelectionMode( SINGLE_SELECTION );
- m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT );
+ m_pTbLinks->SetTabs( &nTabs[0] );
m_pTbLinks->Resize(); // OS: Hack for the right selection
m_pTbLinks->SetSpaceBetweenEntries( 0 );
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 5c65f3f..98da058 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -974,7 +974,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
rSh.StartAllAction();
bool bUndo = rSh.DoesUndo();
if( bUndo )
- rSh.StartUndo( UNDO_EMPTY );
+ rSh.StartUndo();
bool bAsTable = m_pRbAsTable->IsChecked();
SvNumberFormatter& rNumFormatr = *rSh.GetNumberFormatter();
@@ -1413,7 +1413,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
{
rSh.DoUndo();
rSh.AppendUndoForInsertFromDB( bAsTable );
- rSh.EndUndo( UNDO_EMPTY );
+ rSh.EndUndo();
}
rSh.ClearMark();
rSh.EndAllAction();
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 6f949ae..dbd3d81 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -748,7 +748,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveOutputHdl_Impl, Button*, pButton, voi
//now extract a document from the target document
// the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here
SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
- xTempDocShell->DoInitNew( 0 );
+ xTempDocShell->DoInitNew();
SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
pTargetView->GetWrtShell().StartAction();
@@ -1146,7 +1146,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SendDocumentsHdl_Impl, Button*, pButton,
//now extract a document from the target document
// the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here
SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
- xTempDocShell->DoInitNew( 0 );
+ xTempDocShell->DoInitNew();
SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
pTargetView->GetWrtShell().StartAction();
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 7c5cc85..19f4763 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1022,7 +1022,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void )
// call dialog paste file
IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void)
{
- if(!CheckPasswd(0))
+ if(!CheckPasswd())
return;
m_pOldDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
@@ -1231,7 +1231,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void )
IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void )
{
bool bChange = pBox == m_pPasswdPB;
- if(!CheckPasswd(0))
+ if(!CheckPasswd())
{
if(!bChange)
m_pPasswdCB->Check(!m_pPasswdCB->IsChecked());
@@ -1284,7 +1284,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void )
// editing, with empty string no Ok()
IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void)
{
- if(!CheckPasswd(0))
+ if(!CheckPasswd())
return;
SvTreeListEntry* pEntry = m_pTree->FirstSelected();
OSL_ENSURE(pEntry,"no entry found");
@@ -1302,7 +1302,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void)
IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void )
{
Selection aSelect = rEdit.GetSelection();
- if(!CheckPasswd(0))
+ if(!CheckPasswd())
return;
rEdit.SetSelection(aSelect);
SvTreeListEntry* pEntry = m_pTree->FirstSelected();
@@ -2199,7 +2199,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh)
//set sensible values at the preview
m_pPreviewWin->SetAdjust(SVX_ADJUST_BLOCK);
m_pPreviewWin->SetLastLine(SVX_ADJUST_BLOCK);
- const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, 0 );
+ const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE );
Size aPageSize(rPageRect.Width(), rPageRect.Height());
m_pPreviewWin->SetSize(aPageSize);
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 95b8aee..f3b0f1d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2235,14 +2235,14 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
m_pAutoHeightCB->Check( bCheck );
HandleAutoCB( bCheck, *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() );
if( eSize == ATT_VAR_SIZE )
- m_aHeightED.SetValue( m_aHeightED.GetMin(), FUNIT_NONE );
+ m_aHeightED.SetValue( m_aHeightED.GetMin() );
eSize = rSize.GetWidthSizeType();
bCheck = eSize != ATT_FIX_SIZE;
m_pAutoWidthCB->Check( bCheck );
HandleAutoCB( bCheck, *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() );
if( eSize == ATT_VAR_SIZE )
- m_aWidthED.SetValue( m_aWidthED.GetMin(), FUNIT_NONE );
+ m_aWidthED.SetValue( m_aWidthED.GetMin() );
if ( !bFormat )
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d4cad9b..529d04b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3883,8 +3883,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB
nWidth /=7;
--nWidth;
for(sal_uInt16 i = 1; i < 8; i++)
- InsertDataColumn( i, *aTitles[i - 1], nWidth,
- HeaderBarItemBits::STDSTYLE );
+ InsertDataColumn( i, *aTitles[i - 1], nWidth );
}
SwEntryBrowseBox::~SwEntryBrowseBox()
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 59d9bf1..576e882 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -67,7 +67,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,
0, nAppFontUnits
};
- m_pGroupTLB->SetTabs( &nTabs[0], MAP_APPFONT );
+ m_pGroupTLB->SetTabs( &nTabs[0] );
m_pGroupTLB->SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl));
m_pGroupTLB->GetModel()->SetSortMode(SortAscending);
m_pNewPB->SetClickHdl(LINK(this, SwGlossaryGroupDlg, NewHdl));
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index bb5dcef..efa59c5 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -160,7 +160,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
// Create new document (don't show!)
SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD ) );
- xDocSh->DoInitNew( 0 );
+ xDocSh->DoInitNew();
pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
pNewView = static_cast<SwView*>( pFrame->GetViewShell());
pNewView->AttrChangedNotify( &pNewView->GetWrtShell() ); // so that SelectShell is being called
@@ -268,7 +268,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
//not be deleted on inserting envelopes
pSh->EnterStdMode();
// Here it goes (insert)
- pSh->StartUndo(UNDO_UI_INSERT_ENVELOPE, NULL);
+ pSh->StartUndo(UNDO_UI_INSERT_ENVELOPE);
pSh->StartAllAction();
pSh->SttEndDoc(true);
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index e4166bf..09f6414 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -911,7 +911,7 @@ void NewXForms( SfxRequest& rReq )
// create new document
SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD) );
- xDocSh->DoInitNew( 0 );
+ xDocSh->DoInitNew();
// initialize XForms
static_cast<SwDocShell*>( &xDocSh )->GetDoc()->initXForms( true );
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 0eb0524..d643ae5 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -191,7 +191,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
// Create new document
SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD));
- xDocSh->DoInitNew( 0 );
+ xDocSh->DoInitNew();
// Printer
Printer *pPrt = pDlg->GetPrt();
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b6dd080..2d88c5b 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -875,7 +875,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const
SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 );
SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx );
- const SwRect aPageRect = pNd->FindPageFrmRect( false, 0 );
+ const SwRect aPageRect = pNd->FindPageFrmRect();
return aPageRect.SVRect();
}
return SfxObjectShell::GetVisArea( nAspect );
@@ -1115,7 +1115,7 @@ void SwDocShell::LoadingFinished()
// before <FinishedLoading(..)> is called.
const bool bHasDocToStayModified( m_pDoc->getIDocumentState().IsModified() && m_pDoc->getIDocumentLinksAdministration().LinksUpdated() );
- FinishedLoading( SfxLoadedFlags::ALL );
+ FinishedLoading();
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
if(pVFrame)
{
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 68f5f9c..fd7d888 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -700,7 +700,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
sal_uInt8 nPara = pDlg->GetPara();
SwDoc* pSmryDoc = new SwDoc();
SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SfxObjectCreateMode::STANDARD));
- xDocSh->DoInitNew( 0 );
+ xDocSh->DoInitNew();
bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich;
m_pDoc->Summary( pSmryDoc, nLevel, nPara, bImpress );
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 92d2661..a9c70c2 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1401,7 +1401,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
const OUString sStyle = pCondItem->GetStyle( i );
if (sStyle.isEmpty())
continue;
- SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 );
+ SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle );
if (pFindFormat)
{
aCond.RegisterToFormat( *pFindFormat );
@@ -1433,7 +1433,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
const OUString sStyle = pCondItem->GetStyle( i );
if (sStyle.isEmpty())
continue;
- SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 );
+ SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle );
if (pFindFormat)
{
pCColl->InsertCondition( SwCollCondition( pFindFormat,
@@ -1445,9 +1445,9 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
pColl = pCColl;
}
if ( bResetIndentAttrsAtParagraphStyle &&
- rSet.GetItemState( RES_PARATR_NUMRULE, false, 0 ) == SfxItemState::SET &&
- rSet.GetItemState( RES_LR_SPACE, false, 0 ) != SfxItemState::SET &&
- pColl->GetItemState( RES_LR_SPACE, false, 0 ) == SfxItemState::SET )
+ rSet.GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::SET &&
+ rSet.GetItemState( RES_LR_SPACE, false ) != SfxItemState::SET &&
+ pColl->GetItemState( RES_LR_SPACE, false ) == SfxItemState::SET )
{
rDoc.ResetAttrAtFormat( RES_LR_SPACE, *pColl );
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list