diff options
202 files changed, 1556 insertions, 1718 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 75858a5b405a..f78e52cd67e7 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -13332,11 +13332,7 @@ svx/source/xoutdev/xtablend.cxx svx/source/xoutdev/xtabptrn.cxx sw/inc/AnnotationWin.hxx sw/inc/EnhancedPDFExportHelper.hxx -sw/inc/HandleAnchorNodeChg.hxx -sw/inc/IDocumentChartDataProviderAccess.hxx sw/inc/IDocumentContentOperations.hxx -sw/inc/IDocumentDeviceAccess.hxx -sw/inc/IDocumentDrawModelAccess.hxx sw/inc/IDocumentExternalData.hxx sw/inc/IDocumentFieldsAccess.hxx sw/inc/IDocumentLayoutAccess.hxx @@ -13346,30 +13342,10 @@ sw/inc/IDocumentListsAccess.hxx sw/inc/IDocumentMarkAccess.hxx sw/inc/IDocumentOutlineNodes.hxx sw/inc/IDocumentRedlineAccess.hxx -sw/inc/IDocumentSettingAccess.hxx -sw/inc/IDocumentState.hxx -sw/inc/IDocumentStatistics.hxx -sw/inc/IDocumentStylePoolAccess.hxx -sw/inc/IDocumentTimerAccess.hxx sw/inc/IDocumentUndoRedo.hxx -sw/inc/IGrammarContact.hxx sw/inc/IMark.hxx -sw/inc/IShellCursorSupplier.hxx -sw/inc/PageColumnPopup.hxx -sw/inc/PageMarginPopup.hxx -sw/inc/PageOrientationPopup.hxx -sw/inc/PageSizePopup.hxx sw/inc/PostItMgr.hxx -sw/inc/SidebarWindowsTypes.hxx sw/inc/SwAppletImpl.hxx -sw/inc/SwCapObjType.hxx -sw/inc/SwDocIdle.hxx -sw/inc/SwGetPoolIdFromName.hxx -sw/inc/SwNodeNum.hxx -sw/inc/SwNumberTree.hxx -sw/inc/SwNumberTreeTypes.hxx -sw/inc/SwRewriter.hxx -sw/inc/SwSmartTagMgr.hxx sw/inc/SwStyleNameMapper.hxx sw/inc/SwUndoField.hxx sw/inc/SwXMLSectionList.hxx @@ -13377,8 +13353,6 @@ sw/inc/TextCursorHelper.hxx sw/inc/ToxLinkProcessor.hxx sw/inc/ToxTabStopTokenHandler.hxx sw/inc/ToxTextGenerator.hxx -sw/inc/ToxWhitespaceStripper.hxx -sw/inc/UndoParagraphSignature.hxx sw/inc/accessibilityoptions.hxx sw/inc/accmap.hxx sw/inc/acmplwrd.hxx @@ -13395,31 +13369,24 @@ sw/inc/cellatr.hxx sw/inc/cellfml.hxx sw/inc/charatr.hxx sw/inc/charfmt.hxx -sw/inc/checkit.hxx sw/inc/chpfld.hxx sw/inc/cmdid.h -sw/inc/colwd.hxx sw/inc/comcore.hxx sw/inc/crsrsh.hxx sw/inc/crstate.hxx sw/inc/cshtyp.hxx sw/inc/dbfld.hxx -sw/inc/dbgoutsw.hxx sw/inc/dbmgr.hxx sw/inc/dcontact.hxx sw/inc/ddefld.hxx sw/inc/dlelstnr.hxx -sw/inc/dobjfac.hxx sw/inc/doc.hxx sw/inc/docary.hxx -sw/inc/docfac.hxx -sw/inc/docfunc.hxx sw/inc/docsh.hxx sw/inc/docstat.hxx sw/inc/docstyle.hxx sw/inc/docufld.hxx sw/inc/dpage.hxx -sw/inc/drawdoc.hxx sw/inc/edglbldc.hxx sw/inc/edimp.hxx sw/inc/editsh.hxx @@ -13430,7 +13397,6 @@ sw/inc/fesh.hxx sw/inc/finalthreadmanager.hxx sw/inc/fldbas.hxx sw/inc/flddat.hxx -sw/inc/flddropdown.hxx sw/inc/flyenum.hxx sw/inc/flypos.hxx sw/inc/fmtanchr.hxx @@ -13473,7 +13439,6 @@ sw/inc/grfatr.hxx sw/inc/helpids.h sw/inc/hfspacingitem.hxx sw/inc/hhcwrp.hxx -sw/inc/hintids.hxx sw/inc/hints.hxx sw/inc/htmltbl.hxx sw/inc/index.hxx @@ -13501,12 +13466,10 @@ sw/inc/pagedesc.hxx sw/inc/pagepreviewlayout.hxx sw/inc/pam.hxx sw/inc/paratr.hxx -sw/inc/pausethreadstarting.hxx sw/inc/poolfmt.hxx sw/inc/postithelper.hxx sw/inc/printdata.hxx sw/inc/proofreadingiterator.hxx -sw/inc/prtopt.hxx sw/inc/pvprtdat.hxx sw/inc/rdfhelper.hxx sw/inc/redline.hxx @@ -13519,19 +13482,13 @@ sw/inc/shellio.hxx sw/inc/shellres.hxx sw/inc/sortopt.hxx sw/inc/splargs.hxx -sw/inc/sw_primitivetypes2d.hxx sw/inc/swabstdlg.hxx sw/inc/swacorr.hxx sw/inc/swatrset.hxx sw/inc/swbaslnk.hxx sw/inc/swcalwrp.hxx -sw/inc/swcli.hxx -sw/inc/swcommands.h sw/inc/swcrsr.hxx sw/inc/swdbdata.hxx -sw/inc/swddetbl.hxx -sw/inc/swdll.hxx -sw/inc/swdllapi.h sw/inc/swerror.h sw/inc/swevent.hxx sw/inc/swfltopt.hxx @@ -13553,7 +13510,6 @@ sw/inc/tblenum.hxx sw/inc/tblsel.hxx sw/inc/tgrditem.hxx sw/inc/tox.hxx -sw/inc/toxe.hxx sw/inc/toxwrap.hxx sw/inc/txatbase.hxx sw/inc/txatritr.hxx @@ -13578,7 +13534,6 @@ sw/inc/unoidxcoll.hxx sw/inc/unomap.hxx sw/inc/unomid.h sw/inc/unoparagraph.hxx -sw/inc/unoprnms.hxx sw/inc/unoredline.hxx sw/inc/unoredlines.hxx sw/inc/unosett.hxx @@ -13600,18 +13555,14 @@ sw/qa/core/Test-BigPtrArray.cxx sw/qa/core/filters-test.cxx sw/qa/core/macros-test.cxx sw/qa/core/test_ToxLinkProcessor.cxx -sw/qa/core/test_ToxMiscTest.cxx sw/qa/core/test_ToxTextGenerator.cxx -sw/qa/core/test_ToxWhitespaceStripper.cxx sw/qa/core/uwriter.cxx sw/qa/extras/docbookexport/docbookexport.cxx sw/qa/extras/globalfilter/globalfilter.cxx -sw/qa/extras/htmlexport/htmlexport.cxx sw/qa/extras/htmlimport/htmlimport.cxx sw/qa/extras/mailmerge/mailmerge.cxx sw/qa/extras/odfexport/odfexport.cxx sw/qa/extras/odfimport/odfimport.cxx -sw/qa/extras/ooxmlexport/ooxmlencryption.cxx sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/qa/extras/ooxmlexport/ooxmlexport10.cxx sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -13627,11 +13578,9 @@ sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sw/qa/extras/ooxmlexport/ooxmlexport8.cxx sw/qa/extras/ooxmlexport/ooxmlexport9.cxx sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx -sw/qa/extras/ooxmlexport/ooxmllinks.cxx sw/qa/extras/ooxmlexport/ooxmlw14export.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx sw/qa/extras/tiledrendering/tiledrendering.cxx -sw/qa/extras/txtexport/txtexport.cxx sw/qa/extras/uiwriter/uiwriter.cxx sw/qa/extras/ww8export/ww8export.cxx sw/qa/extras/ww8export/ww8export2.cxx @@ -13666,7 +13615,6 @@ sw/source/core/access/accfrmobjslist.hxx sw/source/core/access/accgraphic.cxx sw/source/core/access/accgraphic.hxx sw/source/core/access/accheaderfooter.cxx -sw/source/core/access/accheaderfooter.hxx sw/source/core/access/acchyperlink.cxx sw/source/core/access/acchyperlink.hxx sw/source/core/access/acchypertextdata.cxx @@ -13696,25 +13644,19 @@ sw/source/core/access/textmarkuphelper.cxx sw/source/core/access/textmarkuphelper.hxx sw/source/core/attr/calbck.cxx sw/source/core/attr/cellatr.cxx -sw/source/core/attr/fmtfollowtextflow.cxx sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx sw/source/core/attr/format.cxx sw/source/core/attr/hints.cxx sw/source/core/attr/swatrset.cxx -sw/source/core/bastyp/SwSmartTagMgr.cxx sw/source/core/bastyp/bparr.cxx sw/source/core/bastyp/breakit.cxx sw/source/core/bastyp/calc.cxx -sw/source/core/bastyp/checkit.cxx sw/source/core/bastyp/index.cxx sw/source/core/bastyp/init.cxx -sw/source/core/bastyp/proofreadingiterator.cxx sw/source/core/bastyp/swcache.cxx sw/source/core/bastyp/swrect.cxx sw/source/core/bastyp/swregion.cxx -sw/source/core/bastyp/swtypes.cxx sw/source/core/bastyp/tabcol.cxx -sw/source/core/crsr/BlockCursor.cxx sw/source/core/crsr/BlockCursor.hxx sw/source/core/crsr/annotationmark.cxx sw/source/core/crsr/bookmrk.cxx @@ -13799,32 +13741,27 @@ sw/source/core/doc/rdfhelper.cxx sw/source/core/doc/sortopt.cxx sw/source/core/doc/swserv.cxx sw/source/core/doc/swstylemanager.cxx -sw/source/core/doc/swstylemanager.hxx sw/source/core/doc/tblafmt.cxx sw/source/core/doc/tblcpy.cxx sw/source/core/doc/tblrwcl.cxx sw/source/core/doc/visiturl.cxx sw/source/core/docnode/cancellablejob.cxx -sw/source/core/docnode/cancellablejob.hxx sw/source/core/docnode/finalthreadmanager.cxx sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/ndnotxt.cxx sw/source/core/docnode/ndnum.cxx sw/source/core/docnode/ndsect.cxx -sw/source/core/docnode/ndsect.hxx sw/source/core/docnode/ndtbl.cxx sw/source/core/docnode/ndtbl1.cxx sw/source/core/docnode/node.cxx sw/source/core/docnode/node2lay.cxx sw/source/core/docnode/nodes.cxx sw/source/core/docnode/observablethread.cxx -sw/source/core/docnode/pausethreadstarting.cxx sw/source/core/docnode/retrievedinputstreamdata.cxx sw/source/core/docnode/retrieveinputstream.cxx sw/source/core/docnode/retrieveinputstreamconsumer.cxx sw/source/core/docnode/section.cxx sw/source/core/docnode/swbaslnk.cxx -sw/source/core/docnode/swthreadjoiner.cxx sw/source/core/docnode/swthreadmanager.cxx sw/source/core/docnode/threadlistener.cxx sw/source/core/docnode/threadmanager.cxx @@ -13842,7 +13779,6 @@ sw/source/core/edit/edattr.cxx sw/source/core/edit/eddel.cxx sw/source/core/edit/edfcol.cxx sw/source/core/edit/edfld.cxx -sw/source/core/edit/edfldexp.cxx sw/source/core/edit/edfmt.cxx sw/source/core/edit/edglbldc.cxx sw/source/core/edit/edglss.cxx @@ -13886,9 +13822,6 @@ sw/source/core/graphic/grfatr.cxx sw/source/core/graphic/ndgrf.cxx sw/source/core/inc/DocumentChartDataProviderManager.hxx sw/source/core/inc/DocumentContentOperationsManager.hxx -sw/source/core/inc/DocumentDeviceManager.hxx -sw/source/core/inc/DocumentDrawModelManager.hxx -sw/source/core/inc/DocumentExternalDataManager.hxx sw/source/core/inc/DocumentFieldsManager.hxx sw/source/core/inc/DocumentLayoutManager.hxx sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -13898,25 +13831,19 @@ sw/source/core/inc/DocumentOutlineNodesManager.hxx sw/source/core/inc/DocumentRedlineManager.hxx sw/source/core/inc/DocumentSettingManager.hxx sw/source/core/inc/DocumentStateManager.hxx -sw/source/core/inc/DocumentStatisticsManager.hxx sw/source/core/inc/DocumentStylePoolManager.hxx -sw/source/core/inc/DocumentTimerManager.hxx sw/source/core/inc/GetMetricVal.hxx sw/source/core/inc/MarkManager.hxx -sw/source/core/inc/SwGrammarMarkUp.hxx sw/source/core/inc/SwPortionHandler.hxx sw/source/core/inc/SwUndoFmt.hxx sw/source/core/inc/SwUndoPageDesc.hxx -sw/source/core/inc/SwUndoTOXChange.hxx sw/source/core/inc/SwXMLBlockExport.hxx sw/source/core/inc/SwXMLBlockImport.hxx sw/source/core/inc/SwXMLTextBlocks.hxx sw/source/core/inc/SwXTextDefaults.hxx sw/source/core/inc/UndoAttribute.hxx -sw/source/core/inc/UndoBookmark.hxx sw/source/core/inc/UndoCore.hxx sw/source/core/inc/UndoDelete.hxx -sw/source/core/inc/UndoDraw.hxx sw/source/core/inc/UndoInsert.hxx sw/source/core/inc/UndoManager.hxx sw/source/core/inc/UndoNumbering.hxx @@ -13934,21 +13861,15 @@ sw/source/core/inc/bodyfrm.hxx sw/source/core/inc/bookmrk.hxx sw/source/core/inc/cellfrm.hxx sw/source/core/inc/cntfrm.hxx -sw/source/core/inc/colfrm.hxx sw/source/core/inc/crossrefbookmark.hxx sw/source/core/inc/dbg_lay.hxx sw/source/core/inc/dflyobj.hxx -sw/source/core/inc/docedt.hxx sw/source/core/inc/docfld.hxx -sw/source/core/inc/docredln.hxx sw/source/core/inc/docsort.hxx sw/source/core/inc/doctxm.hxx sw/source/core/inc/drawfont.hxx sw/source/core/inc/dumpfilter.hxx sw/source/core/inc/dview.hxx -sw/source/core/inc/environmentofanchoredobject.hxx -sw/source/core/inc/fefly.hxx -sw/source/core/inc/fieldhint.hxx sw/source/core/inc/flowfrm.hxx sw/source/core/inc/flyfrm.hxx sw/source/core/inc/flyfrms.hxx @@ -13967,23 +13888,18 @@ sw/source/core/inc/layfrm.hxx sw/source/core/inc/layouter.hxx sw/source/core/inc/movedfwdfrmsbyobjpos.hxx sw/source/core/inc/mvsave.hxx -sw/source/core/inc/node2lay.hxx -sw/source/core/inc/noteurl.hxx sw/source/core/inc/notxtfrm.hxx sw/source/core/inc/objectformatter.hxx sw/source/core/inc/observablethread.hxx sw/source/core/inc/pagedeschint.hxx sw/source/core/inc/pagefrm.hxx -sw/source/core/inc/paintfrm.hxx sw/source/core/inc/pamtyp.hxx sw/source/core/inc/prevwpage.hxx -sw/source/core/inc/ptqueue.hxx sw/source/core/inc/retrievedinputstreamdata.hxx sw/source/core/inc/retrieveinputstream.hxx sw/source/core/inc/retrieveinputstreamconsumer.hxx sw/source/core/inc/rolbck.hxx sw/source/core/inc/rootfrm.hxx -sw/source/core/inc/rowfrm.hxx sw/source/core/inc/scriptinfo.hxx sw/source/core/inc/sectfrm.hxx sw/source/core/inc/sortedobjs.hxx @@ -13991,8 +13907,6 @@ sw/source/core/inc/swblocks.hxx sw/source/core/inc/swcache.hxx sw/source/core/inc/swfntcch.hxx sw/source/core/inc/swfont.hxx -sw/source/core/inc/swselectionlist.hxx -sw/source/core/inc/swthreadjoiner.hxx sw/source/core/inc/swthreadmanager.hxx sw/source/core/inc/tabfrm.hxx sw/source/core/inc/tblrwcl.hxx @@ -14006,7 +13920,6 @@ sw/source/core/inc/txtfrm.hxx sw/source/core/inc/txttypes.hxx sw/source/core/inc/undoflystrattr.hxx sw/source/core/inc/unobookmark.hxx -sw/source/core/inc/unoevent.hxx sw/source/core/inc/unofield.hxx sw/source/core/inc/unoflatpara.hxx sw/source/core/inc/unofldmid.h @@ -14019,7 +13932,6 @@ sw/source/core/inc/unorefmark.hxx sw/source/core/inc/unosection.hxx sw/source/core/inc/unotextmarkup.hxx sw/source/core/inc/viewimp.hxx -sw/source/core/inc/visiturl.hxx sw/source/core/inc/wrong.hxx sw/source/core/layout/anchoreddrawobject.cxx sw/source/core/layout/anchoredobject.cxx @@ -14034,7 +13946,6 @@ sw/source/core/layout/fly.cxx sw/source/core/layout/flycnt.cxx sw/source/core/layout/flyincnt.cxx sw/source/core/layout/flylay.cxx -sw/source/core/layout/flypos.cxx sw/source/core/layout/frmtool.cxx sw/source/core/layout/ftnfrm.cxx sw/source/core/layout/hffrm.cxx @@ -14104,7 +14015,6 @@ sw/source/core/text/itrpaint.cxx sw/source/core/text/itrpaint.hxx sw/source/core/text/itrtxt.cxx sw/source/core/text/itrtxt.hxx -sw/source/core/text/noteurl.cxx sw/source/core/text/pordrop.hxx sw/source/core/text/porexp.cxx sw/source/core/text/porexp.hxx @@ -14123,19 +14033,16 @@ sw/source/core/text/porlin.hxx sw/source/core/text/pormulti.cxx sw/source/core/text/pormulti.hxx sw/source/core/text/porref.cxx -sw/source/core/text/porref.hxx sw/source/core/text/porrst.cxx sw/source/core/text/porrst.hxx sw/source/core/text/portab.hxx sw/source/core/text/portox.cxx -sw/source/core/text/portox.hxx sw/source/core/text/portxt.cxx sw/source/core/text/portxt.hxx sw/source/core/text/possiz.hxx sw/source/core/text/redlnitr.cxx sw/source/core/text/redlnitr.hxx sw/source/core/text/txtcache.cxx -sw/source/core/text/txtcache.hxx sw/source/core/text/txtdrop.cxx sw/source/core/text/txtfld.cxx sw/source/core/text/txtfly.cxx @@ -14163,7 +14070,6 @@ sw/source/core/txtnode/atrflyin.cxx sw/source/core/txtnode/atrftn.cxx sw/source/core/txtnode/atrref.cxx sw/source/core/txtnode/atrtox.cxx -sw/source/core/txtnode/chrfmt.cxx sw/source/core/txtnode/fmtatr2.cxx sw/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcap.cxx @@ -14177,7 +14083,6 @@ sw/source/core/txtnode/txatbase.cxx sw/source/core/txtnode/txatritr.cxx sw/source/core/txtnode/txtatr2.cxx sw/source/core/txtnode/txtedt.cxx -sw/source/core/undo/SwRewriter.cxx sw/source/core/undo/SwUndoField.cxx sw/source/core/undo/SwUndoFmt.cxx sw/source/core/undo/SwUndoPageDesc.cxx @@ -14246,22 +14151,17 @@ sw/source/core/view/viewpg.cxx sw/source/core/view/viewsh.cxx sw/source/core/view/vnew.cxx sw/source/core/view/vprint.cxx -sw/source/core/view/vprint.hxx sw/source/filter/ascii/ascatr.cxx sw/source/filter/ascii/parasc.cxx sw/source/filter/ascii/wrtasc.cxx -sw/source/filter/ascii/wrtasc.hxx sw/source/filter/basflt/docfact.cxx sw/source/filter/basflt/fltini.cxx sw/source/filter/basflt/fltshell.cxx sw/source/filter/basflt/iodetect.cxx sw/source/filter/basflt/shellio.cxx sw/source/filter/docx/swdocxreader.cxx -sw/source/filter/docx/swdocxreader.hxx sw/source/filter/html/SwAppletImpl.cxx sw/source/filter/html/css1atr.cxx -sw/source/filter/html/css1atr.hxx -sw/source/filter/html/css1kywd.hxx sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlbas.cxx sw/source/filter/html/htmlcss1.cxx @@ -14269,18 +14169,15 @@ sw/source/filter/html/htmlctxt.cxx sw/source/filter/html/htmldrawreader.cxx sw/source/filter/html/htmldrawwriter.cxx sw/source/filter/html/htmlfld.cxx -sw/source/filter/html/htmlfld.hxx sw/source/filter/html/htmlfldw.cxx sw/source/filter/html/htmlfly.cxx sw/source/filter/html/htmlfly.hxx sw/source/filter/html/htmlflyt.cxx sw/source/filter/html/htmlflywriter.cxx sw/source/filter/html/htmlform.cxx -sw/source/filter/html/htmlform.hxx sw/source/filter/html/htmlforw.cxx sw/source/filter/html/htmlftn.cxx sw/source/filter/html/htmlgrin.cxx -sw/source/filter/html/htmlnum.cxx sw/source/filter/html/htmlnum.hxx sw/source/filter/html/htmlnumreader.cxx sw/source/filter/html/htmlnumwriter.cxx @@ -14297,10 +14194,8 @@ sw/source/filter/html/swhtml.cxx sw/source/filter/html/swhtml.hxx sw/source/filter/html/wrthtml.cxx sw/source/filter/html/wrthtml.hxx -sw/source/filter/inc/fltini.hxx sw/source/filter/inc/fltshell.hxx sw/source/filter/inc/msfilter.hxx -sw/source/filter/inc/rtf.hxx sw/source/filter/inc/wrt_fn.hxx sw/source/filter/inc/wrtswtbl.hxx sw/source/filter/inc/wwstyles.hxx @@ -14308,9 +14203,6 @@ sw/source/filter/writer/writer.cxx sw/source/filter/writer/wrt_fn.cxx sw/source/filter/writer/wrtswtbl.cxx sw/source/filter/ww8/WW8FFData.cxx -sw/source/filter/ww8/WW8FFData.hxx -sw/source/filter/ww8/WW8FibData.cxx -sw/source/filter/ww8/WW8FibData.hxx sw/source/filter/ww8/WW8Sttbf.cxx sw/source/filter/ww8/WW8Sttbf.hxx sw/source/filter/ww8/WW8TableInfo.cxx @@ -14323,11 +14215,9 @@ sw/source/filter/ww8/docxexport.hxx sw/source/filter/ww8/docxexportfilter.cxx sw/source/filter/ww8/docxexportfilter.hxx sw/source/filter/ww8/docxfootnotes.hxx -sw/source/filter/ww8/docxhelper.hxx sw/source/filter/ww8/docxsdrexport.hxx sw/source/filter/ww8/escher.hxx sw/source/filter/ww8/fields.cxx -sw/source/filter/ww8/fields.hxx sw/source/filter/ww8/needed_cast.hxx sw/source/filter/ww8/sortedarray.hxx sw/source/filter/ww8/styles.cxx @@ -14369,7 +14259,6 @@ sw/source/filter/xml/swxml.cxx sw/source/filter/xml/wrtxml.cxx sw/source/filter/xml/wrtxml.hxx sw/source/filter/xml/xmlbrsh.cxx -sw/source/filter/xml/xmlbrshe.hxx sw/source/filter/xml/xmlbrshi.hxx sw/source/filter/xml/xmlexp.cxx sw/source/filter/xml/xmlexp.hxx @@ -14392,7 +14281,6 @@ sw/source/filter/xml/xmlithlp.hxx sw/source/filter/xml/xmlitmap.hxx sw/source/filter/xml/xmlitmpr.cxx sw/source/filter/xml/xmlmeta.cxx -sw/source/filter/xml/xmlscript.cxx sw/source/filter/xml/xmltble.cxx sw/source/filter/xml/xmltbli.cxx sw/source/filter/xml/xmltbli.hxx @@ -14425,41 +14313,29 @@ sw/source/ui/dbui/mailmergewizard.cxx sw/source/ui/dbui/mmaddressblockpage.cxx sw/source/ui/dbui/mmaddressblockpage.hxx sw/source/ui/dbui/mmdocselectpage.cxx -sw/source/ui/dbui/mmdocselectpage.hxx sw/source/ui/dbui/mmgreetingspage.cxx -sw/source/ui/dbui/mmgreetingspage.hxx sw/source/ui/dbui/mmlayoutpage.cxx sw/source/ui/dbui/mmlayoutpage.hxx sw/source/ui/dbui/mmoutputtypepage.cxx -sw/source/ui/dbui/mmoutputtypepage.hxx sw/source/ui/dbui/mmresultdialogs.cxx -sw/source/ui/dbui/selectdbtabledialog.cxx sw/source/ui/dbui/selectdbtabledialog.hxx -sw/source/ui/dialog/abstract.cxx -sw/source/ui/dialog/addrdlg.cxx sw/source/ui/dialog/ascfldlg.cxx sw/source/ui/dialog/docstdlg.cxx sw/source/ui/dialog/macassgn.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/dialog/swmessdialog.cxx -sw/source/ui/dialog/swuiexp.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/dialog/wordcountdialog.cxx sw/source/ui/dochdl/selglos.cxx sw/source/ui/envelp/envfmt.cxx -sw/source/ui/envelp/envfmt.hxx sw/source/ui/envelp/envlop1.cxx sw/source/ui/envelp/envprt.cxx -sw/source/ui/envelp/envprt.hxx sw/source/ui/envelp/label1.cxx sw/source/ui/envelp/labelexp.cxx sw/source/ui/envelp/labfmt.cxx -sw/source/ui/envelp/labfmt.hxx sw/source/ui/envelp/labprt.cxx -sw/source/ui/envelp/labprt.hxx sw/source/ui/envelp/mailmrge.cxx -sw/source/ui/envelp/swuilabimp.hxx sw/source/ui/fldui/DropDownFieldDialog.cxx sw/source/ui/fldui/changedb.cxx sw/source/ui/fldui/flddb.cxx @@ -14485,16 +14361,11 @@ sw/source/ui/frmdlg/column.cxx sw/source/ui/frmdlg/cption.cxx sw/source/ui/frmdlg/frmdlg.cxx sw/source/ui/frmdlg/frmpage.cxx -sw/source/ui/frmdlg/pattern.cxx -sw/source/ui/frmdlg/uiborder.cxx sw/source/ui/frmdlg/wrap.cxx sw/source/ui/inc/mmresultdialogs.hxx -sw/source/ui/inc/swuiexp.hxx sw/source/ui/index/cntex.cxx sw/source/ui/index/cnttab.cxx -sw/source/ui/index/multmrk.cxx sw/source/ui/index/swuiidxmrk.cxx -sw/source/ui/misc/bookmark.cxx sw/source/ui/misc/docfnote.cxx sw/source/ui/misc/glosbib.cxx sw/source/ui/misc/glossary.cxx @@ -14509,26 +14380,20 @@ sw/source/ui/misc/srtdlg.cxx sw/source/ui/misc/swmodalredlineacceptdlg.cxx sw/source/ui/misc/titlepage.cxx sw/source/ui/table/colwd.cxx -sw/source/ui/table/convert.cxx sw/source/ui/table/instable.cxx -sw/source/ui/table/mergetbl.cxx sw/source/ui/table/rowht.cxx -sw/source/ui/table/splittbl.cxx sw/source/ui/table/tabledlg.cxx sw/source/ui/table/tautofmt.cxx sw/source/ui/uno/swdetect.cxx sw/source/ui/uno/swdetect.hxx sw/source/ui/utlui/swrenamexnameddlg.cxx sw/source/ui/vba/vbaaddin.cxx -sw/source/ui/vba/vbaaddin.hxx sw/source/ui/vba/vbaaddins.cxx -sw/source/ui/vba/vbaaddins.hxx sw/source/ui/vba/vbaapplication.cxx sw/source/ui/vba/vbaapplication.hxx sw/source/ui/vba/vbaautotextentry.cxx sw/source/ui/vba/vbaautotextentry.hxx sw/source/ui/vba/vbabookmark.cxx -sw/source/ui/vba/vbabookmark.hxx sw/source/ui/vba/vbabookmarks.cxx sw/source/ui/vba/vbabookmarks.hxx sw/source/ui/vba/vbaborders.cxx @@ -14564,15 +14429,12 @@ sw/source/ui/vba/vbaframe.hxx sw/source/ui/vba/vbaframes.cxx sw/source/ui/vba/vbaframes.hxx sw/source/ui/vba/vbaglobals.cxx -sw/source/ui/vba/vbaglobals.hxx sw/source/ui/vba/vbaheaderfooter.cxx sw/source/ui/vba/vbaheaderfooter.hxx sw/source/ui/vba/vbaheaderfooterhelper.cxx -sw/source/ui/vba/vbaheaderfooterhelper.hxx sw/source/ui/vba/vbaheadersfooters.cxx sw/source/ui/vba/vbaheadersfooters.hxx sw/source/ui/vba/vbainformationhelper.cxx -sw/source/ui/vba/vbainformationhelper.hxx sw/source/ui/vba/vbalistformat.cxx sw/source/ui/vba/vbalistformat.hxx sw/source/ui/vba/vbalistgalleries.cxx @@ -14596,7 +14458,6 @@ sw/source/ui/vba/vbapagesetup.hxx sw/source/ui/vba/vbapalette.cxx sw/source/ui/vba/vbapalette.hxx sw/source/ui/vba/vbapane.cxx -sw/source/ui/vba/vbapane.hxx sw/source/ui/vba/vbapanes.cxx sw/source/ui/vba/vbapanes.hxx sw/source/ui/vba/vbaparagraph.cxx @@ -14640,7 +14501,6 @@ sw/source/ui/vba/vbatables.hxx sw/source/ui/vba/vbatablesofcontents.cxx sw/source/ui/vba/vbatablesofcontents.hxx sw/source/ui/vba/vbatabstop.cxx -sw/source/ui/vba/vbatabstop.hxx sw/source/ui/vba/vbatabstops.cxx sw/source/ui/vba/vbatabstops.hxx sw/source/ui/vba/vbatemplate.cxx @@ -14658,7 +14518,6 @@ sw/source/ui/vba/vbawrapformat.hxx sw/source/ui/vba/wordvbahelper.cxx sw/source/ui/vba/wordvbahelper.hxx sw/source/uibase/app/appenv.cxx -sw/source/uibase/app/appenv.hxx sw/source/uibase/app/apphdl.cxx sw/source/uibase/app/applab.cxx sw/source/uibase/app/appopt.cxx @@ -14670,7 +14529,6 @@ sw/source/uibase/app/docst.cxx sw/source/uibase/app/docstyle.cxx sw/source/uibase/app/mainwn.cxx sw/source/uibase/app/swdll.cxx -sw/source/uibase/app/swdllimpl.hxx sw/source/uibase/app/swmodul1.cxx sw/source/uibase/app/swmodule.cxx sw/source/uibase/app/swwait.cxx @@ -14739,28 +14597,19 @@ sw/source/uibase/fldui/fldmgr.cxx sw/source/uibase/fldui/fldwrap.cxx sw/source/uibase/fldui/xfldui.cxx sw/source/uibase/frmdlg/colex.cxx -sw/source/uibase/frmdlg/colmgr.cxx sw/source/uibase/frmdlg/frmmgr.cxx sw/source/uibase/globdoc/globdoc.cxx -sw/source/uibase/inc/DashedLine.hxx sw/source/uibase/inc/DropDownFieldDialog.hxx sw/source/uibase/inc/FrameControl.hxx sw/source/uibase/inc/FrameControlsManager.hxx sw/source/uibase/inc/HeaderFooterWin.hxx sw/source/uibase/inc/PageBreakWin.hxx -sw/source/uibase/inc/SidebarWindowsConsts.hxx sw/source/uibase/inc/SwSpellDialogChildWindow.hxx sw/source/uibase/inc/SwXFilterOptions.hxx -sw/source/uibase/inc/abstract.hxx sw/source/uibase/inc/annotsh.hxx -sw/source/uibase/inc/ascfldlg.hxx -sw/source/uibase/inc/barcfg.hxx sw/source/uibase/inc/basesh.hxx -sw/source/uibase/inc/beziersh.hxx sw/source/uibase/inc/bmpwin.hxx -sw/source/uibase/inc/bookctrl.hxx sw/source/uibase/inc/bookmark.hxx -sw/source/uibase/inc/break.hxx sw/source/uibase/inc/caption.hxx sw/source/uibase/inc/cfgitems.hxx sw/source/uibase/inc/changedb.hxx @@ -14774,19 +14623,13 @@ sw/source/uibase/inc/colmgr.hxx sw/source/uibase/inc/column.hxx sw/source/uibase/inc/conarc.hxx sw/source/uibase/inc/concustomshape.hxx -sw/source/uibase/inc/condedit.hxx sw/source/uibase/inc/conform.hxx -sw/source/uibase/inc/conpoly.hxx sw/source/uibase/inc/conrect.hxx sw/source/uibase/inc/content.hxx sw/source/uibase/inc/conttree.hxx -sw/source/uibase/inc/convert.hxx -sw/source/uibase/inc/cption.hxx sw/source/uibase/inc/dbconfig.hxx sw/source/uibase/inc/dbinsdlg.hxx sw/source/uibase/inc/dbtree.hxx -sw/source/uibase/inc/dbui.hxx -sw/source/uibase/inc/docfnote.hxx sw/source/uibase/inc/docstdlg.hxx sw/source/uibase/inc/drawbase.hxx sw/source/uibase/inc/drawsh.hxx @@ -14794,84 +14637,64 @@ sw/source/uibase/inc/drformsh.hxx sw/source/uibase/inc/drpcps.hxx sw/source/uibase/inc/drwbassh.hxx sw/source/uibase/inc/drwtxtsh.hxx -sw/source/uibase/inc/dselect.hxx sw/source/uibase/inc/edtwin.hxx sw/source/uibase/inc/envimg.hxx -sw/source/uibase/inc/envlop.hxx sw/source/uibase/inc/fldedt.hxx sw/source/uibase/inc/fldmgr.hxx sw/source/uibase/inc/fldtdlg.hxx sw/source/uibase/inc/fldwrap.hxx sw/source/uibase/inc/fontcfg.hxx -sw/source/uibase/inc/formatclipboard.hxx sw/source/uibase/inc/frmdlg.hxx sw/source/uibase/inc/frmmgr.hxx sw/source/uibase/inc/frmpage.hxx sw/source/uibase/inc/frmsh.hxx -sw/source/uibase/inc/glosbib.hxx sw/source/uibase/inc/glosdoc.hxx sw/source/uibase/inc/gloshdl.hxx sw/source/uibase/inc/gloslst.hxx sw/source/uibase/inc/glossary.hxx sw/source/uibase/inc/glshell.hxx -sw/source/uibase/inc/grfsh.hxx sw/source/uibase/inc/hyp.hxx sw/source/uibase/inc/idxmrk.hxx sw/source/uibase/inc/imaildsplistener.hxx -sw/source/uibase/inc/initui.hxx sw/source/uibase/inc/inpdlg.hxx sw/source/uibase/inc/inputwin.hxx sw/source/uibase/inc/insfnote.hxx -sw/source/uibase/inc/instable.hxx sw/source/uibase/inc/javaedit.hxx sw/source/uibase/inc/label.hxx sw/source/uibase/inc/labelcfg.hxx sw/source/uibase/inc/labimg.hxx sw/source/uibase/inc/labrec.hxx sw/source/uibase/inc/langhelper.hxx -sw/source/uibase/inc/listsh.hxx -sw/source/uibase/inc/macassgn.hxx sw/source/uibase/inc/mailconfigpage.hxx -sw/source/uibase/inc/maildispatcher.hxx sw/source/uibase/inc/mailmergehelper.hxx sw/source/uibase/inc/mailmergewizard.hxx sw/source/uibase/inc/mailmrge.hxx -sw/source/uibase/inc/mediash.hxx -sw/source/uibase/inc/mergetbl.hxx sw/source/uibase/inc/mmconfigitem.hxx -sw/source/uibase/inc/multmrk.hxx sw/source/uibase/inc/navicfg.hxx sw/source/uibase/inc/navicont.hxx sw/source/uibase/inc/navipi.hxx sw/source/uibase/inc/navmgr.hxx -sw/source/uibase/inc/navsh.hxx sw/source/uibase/inc/num.hxx sw/source/uibase/inc/numberingtypelistbox.hxx sw/source/uibase/inc/numfmtlb.hxx sw/source/uibase/inc/numpara.hxx sw/source/uibase/inc/numprevw.hxx -sw/source/uibase/inc/olesh.hxx sw/source/uibase/inc/olmenu.hxx sw/source/uibase/inc/optcomp.hxx sw/source/uibase/inc/optload.hxx sw/source/uibase/inc/optpage.hxx sw/source/uibase/inc/outline.hxx -sw/source/uibase/inc/pardlg.hxx sw/source/uibase/inc/pgfnote.hxx sw/source/uibase/inc/pggrid.hxx sw/source/uibase/inc/prcntfld.hxx sw/source/uibase/inc/pview.hxx sw/source/uibase/inc/redlndlg.hxx sw/source/uibase/inc/regionsw.hxx -sw/source/uibase/inc/rowht.hxx sw/source/uibase/inc/scroll.hxx sw/source/uibase/inc/selglos.hxx -sw/source/uibase/inc/sharedconnection.hxx sw/source/uibase/inc/shdwcrsr.hxx -sw/source/uibase/inc/splittbl.hxx sw/source/uibase/inc/srcedtw.hxx sw/source/uibase/inc/srcview.hxx -sw/source/uibase/inc/srtdlg.hxx sw/source/uibase/inc/swcont.hxx sw/source/uibase/inc/swdtflvr.hxx sw/source/uibase/inc/swmessdialog.hxx @@ -14885,17 +14708,12 @@ sw/source/uibase/inc/swuiidxmrk.hxx sw/source/uibase/inc/swuipardlg.hxx sw/source/uibase/inc/swwrtshitem.hxx sw/source/uibase/inc/syncbtn.hxx -sw/source/uibase/inc/tabledlg.hxx sw/source/uibase/inc/tablemgr.hxx sw/source/uibase/inc/tabsh.hxx sw/source/uibase/inc/tautofmt.hxx -sw/source/uibase/inc/tblnumfm.hxx sw/source/uibase/inc/textsh.hxx -sw/source/uibase/inc/titlepage.hxx sw/source/uibase/inc/tmpdlg.hxx -sw/source/uibase/inc/tmplctrl.hxx sw/source/uibase/inc/toxmgr.hxx -sw/source/uibase/inc/uiborder.hxx sw/source/uibase/inc/uiitems.hxx sw/source/uibase/inc/uinums.hxx sw/source/uibase/inc/uiobject.hxx @@ -14909,20 +14727,10 @@ sw/source/uibase/inc/unotools.hxx sw/source/uibase/inc/unotxvw.hxx sw/source/uibase/inc/usrpref.hxx sw/source/uibase/inc/viewlayoutctrl.hxx -sw/source/uibase/inc/wformsh.hxx -sw/source/uibase/inc/wfrmsh.hxx -sw/source/uibase/inc/wgrfsh.hxx -sw/source/uibase/inc/wlistsh.hxx -sw/source/uibase/inc/wolesh.hxx -sw/source/uibase/inc/wordcountctrl.hxx sw/source/uibase/inc/wordcountdialog.hxx sw/source/uibase/inc/workctrl.hxx sw/source/uibase/inc/wrap.hxx sw/source/uibase/inc/wrtsh.hxx -sw/source/uibase/inc/wtabsh.hxx -sw/source/uibase/inc/wtextsh.hxx -sw/source/uibase/inc/wview.hxx -sw/source/uibase/inc/zoomctrl.hxx sw/source/uibase/index/idxmrk.cxx sw/source/uibase/index/toxmgr.cxx sw/source/uibase/lingu/hhcwrp.cxx @@ -14932,15 +14740,12 @@ sw/source/uibase/lingu/sdrhhcwrap.cxx sw/source/uibase/lingu/sdrhhcwrap.hxx sw/source/uibase/misc/glosdoc.cxx sw/source/uibase/misc/glshell.cxx -sw/source/uibase/misc/numberingtypelistbox.cxx sw/source/uibase/misc/redlndlg.cxx -sw/source/uibase/ribbar/conarc.cxx sw/source/uibase/ribbar/concustomshape.cxx sw/source/uibase/ribbar/conform.cxx sw/source/uibase/ribbar/conpoly.cxx sw/source/uibase/ribbar/conrect.cxx sw/source/uibase/ribbar/drawbase.cxx -sw/source/uibase/ribbar/dselect.cxx sw/source/uibase/ribbar/inputwin.cxx sw/source/uibase/ribbar/workctrl.cxx sw/source/uibase/shells/annotsh.cxx @@ -14958,7 +14763,6 @@ sw/source/uibase/shells/grfshex.cxx sw/source/uibase/shells/langhelper.cxx sw/source/uibase/shells/listsh.cxx sw/source/uibase/shells/mediash.cxx -sw/source/uibase/shells/navsh.cxx sw/source/uibase/shells/olesh.cxx sw/source/uibase/shells/tabsh.cxx sw/source/uibase/shells/textdrw.cxx @@ -14972,7 +14776,6 @@ sw/source/uibase/shells/txtattr.cxx sw/source/uibase/shells/txtcrsr.cxx sw/source/uibase/shells/txtnum.cxx sw/source/uibase/sidebar/PageColumnControl.cxx -sw/source/uibase/sidebar/PageColumnControl.hxx sw/source/uibase/sidebar/PageColumnPopup.cxx sw/source/uibase/sidebar/PageFooterPanel.cxx sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -14988,7 +14791,6 @@ sw/source/uibase/sidebar/PageOrientationControl.cxx sw/source/uibase/sidebar/PageOrientationControl.hxx sw/source/uibase/sidebar/PageOrientationPopup.cxx sw/source/uibase/sidebar/PageSizeControl.cxx -sw/source/uibase/sidebar/PageSizeControl.hxx sw/source/uibase/sidebar/PageSizePopup.cxx sw/source/uibase/sidebar/PageStylesPanel.cxx sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -15031,8 +14833,6 @@ sw/source/uibase/uno/SwXDocumentSettings.hxx sw/source/uibase/uno/SwXFilterOptions.cxx sw/source/uibase/uno/dlelstnr.cxx sw/source/uibase/uno/unoatxt.cxx -sw/source/uibase/uno/unodefaults.cxx -sw/source/uibase/uno/unodefaults.hxx sw/source/uibase/uno/unodispatch.cxx sw/source/uibase/uno/unodoc.cxx sw/source/uibase/uno/unomailmerge.cxx @@ -15047,12 +14847,10 @@ sw/source/uibase/utlui/condedit.cxx sw/source/uibase/utlui/content.cxx sw/source/uibase/utlui/glbltree.cxx sw/source/uibase/utlui/gloslst.cxx -sw/source/uibase/utlui/gotodlg.cxx sw/source/uibase/utlui/initui.cxx sw/source/uibase/utlui/navicfg.cxx sw/source/uibase/utlui/navipi.cxx sw/source/uibase/utlui/numfmtlb.cxx -sw/source/uibase/utlui/prcntfld.cxx sw/source/uibase/utlui/shdwcrsr.cxx sw/source/uibase/utlui/tmplctrl.cxx sw/source/uibase/utlui/uiitems.cxx diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx index c25d5fbdd72a..c936bea5c6f0 100644 --- a/sw/inc/HandleAnchorNodeChg.hxx +++ b/sw/inc/HandleAnchorNodeChg.hxx @@ -45,9 +45,9 @@ public: optional parameter - pointer to a fly frame of the given fly frame format, which isn't deleted, if re-creation of fly frames is necessary. */ - SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, - const SwFormatAnchor& _rNewAnchorFormat, - SwFlyFrame const * _pKeepThisFlyFrame = nullptr ); + SwHandleAnchorNodeChg(SwFlyFrameFormat& _rFlyFrameFormat, + const SwFormatAnchor& _rNewAnchorFormat, + SwFlyFrame const* _pKeepThisFlyFrame = nullptr); /** calls <SwFlyFrameFormat::MakeFrames>, if re-creation of fly frames is necessary. */ ~SwHandleAnchorNodeChg() COVERITY_NOEXCEPT_FALSE; @@ -64,8 +64,8 @@ private: SwWrtShell* mpWrtShell; - SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) = delete; - void operator=( const SwHandleAnchorNodeChg ) = delete; + SwHandleAnchorNodeChg(const SwHandleAnchorNodeChg&) = delete; + void operator=(const SwHandleAnchorNodeChg) = delete; }; #endif diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx index 59a7f817ab60..dabcc44f1608 100644 --- a/sw/inc/IDocumentChartDataProviderAccess.hxx +++ b/sw/inc/IDocumentChartDataProviderAccess.hxx @@ -29,25 +29,24 @@ class SwChartLockController_Helper; class IDocumentChartDataProviderAccess { public: - /** returns or creates the data-provider for chart */ - virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const = 0; + virtual SwChartDataProvider* GetChartDataProvider(bool bCreate = false) const = 0; /** calls createInternalDataProvider for all charts using the specified table */ - virtual void CreateChartInternalDataProviders( const SwTable *pTable ) = 0; + virtual void CreateChartInternalDataProviders(const SwTable* pTable) = 0; /** returns chart controller helper that is used to lock/unlock all charts when relevant parts of tables are changed */ - virtual SwChartLockController_Helper & GetChartControllerHelper() = 0; + virtual SwChartLockController_Helper& GetChartControllerHelper() = 0; protected: - virtual ~IDocumentChartDataProviderAccess() {}; + virtual ~IDocumentChartDataProviderAccess(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx index c1c1bdce4ab9..bbddd4e69a8a 100644 --- a/sw/inc/IDocumentDeviceAccess.hxx +++ b/sw/inc/IDocumentDeviceAccess.hxx @@ -31,7 +31,6 @@ class OutputDevice; class IDocumentDeviceAccess { public: - /** Return the printer set at the document. @param bCreate @@ -40,7 +39,7 @@ public: @returns the printer set at the document. */ - virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const = 0; + virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate) const = 0; /** Set the printer at the document. @@ -53,7 +52,9 @@ public: @param bCallPrtDataChanged [in] if set, triggers all necessary invalidations. */ - virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) = 0; + virtual void setPrinter(/*[in]*/ SfxPrinter* pP, /*[in]*/ bool bDeleteOld, + /*[in]*/ bool bCallPrtDataChanged) + = 0; /** Return the virtual device set at the document. @@ -63,7 +64,7 @@ public: @returns the virtual device set at the document. */ - virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const = 0; + virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate) const = 0; /** Sets the current virtual device @@ -73,7 +74,7 @@ public: The old virtual device will be deleted. Triggers all necessary invalidations. */ - virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) = 0; + virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd) = 0; /** Returns the current reference device @@ -83,7 +84,7 @@ public: @returns the current reference device */ - virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const = 0; + virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate) const = 0; /** Sets the type of the reference device used for formatting the document @@ -94,7 +95,7 @@ public: @param bNewHiRes [in] if set, the virtual device will be the HiRes virtual device */ - virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) = 0; + virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes) = 0; /** Returns the Jobsetup @@ -108,14 +109,14 @@ public: @param rJobSetup [in] the new Jobsetup. */ - virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup ) = 0; + virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup) = 0; /** Returns the PrintData @returns the current PrintData */ - virtual const SwPrintData & getPrintData() const = 0; + virtual const SwPrintData& getPrintData() const = 0; /** Sets the PrintData @@ -125,7 +126,7 @@ public: virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData) = 0; protected: - virtual ~IDocumentDeviceAccess() {}; + virtual ~IDocumentDeviceAccess(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx index b631317a02e8..06e0161e1921 100644 --- a/sw/inc/IDocumentDrawModelAccess.hxx +++ b/sw/inc/IDocumentDrawModelAccess.hxx @@ -30,7 +30,6 @@ class SvxSearchItem; class IDocumentDrawModelAccess { public: - /** Draw Model and id accessors */ virtual const SwDrawModel* GetDrawModel() const = 0; @@ -45,7 +44,7 @@ public: virtual SdrLayerID GetInvisibleControlsId() const = 0; /** method to notify drawing page view about the invisible layers */ - virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) = 0; + virtual void NotifyInvisibleLayers(SdrPageView& _rSdrPageView) = 0; /** method to determine, if a layer ID belongs to the visible ones. Note: If given layer ID is unknown, method asserts and returns <false>. @@ -56,7 +55,7 @@ public: @return bool, indicating, if given layer ID belongs to the visible ones. */ - virtual bool IsVisibleLayerId( SdrLayerID _nLayerId ) const = 0; + virtual bool IsVisibleLayerId(SdrLayerID _nLayerId) const = 0; /** method to determine, if the corresponding invisible layer ID for a visible one. @@ -69,14 +68,13 @@ public: @return sal_Int8, invisible layer ID corresponding to given layer ID */ - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId ) = 0; + virtual SdrLayerID GetInvisibleLayerIdByVisibleOne(SdrLayerID _nVisibleLayerId) = 0; /// Searches text in shapes anchored inside rPaM. virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) = 0; protected: - - virtual ~IDocumentDrawModelAccess() {}; + virtual ~IDocumentDrawModelAccess(){}; }; #endif diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index c7dd852d3d23..8273954f4a71 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -26,7 +26,10 @@ #include <memory> class SvxForbiddenCharactersTable; -namespace com::sun::star::i18n { struct ForbiddenCharacters; } +namespace com::sun::star::i18n +{ +struct ForbiddenCharacters; +} enum class CharCompressType; enum class DocumentSettingId @@ -111,11 +114,11 @@ enum class DocumentSettingId FRAME_AUTOWIDTH_WITH_MORE_PARA, }; - /** Provides access to settings of a document +/** Provides access to settings of a document */ - class IDocumentSettingAccess - { - public: +class IDocumentSettingAccess +{ +public: /** Return the specified document setting. @param id @@ -151,7 +154,7 @@ enum class DocumentSettingId a list of forbidden characters. */ virtual const css::i18n::ForbiddenCharacters* - getForbiddenCharacters(/*[in]*/ LanguageType nLang, /*[in]*/ bool bLocaleData ) const = 0; + getForbiddenCharacters(/*[in]*/ LanguageType nLang, /*[in]*/ bool bLocaleData) const = 0; /** Set the forbidden characters. @@ -161,8 +164,10 @@ enum class DocumentSettingId @param rForbiddenCharacters [in] the new list of forbidden characters for language lang. */ - virtual void setForbiddenCharacters(/*[in]*/ LanguageType nLang, - /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0; + virtual void + setForbiddenCharacters(/*[in]*/ LanguageType nLang, + /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters) + = 0; /** Get the forbidden character table and creates one if necessary. @@ -176,7 +181,8 @@ enum class DocumentSettingId @returns the forbidden characters table. */ - virtual const std::shared_ptr<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const = 0; + virtual const std::shared_ptr<SvxForbiddenCharactersTable>& + getForbiddenCharacterTable() const = 0; /** Get the current link update mode. @@ -187,14 +193,14 @@ enum class DocumentSettingId @returns the current link update mode. */ - virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const = 0; + virtual sal_uInt16 getLinkUpdateMode(/*[in]*/ bool bGlobalSettings) const = 0; /** Set the current link update mode. @param nMode [in] the new link update mode. */ - virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) = 0; + virtual void setLinkUpdateMode(/*[in]*/ sal_uInt16 nMode) = 0; /** Get the current field update mode. @@ -205,14 +211,14 @@ enum class DocumentSettingId @returns the current field update mode. */ - virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0; + virtual SwFieldUpdateFlags getFieldUpdateFlags(/*[in]*/ bool bGlobalSettings) const = 0; /** Set the current field update mode. @param nMode [in] the new field update mode. */ - virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags nMode ) = 0; + virtual void setFieldUpdateFlags(/*[in]*/ SwFieldUpdateFlags nMode) = 0; /** Get the character compression type for Asian characters. @@ -226,7 +232,7 @@ enum class DocumentSettingId @param nMode [in] the new character compression type. */ - virtual void setCharacterCompressionType( /*[in]*/CharCompressType nType ) = 0; + virtual void setCharacterCompressionType(/*[in]*/ CharCompressType nType) = 0; /** Get the n32DummyCompatibilityOptions1 */ @@ -234,7 +240,7 @@ enum class DocumentSettingId /** Set the n32DummyCompatibilityOptions1 */ - virtual void Setn32DummyCompatibilityOptions1( const sal_uInt32 CompatibilityOptions1 ) = 0; + virtual void Setn32DummyCompatibilityOptions1(const sal_uInt32 CompatibilityOptions1) = 0; /** Get the n32DummyCompatibilityOptions2 */ @@ -242,11 +248,11 @@ enum class DocumentSettingId /** Set the n32DummyCompatibilityOptions2 */ - virtual void Setn32DummyCompatibilityOptions2( const sal_uInt32 CompatibilityOptions2 ) = 0; + virtual void Setn32DummyCompatibilityOptions2(const sal_uInt32 CompatibilityOptions2) = 0; protected: - virtual ~IDocumentSettingAccess() {}; - }; + virtual ~IDocumentSettingAccess(){}; +}; #endif // INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index 6374842bdb0f..4f9ef9532d22 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -37,7 +37,7 @@ public: virtual bool IsInCallModified() const = 0; - virtual bool IsUpdateExpField() const = 0; + virtual bool IsUpdateExpField() const = 0; virtual bool IsNewDoc() const = 0; @@ -49,7 +49,7 @@ public: virtual void SetEnableSetModified(bool bEnableSetModified) = 0; protected: - virtual ~IDocumentState() {}; + virtual ~IDocumentState(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTSTATE_HXX diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx index 9f953d485fd9..ed905c2b6937 100644 --- a/sw/inc/IDocumentStatistics.hxx +++ b/sw/inc/IDocumentStatistics.hxx @@ -27,7 +27,6 @@ struct SwDocStat; class IDocumentStatistics { public: - /** DocInfo has changed (notify via DocShell): make required fields update. */ @@ -36,7 +35,7 @@ public: /** Document - Statistics */ /// Returns a reference to the existing document statistics - virtual const SwDocStat &GetDocStat() const = 0; + virtual const SwDocStat& GetDocStat() const = 0; /** * Updates the document statistics if the document has been @@ -45,7 +44,7 @@ public: * and potentially trigger a timeout to complete the work. * \param bFields if stat. fields should be updated */ - virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool bFields) = 0; + virtual const SwDocStat& GetUpdatedDocStat(bool bCompleteAsync, bool bFields) = 0; /// Set the document statistics virtual void SetDocStat(const SwDocStat& rStat) = 0; @@ -59,7 +58,7 @@ public: virtual void UpdateDocStat(bool bCompleteAsync, bool bFields) = 0; protected: - virtual ~IDocumentStatistics() {}; + virtual ~IDocumentStatistics(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx index c56104b32164..26713ab470b9 100644 --- a/sw/inc/IDocumentStylePoolAccess.hxx +++ b/sw/inc/IDocumentStylePoolAccess.hxx @@ -34,38 +34,37 @@ class SwPageDesc; class IDocumentStylePoolAccess { public: - /** Return "Auto-Collection with ID. Create, if it does not yet exist. If string pointer is defined request only description of attributes, do not create style sheet! */ - virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; + virtual SwTextFormatColl* GetTextCollFromPool(sal_uInt16 nId, bool bRegardLanguage = true) = 0; /** Return required automatic format base class. */ - virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) = 0; + virtual SwFormat* GetFormatFromPool(sal_uInt16 nId) = 0; /** Return required automatic format. */ - virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) = 0; + virtual SwFrameFormat* GetFrameFormatFromPool(sal_uInt16 nId) = 0; - virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) = 0; + virtual SwCharFormat* GetCharFormatFromPool(sal_uInt16 nId) = 0; /** Return required automatic page style. */ - virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; + virtual SwPageDesc* GetPageDescFromPool(sal_uInt16 nId, bool bRegardLanguage = true) = 0; - virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) = 0; + virtual SwNumRule* GetNumRuleFromPool(sal_uInt16 nId) = 0; /** Check whether this "auto-collection" is used in document. */ - virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const = 0; - virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const = 0; - virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0; + virtual bool IsPoolTextCollUsed(sal_uInt16 nId) const = 0; + virtual bool IsPoolFormatUsed(sal_uInt16 nId) const = 0; + virtual bool IsPoolPageDescUsed(sal_uInt16 nId) const = 0; protected: - virtual ~IDocumentStylePoolAccess() {}; + virtual ~IDocumentStylePoolAccess(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx index f3e2738485af..c67115f251b8 100644 --- a/sw/inc/IDocumentTimerAccess.hxx +++ b/sw/inc/IDocumentTimerAccess.hxx @@ -66,7 +66,7 @@ public: virtual bool IsDocIdle() const = 0; protected: - virtual ~IDocumentTimerAccess() {}; + virtual ~IDocumentTimerAccess(){}; }; #endif // INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx index 83d0c59c83b9..68be355807ef 100644 --- a/sw/inc/IGrammarContact.hxx +++ b/sw/inc/IGrammarContact.hxx @@ -29,21 +29,20 @@ class SwGrammarMarkUp; class IGrammarContact { public: - /** Update cursor position reacts to a change of the current input cursor As long as the cursor in inside a paragraph, the grammar checking does not show new grammar faults. When the cursor leaves the paragraph, these faults are shown. @returns void */ - virtual void updateCursorPosition( const SwPosition& rNewPos ) = 0; + virtual void updateCursorPosition(const SwPosition& rNewPos) = 0; /** getGrammarCheck checks if the given text node is blocked by the current cursor if not, the normal markup list is returned if blocked, it will return a markup list "proxy" @returns a markup list (grammar) for the given SwTextNode */ - virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) = 0; + virtual SwGrammarMarkUp* getGrammarCheck(SwTextNode& rTextNode, bool bCreate) = 0; /** finishGrammarCheck() has to be called if a grammar checking has been completed for a text node. If this text node has not been hidden by the current proxy list @@ -51,7 +50,7 @@ public: repaint will be triggered by a timer @returns void */ - virtual void finishGrammarCheck( SwTextNode& rTextNode ) = 0; + virtual void finishGrammarCheck(SwTextNode& rTextNode) = 0; public: virtual ~IGrammarContact() {} @@ -67,12 +66,12 @@ IGrammarContact* createGrammarContact(); /** getGrammarContact() delivers the grammar contact of the document (for a given textnode) @returns grammar contact */ -IGrammarContact* getGrammarContact( const SwTextNode& ); +IGrammarContact* getGrammarContact(const SwTextNode&); /** finishGrammarCheck() calls the same function of the grammar contact of the document (for a given textnode) @returns void */ -void finishGrammarCheck( SwTextNode& ); +void finishGrammarCheck(SwTextNode&); #endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx index e1c8085ae7ea..991e8bbfacb2 100644 --- a/sw/inc/IShellCursorSupplier.hxx +++ b/sw/inc/IShellCursorSupplier.hxx @@ -22,8 +22,8 @@ class SwPaM; -namespace sw { - +namespace sw +{ /** The Undo actions need to create new Shell cursors. Just creating new SwPaMs in the Undo actions is not sufficient, because only Shell cursors are corrected by doccorr.cxx. @@ -31,9 +31,9 @@ namespace sw { class IShellCursorSupplier { public: - virtual ~IShellCursorSupplier() { } - virtual SwPaM & CreateNewShellCursor() = 0; - virtual SwPaM & GetCurrentShellCursor() = 0; + virtual ~IShellCursorSupplier() {} + virtual SwPaM& CreateNewShellCursor() = 0; + virtual SwPaM& GetCurrentShellCursor() = 0; }; } // namespace sw diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx index 784f75786cab..843c14490143 100644 --- a/sw/inc/PageColumnPopup.hxx +++ b/sw/inc/PageColumnPopup.hxx @@ -29,17 +29,16 @@ public: virtual ~PageColumnPopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx index 160684d69392..bb96980a30ab 100644 --- a/sw/inc/PageMarginPopup.hxx +++ b/sw/inc/PageMarginPopup.hxx @@ -29,14 +29,14 @@ public: virtual ~PageMarginPopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx index a9d2f677f9d6..4ae08907b864 100644 --- a/sw/inc/PageOrientationPopup.hxx +++ b/sw/inc/PageOrientationPopup.hxx @@ -29,14 +29,14 @@ public: virtual ~PageOrientationPopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx index 5b528b1ac862..d3a59e6c2c40 100644 --- a/sw/inc/PageSizePopup.hxx +++ b/sw/inc/PageSizePopup.hxx @@ -29,17 +29,16 @@ public: virtual ~PageSizePopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SidebarWindowsTypes.hxx b/sw/inc/SidebarWindowsTypes.hxx index f41414fc97a7..b35f66d7a568 100644 --- a/sw/inc/SidebarWindowsTypes.hxx +++ b/sw/inc/SidebarWindowsTypes.hxx @@ -19,8 +19,8 @@ #pragma once -namespace sw::sidebarwindows { - +namespace sw::sidebarwindows +{ enum class ViewState { NORMAL, @@ -30,9 +30,9 @@ enum class ViewState enum class SidebarPosition { - LEFT, // sidebar on left side - RIGHT, // sidebar on right side - NONE // sidebar on neither side + LEFT, // sidebar on left side + RIGHT, // sidebar on right side + NONE // sidebar on neither side }; } // end of namespace sw::sidebarwindows diff --git a/sw/inc/SwCapObjType.hxx b/sw/inc/SwCapObjType.hxx index abae5349f22e..729e1a7b2f66 100644 --- a/sw/inc/SwCapObjType.hxx +++ b/sw/inc/SwCapObjType.hxx @@ -21,7 +21,10 @@ enum SwCapObjType { - FRAME_CAP, GRAPHIC_CAP, TABLE_CAP, OLE_CAP + FRAME_CAP, + GRAPHIC_CAP, + TABLE_CAP, + OLE_CAP }; #endif diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx index ac15b34eee28..7b3801dc395e 100644 --- a/sw/inc/SwDocIdle.hxx +++ b/sw/inc/SwDocIdle.hxx @@ -23,8 +23,8 @@ class SwDoc; -namespace sw { - +namespace sw +{ /** * An Idle, which is just ready to be scheduled for idle documents. * @@ -36,15 +36,14 @@ namespace sw { class SwDocIdle final : public Idle { private: - SwDoc &m_rDoc; + SwDoc& m_rDoc; - virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; + virtual sal_uInt64 UpdateMinPeriod(sal_uInt64 nTimeNow) const override; public: - SwDocIdle( SwDoc &doc ); + SwDocIdle(SwDoc& doc); virtual ~SwDocIdle() override; }; - } #endif diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx index 2a42fae6f202..6d66616dd0c4 100644 --- a/sw/inc/SwGetPoolIdFromName.hxx +++ b/sw/inc/SwGetPoolIdFromName.hxx @@ -24,14 +24,15 @@ /* When using the NameMapper to translate pool ids to UI or programmatic * names, this enum is used to define which family is required */ -enum class SwGetPoolIdFromName : sal_uInt16 { - TxtColl = 0x01, - ChrFmt = 0x02, - FrmFmt = 0x04, +enum class SwGetPoolIdFromName : sal_uInt16 +{ + TxtColl = 0x01, + ChrFmt = 0x02, + FrmFmt = 0x04, PageDesc = 0x08, - NumRule = 0x10, + NumRule = 0x10, TabStyle = 0x20, - CellStyle= 0x40 + CellStyle = 0x40 }; #endif diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index a29099dbfac4..61efa42f8c7a 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -29,16 +29,15 @@ class SwNumRule; class SAL_DLLPUBLIC_RTTI SwNodeNum : public SwNumberTreeNode { public: - - explicit SwNodeNum( SwTextNode* pTextNode, bool isHiddenRedlines ); + explicit SwNodeNum(SwTextNode* pTextNode, bool isHiddenRedlines); // note: this is only for creating phantom nodes and root nodes; these // never have a text node - explicit SwNodeNum( SwNumRule* pNumRule ); + explicit SwNodeNum(SwNumRule* pNumRule); virtual ~SwNodeNum() override; - SwNumRule* GetNumRule() const { return mpNumRule;} - void ChangeNumRule( SwNumRule& rNumRule ); - SwTextNode* GetTextNode() const { return mpTextNode;} + SwNumRule* GetNumRule() const { return mpNumRule; } + void ChangeNumRule(SwNumRule& rNumRule); + SwTextNode* GetTextNode() const { return mpTextNode; } virtual bool IsNotificationEnabled() const override; @@ -46,7 +45,7 @@ public: virtual bool IsCounted() const override; - virtual bool LessThan(const SwNumberTreeNode & rNode) const override; + virtual bool LessThan(const SwNumberTreeNode& rNode) const override; virtual bool IsRestart() const override; @@ -61,16 +60,16 @@ public: // unregistered. // Text nodes of the document nodes array aren't allowed to be registered // in this situation - this will be asserted. - static void HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum ); + static void HandleNumberTreeRootNodeDelete(SwNodeNum& rNodeNum); /** determines the <SwNodeNum> instance, which is preceding the given text node #i81002# */ - const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const; + const SwNodeNum* GetPrecedingNodeNumOf(const SwTextNode& rTextNode) const; protected: - virtual SwNumberTreeNode * Create() const override; + virtual SwNumberTreeNode* Create() const override; // --> #i64010# virtual bool HasCountedChildren() const override; @@ -80,15 +79,16 @@ protected: virtual void PreAdd() override; // method called at a child after this child has been removed from the list tree virtual void PostRemove() override; + private: - SwTextNode *const mpTextNode; - SwNumRule * mpNumRule; + SwTextNode* const mpTextNode; + SwNumRule* mpNumRule; bool m_isHiddenRedlines; - static void UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); + static void UnregisterMeAndChildrenDueToRootDelete(SwNodeNum& rNodeNum); - SwNodeNum( const SwNodeNum& ) = delete; - SwNodeNum& operator=( const SwNodeNum& ) = delete; + SwNodeNum(const SwNodeNum&) = delete; + SwNodeNum& operator=(const SwNodeNum&) = delete; virtual bool IsCountPhantoms() const override; diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 9323d3df5644..fc26817f471b 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -26,14 +26,14 @@ class SwNumberTreeNode; -bool SwNumberTreeNodeLessThan (const SwNumberTreeNode * pA, - const SwNumberTreeNode * pB); +bool SwNumberTreeNodeLessThan(const SwNumberTreeNode* pA, const SwNumberTreeNode* pB); struct compSwNumberTreeNodeLessThan { - bool operator()(const SwNumberTreeNode * pA, - const SwNumberTreeNode * pB) const - { return SwNumberTreeNodeLessThan(pA, pB); } + bool operator()(const SwNumberTreeNode* pA, const SwNumberTreeNode* pB) const + { + return SwNumberTreeNodeLessThan(pA, pB); + } }; /** @@ -113,8 +113,7 @@ struct compSwNumberTreeNodeLessThan class SAL_DLLPUBLIC_RTTI SwNumberTreeNode { protected: - typedef std::set<SwNumberTreeNode *, compSwNumberTreeNodeLessThan> - tSwNumberTreeChildren; + typedef std::set<SwNumberTreeNode*, compSwNumberTreeNodeLessThan> tSwNumberTreeChildren; public: SwNumberTreeNode(); @@ -127,15 +126,14 @@ public: @param pChild child to add @param nDepth depth in which to add the child */ - void AddChild( SwNumberTreeNode* pChild, - const int nDepth ); + void AddChild(SwNumberTreeNode* pChild, const int nDepth); /** Remove a child. @param pChild child to be removed */ - void RemoveChild( SwNumberTreeNode* pChild ); + void RemoveChild(SwNumberTreeNode* pChild); /** Remove this child from the tree. @@ -147,10 +145,7 @@ public: @return the parent */ - SwNumberTreeNode* GetParent() const - { - return mpParent; - } + SwNumberTreeNode* GetParent() const { return mpParent; } /** Returns number of this node. @@ -159,9 +154,9 @@ public: @return number of this node */ - SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const; + SwNumberTree::tSwNumTreeNumber GetNumber(bool bValidate = true) const; - bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree;} + bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree; } /** Returns level numbers of this node. @@ -206,7 +201,7 @@ public: @retval true pNode is first child of this node @retval false else */ - bool IsFirst(const SwNumberTreeNode * pNode) const; + bool IsFirst(const SwNumberTreeNode* pNode) const; /** Return if this node if the first non-phantom node in the tree. @@ -222,13 +217,13 @@ public: @retval true this node is a phantom @retval false this node is NOT a phantom */ - bool IsPhantom() const { return mbPhantom;} + bool IsPhantom() const { return mbPhantom; } /** set level of this node precondition: node is already member of a list tree */ - void SetLevelInListTree( const int nLevel ); + void SetLevelInListTree(const int nLevel); /** Return level of this node. @@ -251,7 +246,7 @@ public: @retval true this node is less than rTreeNode @retval false else */ - virtual bool LessThan(const SwNumberTreeNode & rTreeNode) const; + virtual bool LessThan(const SwNumberTreeNode& rTreeNode) const; /** Invalidate this node and all its descendants. @@ -287,7 +282,7 @@ public: void NotifyInvalidSiblings(); /** notification of all nodes in the list tree on certain list level */ - void NotifyNodesOnListLevel( const int nListLevel ); + void NotifyNodesOnListLevel(const int nListLevel); /** Invalidation and notification of complete numbering tree @@ -297,7 +292,7 @@ public: */ void InvalidateAndNotifyTree() { - if ( GetRoot() ) + if (GetRoot()) { GetRoot()->InvalidateTree(); GetRoot()->Notify(); @@ -310,7 +305,7 @@ public: @return the predecessor */ - SwNumberTreeNode* GetPred( bool bSibling = false ) const; + SwNumberTreeNode* GetPred(bool bSibling = false) const; /** determines the node, which is preceding the node @@ -319,7 +314,7 @@ public: <this> node. To search the complete tree, the method has been called for the root of the tree. */ - const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const; + const SwNumberTreeNode* GetPrecedingNodeOf(const SwNumberTreeNode& rNode) const; #ifdef DBG_UTIL /** @@ -346,7 +341,7 @@ protected: */ SwNumberTreeNode* GetRoot() const; - /** + /** Return if the notification is not disabled on global conditions @retval true Notification enabled in general. @@ -378,11 +373,11 @@ protected: @param bRecursive descend to children @param rParents vector for recording path */ - void IsSane(bool bRecursive, std::vector<const SwNumberTreeNode *> rParents) const; + void IsSane(bool bRecursive, std::vector<const SwNumberTreeNode*> rParents) const; #endif // DBG_UTIL /** he parent node */ - SwNumberTreeNode * mpParent; + SwNumberTreeNode* mpParent; /** the number of the node */ mutable SwNumberTree::tSwNumTreeNumber mnNumber; @@ -409,8 +404,8 @@ protected: */ mutable tSwNumberTreeChildren::const_iterator mItLastValid; - SwNumberTreeNode(const SwNumberTreeNode& ); - SwNumberTreeNode& operator=( const SwNumberTreeNode& ); + SwNumberTreeNode(const SwNumberTreeNode&); + SwNumberTreeNode& operator=(const SwNumberTreeNode&); /** Calls GetNumberVector_ on parent and adds number of this node @@ -419,8 +414,7 @@ protected: @param rVector return value @param bValidate validate the number? */ - void GetNumberVector_( SwNumberTree::tNumberVector& rVector, - bool bValidate = true ) const; + void GetNumberVector_(SwNumberTree::tNumberVector& rVector, bool bValidate = true) const; /** Invalidates a child. @@ -430,16 +424,13 @@ protected: @param pChild the child to invalidate */ - void Invalidate( SwNumberTreeNode const * pChild ); + void Invalidate(SwNumberTreeNode const* pChild); /** Invalidation of all children Usage: on <IsCounted()> state change the children have to be invalidated */ - void InvalidateChildren() - { - SetLastValid( mChildren.end() ); - } + void InvalidateChildren() { SetLastValid(mChildren.end()); } /** Set the last valid child of this node. @@ -475,7 +466,7 @@ protected: void Notify(); /** notification of children nodes on certain depth */ - void NotifyChildrenOnDepth( const int nDepth ); + void NotifyChildrenOnDepth(const int nDepth); /** Returns if a child A this node is valid. @@ -488,7 +479,7 @@ protected: @retval true this node is valid @retval false this node is NOT valid */ - bool IsValid(const SwNumberTreeNode * pChild) const; + bool IsValid(const SwNumberTreeNode* pChild) const; /** Returns if this node is valid. @@ -505,7 +496,7 @@ protected: @attention All invalid children preceding pNode are validated, too. */ - void Validate(const SwNumberTreeNode * pNode) const; + void Validate(const SwNumberTreeNode* pNode) const; /** Validates a child using hierarchical numbering. @@ -514,7 +505,7 @@ protected: @attention All invalid children preceding pNode are validated, too. */ - void ValidateHierarchical(const SwNumberTreeNode * pNode) const; + void ValidateHierarchical(const SwNumberTreeNode* pNode) const; /** Validates a child using continuous numbering. @@ -523,21 +514,21 @@ protected: @attention All invalid children preceding pNode are validated, too. */ - void ValidateContinuous(const SwNumberTreeNode * pNode) const; + void ValidateContinuous(const SwNumberTreeNode* pNode) const; /** Creates a new node of the same class. @return the new node */ - virtual SwNumberTreeNode * Create() const = 0; + virtual SwNumberTreeNode* Create() const = 0; /** Creates a phantom. @return the created phantom */ - SwNumberTreeNode * CreatePhantom(); + SwNumberTreeNode* CreatePhantom(); /** Return if phantoms are counted. @@ -566,14 +557,14 @@ protected: */ void ClearObsoletePhantoms(); - tSwNumberTreeChildren::const_iterator GetIterator(const SwNumberTreeNode * pChild) const; + tSwNumberTreeChildren::const_iterator GetIterator(const SwNumberTreeNode* pChild) const; /** Moves all children to a given destination node. @param pDest the destination node */ - void MoveChildren(SwNumberTreeNode * pDest); + void MoveChildren(SwNumberTreeNode* pDest); /** Moves all children of this node that are greater than a given node to the destination node. @@ -589,8 +580,7 @@ protected: input parameter - reference to the node, which is the destination for the greater children */ - void MoveGreaterChildren( SwNumberTreeNode& _rCompareNode, - SwNumberTreeNode& _rDestNode ); + void MoveGreaterChildren(SwNumberTreeNode& _rCompareNode, SwNumberTreeNode& _rDestNode); /** Returns the last descendant of a node, if it has children. @@ -598,7 +588,6 @@ protected: @return last descendant of the node */ SwNumberTreeNode* GetLastDescendant() const; - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwNumberTreeTypes.hxx b/sw/inc/SwNumberTreeTypes.hxx index c1b72821d46a..505802edf291 100644 --- a/sw/inc/SwNumberTreeTypes.hxx +++ b/sw/inc/SwNumberTreeTypes.hxx @@ -25,8 +25,8 @@ namespace SwNumberTree { - typedef tools::Long tSwNumTreeNumber; - typedef std::vector<tSwNumTreeNumber> tNumberVector; +typedef tools::Long tSwNumTreeNumber; +typedef std::vector<tSwNumTreeNumber> tNumberVector; } #endif // INCLUDED_SW_INC_SWNUMBERTREETYPES_HXX diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx index 0adc40e87780..a0ab5e371342 100644 --- a/sw/inc/SwRewriter.hxx +++ b/sw/inc/SwRewriter.hxx @@ -40,9 +40,9 @@ class SW_DLLPUBLIC SwRewriter public: SwRewriter(); - void AddRule(SwUndoArg eWhat, const OUString & rWith); + void AddRule(SwUndoArg eWhat, const OUString& rWith); - OUString Apply(const OUString & rStr) const; + OUString Apply(const OUString& rStr) const; static OUString GetPlaceHolder(SwUndoArg eId); }; diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 3a9c1dbe57ac..e6d60c530f84 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -28,17 +28,17 @@ class SwSmartTagMgr final : public SmartTagMgr private: static SwSmartTagMgr* spTheSwSmartTagMgr; - SwSmartTagMgr( const OUString& rModuleName ); + SwSmartTagMgr(const OUString& rModuleName); virtual ~SwSmartTagMgr() override; public: static SwSmartTagMgr& Get(); // css::util::XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override; // css::util::XChangesListener - virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override; + virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& Event) override; }; #endif diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index 9185fa5a4ee9..9decbc020bf4 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -7,15 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #ifndef TOXWHITESPACESTRIPPER_HXX_ #define TOXWHITESPACESTRIPPER_HXX_ #include <rtl/ustring.hxx> #include <vector> -namespace sw { - +namespace sw +{ /** This class helps to remove unwanted whitespaces from a string to use in a Tox. * * The new string will have @@ -34,11 +33,9 @@ class ToxWhitespaceStripper public: ToxWhitespaceStripper(const OUString&); - sal_Int32 - GetPositionInStrippedString(sal_Int32 pos) const; + sal_Int32 GetPositionInStrippedString(sal_Int32 pos) const; - const OUString& - GetStrippedString() const { return mStripped;} + const OUString& GetStrippedString() const { return mStripped; } private: OUString mStripped; @@ -47,5 +44,4 @@ private: } // end namespace sw - #endif /* TOXWHITESPACESTRIPPER_HXX_ */ diff --git a/sw/inc/UndoParagraphSignature.hxx b/sw/inc/UndoParagraphSignature.hxx index e9561dcebf0b..79bb1624e44c 100644 --- a/sw/inc/UndoParagraphSignature.hxx +++ b/sw/inc/UndoParagraphSignature.hxx @@ -26,8 +26,14 @@ class SwDoc; -namespace com::sun::star::text { class XTextContent; } -namespace com::sun::star::text { class XTextField; } +namespace com::sun::star::text +{ +class XTextContent; +} +namespace com::sun::star::text +{ +class XTextField; +} /// Undo/Redo Paragraph Signature. class SwUndoParagraphSigning final : public SwUndo @@ -42,8 +48,7 @@ private: const bool m_bRemove; public: - SwUndoParagraphSigning(SwDoc& rDoc, - const css::uno::Reference<css::text::XTextField>& xField, + SwUndoParagraphSigning(SwDoc& rDoc, const css::uno::Reference<css::text::XTextField>& xField, const css::uno::Reference<css::text::XTextContent>& xParent, const bool bRemove); diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx index 2423072bf025..75ccf6008d12 100644 --- a/sw/inc/checkit.hxx +++ b/sw/inc/checkit.hxx @@ -21,13 +21,16 @@ #include <com/sun/star/uno/Reference.h> -namespace com::sun::star::i18n { class XExtendedInputSequenceChecker; } +namespace com::sun::star::i18n +{ +class XExtendedInputSequenceChecker; +} // Wrapper for the XInputSequenceChecker class SwCheckIt { public: - css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xCheck; + css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> xCheck; SwCheckIt(); }; diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 4feacc6c4e99..8ead4ccf44d4 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -26,7 +26,7 @@ class SwTableFUNC; class SwTableWidthDlg final : public weld::GenericDialogController { private: - SwTableFUNC &m_rFnc; + SwTableFUNC& m_rFnc; std::unique_ptr<weld::SpinButton> m_xColNF; std::unique_ptr<weld::MetricSpinButton> m_xWidthMF; @@ -36,7 +36,7 @@ private: void Apply(); public: - SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rFnc); + SwTableWidthDlg(weld::Window* pParent, SwTableFUNC& rFnc); virtual short run() override; }; diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index f6a98d1aca8a..ad78223c3f85 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -50,32 +50,32 @@ class SwNodeRange; extern bool bDbgOutStdErr; extern bool bDbgOutPrintAttrSet; -const char * dbg_out(const void * pVoid); -const char * dbg_out(const OUString & aStr); -const char * dbg_out(const SwRect & rRect); -const char * dbg_out(const SwFrameFormat & rFrameFormat); -SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode); -SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode); -const char * dbg_out(const SwContentNode * pNode); -const char * dbg_out(const SwTextNode * pNode); -const char * dbg_out(const SwTextAttr & rAttr); -const char * dbg_out(const SwpHints &rHints); -const char * dbg_out(const SfxPoolItem & rItem); -const char * dbg_out(const SfxPoolItem * pItem); -const char * dbg_out(const SfxItemSet & rSet); -const char * dbg_out(const SwPosition & rPos); -const char * dbg_out(const SwPaM & rPam); -const char * dbg_out(const SwNodeNum & rNum); -const char * dbg_out(const SwUndo & rUndo); -const char * dbg_out(SwOutlineNodes const & rNodes); -const char * dbg_out(const SwNumRule & rRule); -const char * dbg_out(const SwTextFormatColl & rFormat); -const char * dbg_out(const SwFrameFormats & rFrameFormats); -const char * dbg_out(const SwNumRuleTable & rTable); -const char * dbg_out(const SwNodeRange & rRange); +const char* dbg_out(const void* pVoid); +const char* dbg_out(const OUString& aStr); +const char* dbg_out(const SwRect& rRect); +const char* dbg_out(const SwFrameFormat& rFrameFormat); +SW_DLLPUBLIC const char* dbg_out(const SwNode& rNode); +SW_DLLPUBLIC const char* dbg_out(const SwNode* pNode); +const char* dbg_out(const SwContentNode* pNode); +const char* dbg_out(const SwTextNode* pNode); +const char* dbg_out(const SwTextAttr& rAttr); +const char* dbg_out(const SwpHints& rHints); +const char* dbg_out(const SfxPoolItem& rItem); +const char* dbg_out(const SfxPoolItem* pItem); +const char* dbg_out(const SfxItemSet& rSet); +const char* dbg_out(const SwPosition& rPos); +const char* dbg_out(const SwPaM& rPam); +const char* dbg_out(const SwNodeNum& rNum); +const char* dbg_out(const SwUndo& rUndo); +const char* dbg_out(SwOutlineNodes const& rNodes); +const char* dbg_out(const SwNumRule& rRule); +const char* dbg_out(const SwTextFormatColl& rFormat); +const char* dbg_out(const SwFrameFormats& rFrameFormats); +const char* dbg_out(const SwNumRuleTable& rTable); +const char* dbg_out(const SwNodeRange& rRange); -template<typename tKey, typename tMember, typename fHashFunction> -OUString lcl_dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rMap) +template <typename tKey, typename tMember, typename fHashFunction> +OUString lcl_dbg_out(const std::unordered_map<tKey, tMember, fHashFunction>& rMap) { OUStringBuffer aResult("["); @@ -98,13 +98,13 @@ OUString lcl_dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rM return aResult.makeStringAndClear(); } -template<typename tKey, typename tMember, typename fHashFunction> -const char * dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rMap) +template <typename tKey, typename tMember, typename fHashFunction> +const char* dbg_out(const std::unordered_map<tKey, tMember, fHashFunction>& rMap) { return dbg_out(lcl_dbg_out(rMap)); } -const char * dbg_out(const SwFormToken & rToken); -const char * dbg_out(const SwFormTokens & rTokens); +const char* dbg_out(const SwFormToken& rToken); +const char* dbg_out(const SwFormTokens& rTokens); #endif // DBG_UTIL #endif // INCLUDED_SW_INC_DBGOUTSW_HXX diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index 49173cca37d4..1de1192a8bc9 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -25,7 +25,7 @@ class SwObjectFactory { public: - DECL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK(SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; extern SwObjectFactory aSwObjectFactory; diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx index 60e6a2ab1626..300e0af938a9 100644 --- a/sw/inc/docfac.hxx +++ b/sw/inc/docfac.hxx @@ -29,11 +29,11 @@ protected: rtl::Reference<SwDoc> mxDoc; public: - SwDocFac( SwDoc *pDoc = nullptr ); + SwDocFac(SwDoc* pDoc = nullptr); ~SwDocFac() COVERITY_NOEXCEPT_FALSE; /// Document is created after calling Read(...). - SwDoc& GetDoc(); + SwDoc& GetDoc(); }; #endif diff --git a/sw/inc/docfunc.hxx b/sw/inc/docfunc.hxx index cd645ea570cc..e37a5ea2a02c 100644 --- a/sw/inc/docfunc.hxx +++ b/sw/inc/docfunc.hxx @@ -24,39 +24,39 @@ class SwDoc; // namespace <docfunc> for functions and procedures working on a Writer document. namespace docfunc { - /** method to check, if given Writer document contains at least one drawing object +/** method to check, if given Writer document contains at least one drawing object - @param p_rDoc - input parameter - reference to the Writer document, which is investigated. - */ - bool ExistsDrawObjs( SwDoc& p_rDoc ); + @param p_rDoc + input parameter - reference to the Writer document, which is investigated. +*/ +bool ExistsDrawObjs(SwDoc& p_rDoc); - /** method to check, if given Writer document contains only drawing objects, - which are completely on its page. +/** method to check, if given Writer document contains only drawing objects, + which are completely on its page. - @param p_rDoc - input parameter - reference to the Writer document, which is investigated. - */ - bool AllDrawObjsOnPage( SwDoc& p_rDoc ); + @param p_rDoc + input parameter - reference to the Writer document, which is investigated. +*/ +bool AllDrawObjsOnPage(SwDoc& p_rDoc); - /** method to check, if the outline style has to written as a normal list style +/** method to check, if the outline style has to written as a normal list style - #i69627# - The outline style has to written as a normal list style, if a parent - paragraph style of one of the paragraph styles, which are assigned to - the list levels of the outline style, has a list style set or inherits - a list style from its parent paragraphs style. - This information is needed for the OpenDocument file format export. + #i69627# + The outline style has to written as a normal list style, if a parent + paragraph style of one of the paragraph styles, which are assigned to + the list levels of the outline style, has a list style set or inherits + a list style from its parent paragraphs style. + This information is needed for the OpenDocument file format export. - @param rDoc - input parameter - reference to the text document, which is investigated. + @param rDoc + input parameter - reference to the text document, which is investigated. - @return boolean - indicating, if the outline style has to written as a normal list style - */ - bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc ); + @return boolean + indicating, if the outline style has to written as a normal list style +*/ +bool HasOutlineStyleToBeWrittenAsNormalListStyle(SwDoc& rDoc); } -#endif //_DOCFUNC_HXX +#endif //_DOCFUNC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 75882a1bbd63..05762bb577ae 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -33,7 +33,7 @@ public: virtual ~SwDrawModel() override; const SwDoc& GetDoc() const { return m_rDoc; } - SwDoc& GetDoc() { return m_rDoc; } + SwDoc& GetDoc() { return m_rDoc; } /// Put needed items for XPropertyList entries from the DrawModel. void PutAreaListItems(SfxItemSet& rSet) const; @@ -43,7 +43,7 @@ public: private: /// override of <SdrModel::createUnoModel()> is needed to provide corresponding uno model. - virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override; + virtual css::uno::Reference<css::uno::XInterface> createUnoModel() override; }; #endif diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index a2501aff85e4..5057cbb9c319 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -46,7 +46,7 @@ public: @return a copy of this type */ - virtual std::unique_ptr<SwFieldType> Copy () const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; /** @@ -105,14 +105,14 @@ public: @param pTyp field type for this field */ - SwDropDownField(SwFieldType * pTyp); + SwDropDownField(SwFieldType* pTyp); /** Copy constructor @param rSrc dropdown field to copy */ - SwDropDownField(const SwDropDownField & rSrc); + SwDropDownField(const SwDropDownField& rSrc); /** Destructor @@ -142,14 +142,14 @@ public: selected. Otherwise no item will be selected, i.e. the resulting selection will be empty. */ - virtual void SetPar1(const OUString & rStr) override; + virtual void SetPar1(const OUString& rStr) override; /** Sets the name of the field. @param rStr the new name of the field */ - virtual void SetPar2(const OUString & rStr) override; + virtual void SetPar2(const OUString& rStr) override; /** Sets the items of the dropdown box. @@ -158,7 +158,7 @@ public: @param rItems the new items */ - void SetItems(const std::vector<OUString> & rItems); + void SetItems(const std::vector<OUString>& rItems); /** Sets the items of the dropdown box. @@ -167,7 +167,7 @@ public: @param rItems the new items */ - void SetItems(const css::uno::Sequence<OUString> & rItems); + void SetItems(const css::uno::Sequence<OUString>& rItems); /** Returns the items of the dropdown box. @@ -181,28 +181,28 @@ public: @return the selected item */ - const OUString& GetSelectedItem() const { return m_aSelectedItem;} + const OUString& GetSelectedItem() const { return m_aSelectedItem; } /** Returns the name of the field. @return the name of the field */ - const OUString& GetName() const { return m_aName;} + const OUString& GetName() const { return m_aName; } /** Returns the help text of the field. @return the help text of the field */ - const OUString& GetHelp() const { return m_aHelp;} + const OUString& GetHelp() const { return m_aHelp; } /** Returns the tool tip of the field. @return the tool tip of the field */ - const OUString& GetToolTip() const { return m_aToolTip;} + const OUString& GetToolTip() const { return m_aToolTip; } /** Sets the selected item. @@ -212,28 +212,28 @@ public: @param rItem the item to be set */ - void SetSelectedItem(const OUString & rItem); + void SetSelectedItem(const OUString& rItem); /** Sets the name of the field. @param rName the new name of the field */ - void SetName(const OUString & rName); + void SetName(const OUString& rName); /** Sets the help text of the field. @param rHelp the help text */ - void SetHelp(const OUString & rHelp); + void SetHelp(const OUString& rHelp); /** Sets the tool tip of the field. @param rToolTip the tool tip */ - void SetToolTip(const OUString & rToolTip); + void SetToolTip(const OUString& rToolTip); /** API: Gets a property value from the dropdown field. @@ -245,7 +245,7 @@ public: - FIELD_PROP_PAR3 Get the help text of the field. - FIELD_PROP_PAR4 Get the tool tip of the field. */ - virtual bool QueryValue(css::uno::Any &rVal, sal_uInt16 nWhichId) const override; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt16 nWhichId) const override; /** API: Sets a property value on the dropdown field. @@ -257,7 +257,7 @@ public: - FIELD_PROP_PAR3 Set the help text of the field. - FIELD_PROP_PAR4 Set the tool tip of the field. */ - virtual bool PutValue(const css::uno::Any &rVal, sal_uInt16 nWhichId) override; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt16 nWhichId) override; }; #endif diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 04a162acd745..3971619e27e1 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -166,10 +166,10 @@ class SfxVoidItem; // For SwTextHints without end index the following char is added: -#define CH_TXTATR_BREAKWORD u'\x0001' -#define CH_TXTATR_INWORD u'\xFFF9' -#define CH_TXTATR_TAB u'\t' -#define CH_TXTATR_NEWLINE u'\n' +#define CH_TXTATR_BREAKWORD u'\x0001' +#define CH_TXTATR_INWORD u'\xFFF9' +#define CH_TXTATR_TAB u'\t' +#define CH_TXTATR_NEWLINE u'\n' #define CH_TXT_ATR_INPUTFIELDSTART u'\x0004' #define CH_TXT_ATR_INPUTFIELDEND u'\x0005' @@ -192,51 +192,51 @@ constexpr sal_uInt16 POOLATTR_BEGIN(HINT_BEGIN); // Ranges for the IDs of the format-attributes. // Which-values for character-format attributes. constexpr sal_uInt16 RES_CHRATR_BEGIN(HINT_BEGIN); -constexpr TypedWhichId<SvxCaseMapItem> RES_CHRATR_CASEMAP (RES_CHRATR_BEGIN); // 1 -constexpr TypedWhichId<SvxColorItem> RES_CHRATR_CHARSETCOLOR (2); -constexpr TypedWhichId<SvxColorItem> RES_CHRATR_COLOR (3); -constexpr TypedWhichId<SvxContourItem> RES_CHRATR_CONTOUR (4); -constexpr TypedWhichId<SvxCrossedOutItem> RES_CHRATR_CROSSEDOUT (5); -constexpr TypedWhichId<SvxEscapementItem> RES_CHRATR_ESCAPEMENT (6); -constexpr TypedWhichId<SvxFontItem> RES_CHRATR_FONT (7); -constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_FONTSIZE (8); -constexpr TypedWhichId<SvxKerningItem> RES_CHRATR_KERNING (9); -constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_LANGUAGE (10); -constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_POSTURE (11); -constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED1 (12); -constexpr TypedWhichId<SvxShadowedItem> RES_CHRATR_SHADOWED (13); -constexpr TypedWhichId<SvxUnderlineItem> RES_CHRATR_UNDERLINE (14); -constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_WEIGHT (15); -constexpr TypedWhichId<SvxWordLineModeItem> RES_CHRATR_WORDLINEMODE (16); -constexpr TypedWhichId<SvxAutoKernItem> RES_CHRATR_AUTOKERN (17); -constexpr TypedWhichId<SvxBlinkItem> RES_CHRATR_BLINK (18); -constexpr TypedWhichId<SvxNoHyphenItem> RES_CHRATR_NOHYPHEN (19); -constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED2 (20); -constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_BACKGROUND (21); -constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CJK_FONT (22); -constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CJK_FONTSIZE (23); -constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CJK_LANGUAGE (24); -constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CJK_POSTURE (25); -constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CJK_WEIGHT (26); -constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CTL_FONT (27); -constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CTL_FONTSIZE (28); -constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CTL_LANGUAGE (29); -constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CTL_POSTURE (30); -constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CTL_WEIGHT (31); -constexpr TypedWhichId<SvxCharRotateItem> RES_CHRATR_ROTATE (32); -constexpr TypedWhichId<SvxEmphasisMarkItem> RES_CHRATR_EMPHASIS_MARK (33); -constexpr TypedWhichId<SvxTwoLinesItem> RES_CHRATR_TWO_LINES (34); -constexpr TypedWhichId<SvxCharScaleWidthItem> RES_CHRATR_SCALEW (35); -constexpr TypedWhichId<SvxCharReliefItem> RES_CHRATR_RELIEF (36); -constexpr TypedWhichId<SvxCharHiddenItem> RES_CHRATR_HIDDEN (37); -constexpr TypedWhichId<SvxOverlineItem> RES_CHRATR_OVERLINE (38); -constexpr TypedWhichId<SvxRsidItem> RES_CHRATR_RSID (39); -constexpr TypedWhichId<SvxBoxItem> RES_CHRATR_BOX (40); -constexpr TypedWhichId<SvxShadowItem> RES_CHRATR_SHADOW (41); -constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_HIGHLIGHT (42); -constexpr TypedWhichId<SfxGrabBagItem> RES_CHRATR_GRABBAG (43); -constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_BIDIRTL (44); -constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_IDCTHINT (45); +constexpr TypedWhichId<SvxCaseMapItem> RES_CHRATR_CASEMAP(RES_CHRATR_BEGIN); // 1 +constexpr TypedWhichId<SvxColorItem> RES_CHRATR_CHARSETCOLOR(2); +constexpr TypedWhichId<SvxColorItem> RES_CHRATR_COLOR(3); +constexpr TypedWhichId<SvxContourItem> RES_CHRATR_CONTOUR(4); +constexpr TypedWhichId<SvxCrossedOutItem> RES_CHRATR_CROSSEDOUT(5); +constexpr TypedWhichId<SvxEscapementItem> RES_CHRATR_ESCAPEMENT(6); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_FONT(7); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_FONTSIZE(8); +constexpr TypedWhichId<SvxKerningItem> RES_CHRATR_KERNING(9); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_LANGUAGE(10); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_POSTURE(11); +constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED1(12); +constexpr TypedWhichId<SvxShadowedItem> RES_CHRATR_SHADOWED(13); +constexpr TypedWhichId<SvxUnderlineItem> RES_CHRATR_UNDERLINE(14); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_WEIGHT(15); +constexpr TypedWhichId<SvxWordLineModeItem> RES_CHRATR_WORDLINEMODE(16); +constexpr TypedWhichId<SvxAutoKernItem> RES_CHRATR_AUTOKERN(17); +constexpr TypedWhichId<SvxBlinkItem> RES_CHRATR_BLINK(18); +constexpr TypedWhichId<SvxNoHyphenItem> RES_CHRATR_NOHYPHEN(19); +constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED2(20); +constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_BACKGROUND(21); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CJK_FONT(22); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CJK_FONTSIZE(23); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CJK_LANGUAGE(24); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CJK_POSTURE(25); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CJK_WEIGHT(26); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CTL_FONT(27); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CTL_FONTSIZE(28); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CTL_LANGUAGE(29); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CTL_POSTURE(30); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CTL_WEIGHT(31); +constexpr TypedWhichId<SvxCharRotateItem> RES_CHRATR_ROTATE(32); +constexpr TypedWhichId<SvxEmphasisMarkItem> RES_CHRATR_EMPHASIS_MARK(33); +constexpr TypedWhichId<SvxTwoLinesItem> RES_CHRATR_TWO_LINES(34); +constexpr TypedWhichId<SvxCharScaleWidthItem> RES_CHRATR_SCALEW(35); +constexpr TypedWhichId<SvxCharReliefItem> RES_CHRATR_RELIEF(36); +constexpr TypedWhichId<SvxCharHiddenItem> RES_CHRATR_HIDDEN(37); +constexpr TypedWhichId<SvxOverlineItem> RES_CHRATR_OVERLINE(38); +constexpr TypedWhichId<SvxRsidItem> RES_CHRATR_RSID(39); +constexpr TypedWhichId<SvxBoxItem> RES_CHRATR_BOX(40); +constexpr TypedWhichId<SvxShadowItem> RES_CHRATR_SHADOW(41); +constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_HIGHLIGHT(42); +constexpr TypedWhichId<SfxGrabBagItem> RES_CHRATR_GRABBAG(43); +constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_BIDIRTL(44); +constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_IDCTHINT(45); constexpr sal_uInt16 RES_CHRATR_END(46); // this Attribute used only in a TextNodes SwpAttr-Array @@ -259,198 +259,200 @@ constexpr sal_uInt16 RES_TXTATR_BEGIN(RES_CHRATR_END); - META and METAFIELD must precede CJK_RUBY and INETFMT */ constexpr sal_uInt16 RES_TXTATR_WITHEND_BEGIN(RES_TXTATR_BEGIN); -constexpr TypedWhichId<SwFormatRefMark> RES_TXTATR_REFMARK (RES_TXTATR_WITHEND_BEGIN); // 46 -constexpr TypedWhichId<SwTOXMark> RES_TXTATR_TOXMARK (47); -constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_META (48); -constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_METAFIELD (49); -constexpr TypedWhichId<SwFormatAutoFormat> RES_TXTATR_AUTOFMT (50); -constexpr TypedWhichId<SwFormatINetFormat> RES_TXTATR_INETFMT (51); -constexpr TypedWhichId<SwFormatCharFormat> RES_TXTATR_CHARFMT (52); -constexpr TypedWhichId<SwFormatRuby> RES_TXTATR_CJK_RUBY (53); -constexpr TypedWhichId<SvXMLAttrContainerItem> RES_TXTATR_UNKNOWN_CONTAINER (54); -constexpr TypedWhichId<SwFormatField> RES_TXTATR_INPUTFIELD (55); +constexpr TypedWhichId<SwFormatRefMark> RES_TXTATR_REFMARK(RES_TXTATR_WITHEND_BEGIN); // 46 +constexpr TypedWhichId<SwTOXMark> RES_TXTATR_TOXMARK(47); +constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_META(48); +constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_METAFIELD(49); +constexpr TypedWhichId<SwFormatAutoFormat> RES_TXTATR_AUTOFMT(50); +constexpr TypedWhichId<SwFormatINetFormat> RES_TXTATR_INETFMT(51); +constexpr TypedWhichId<SwFormatCharFormat> RES_TXTATR_CHARFMT(52); +constexpr TypedWhichId<SwFormatRuby> RES_TXTATR_CJK_RUBY(53); +constexpr TypedWhichId<SvXMLAttrContainerItem> RES_TXTATR_UNKNOWN_CONTAINER(54); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_INPUTFIELD(55); constexpr sal_uInt16 RES_TXTATR_WITHEND_END(56); // all TextAttributes without an end constexpr sal_uInt16 RES_TXTATR_NOEND_BEGIN(RES_TXTATR_WITHEND_END); -constexpr TypedWhichId<SwFormatField> RES_TXTATR_FIELD (RES_TXTATR_NOEND_BEGIN); // 56 -constexpr TypedWhichId<SwFormatFlyCnt> RES_TXTATR_FLYCNT (57); -constexpr TypedWhichId<SwFormatFootnote> RES_TXTATR_FTN (58); -constexpr TypedWhichId<SwFormatField> RES_TXTATR_ANNOTATION (59); -constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY3 (60); -constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY1 (61); -constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY2 (62); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_FIELD(RES_TXTATR_NOEND_BEGIN); // 56 +constexpr TypedWhichId<SwFormatFlyCnt> RES_TXTATR_FLYCNT(57); +constexpr TypedWhichId<SwFormatFootnote> RES_TXTATR_FTN(58); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_ANNOTATION(59); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY3(60); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY1(61); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY2(62); constexpr sal_uInt16 RES_TXTATR_NOEND_END(63); constexpr sal_uInt16 RES_TXTATR_END(RES_TXTATR_NOEND_END); constexpr sal_uInt16 RES_PARATR_BEGIN(RES_TXTATR_END); -constexpr TypedWhichId<SvxLineSpacingItem> RES_PARATR_LINESPACING (RES_PARATR_BEGIN); // 63 -constexpr TypedWhichId<SvxAdjustItem> RES_PARATR_ADJUST (64); -constexpr TypedWhichId<SvxFormatSplitItem> RES_PARATR_SPLIT (65); -constexpr TypedWhichId<SvxOrphansItem> RES_PARATR_ORPHANS (66); -constexpr TypedWhichId<SvxWidowsItem> RES_PARATR_WIDOWS (67); -constexpr TypedWhichId<SvxTabStopItem> RES_PARATR_TABSTOP (68); -constexpr TypedWhichId<SvxHyphenZoneItem> RES_PARATR_HYPHENZONE (69); -constexpr TypedWhichId<SwFormatDrop> RES_PARATR_DROP (70); -constexpr TypedWhichId<SwRegisterItem> RES_PARATR_REGISTER (71); -constexpr TypedWhichId<SwNumRuleItem> RES_PARATR_NUMRULE (72); -constexpr TypedWhichId<SvxScriptSpaceItem> RES_PARATR_SCRIPTSPACE (73); -constexpr TypedWhichId<SvxHangingPunctuationItem> RES_PARATR_HANGINGPUNCTUATION (74); -constexpr TypedWhichId<SvxForbiddenRuleItem> RES_PARATR_FORBIDDEN_RULES (75); -constexpr TypedWhichId<SvxParaVertAlignItem> RES_PARATR_VERTALIGN (76); -constexpr TypedWhichId<SvxParaGridItem> RES_PARATR_SNAPTOGRID (77); -constexpr TypedWhichId<SwParaConnectBorderItem> RES_PARATR_CONNECT_BORDER (78); -constexpr TypedWhichId<SfxUInt16Item> RES_PARATR_OUTLINELEVEL (79); -constexpr TypedWhichId<SvxRsidItem> RES_PARATR_RSID (80); -constexpr TypedWhichId<SfxGrabBagItem> RES_PARATR_GRABBAG (81); +constexpr TypedWhichId<SvxLineSpacingItem> RES_PARATR_LINESPACING(RES_PARATR_BEGIN); // 63 +constexpr TypedWhichId<SvxAdjustItem> RES_PARATR_ADJUST(64); +constexpr TypedWhichId<SvxFormatSplitItem> RES_PARATR_SPLIT(65); +constexpr TypedWhichId<SvxOrphansItem> RES_PARATR_ORPHANS(66); +constexpr TypedWhichId<SvxWidowsItem> RES_PARATR_WIDOWS(67); +constexpr TypedWhichId<SvxTabStopItem> RES_PARATR_TABSTOP(68); +constexpr TypedWhichId<SvxHyphenZoneItem> RES_PARATR_HYPHENZONE(69); +constexpr TypedWhichId<SwFormatDrop> RES_PARATR_DROP(70); +constexpr TypedWhichId<SwRegisterItem> RES_PARATR_REGISTER(71); +constexpr TypedWhichId<SwNumRuleItem> RES_PARATR_NUMRULE(72); +constexpr TypedWhichId<SvxScriptSpaceItem> RES_PARATR_SCRIPTSPACE(73); +constexpr TypedWhichId<SvxHangingPunctuationItem> RES_PARATR_HANGINGPUNCTUATION(74); +constexpr TypedWhichId<SvxForbiddenRuleItem> RES_PARATR_FORBIDDEN_RULES(75); +constexpr TypedWhichId<SvxParaVertAlignItem> RES_PARATR_VERTALIGN(76); +constexpr TypedWhichId<SvxParaGridItem> RES_PARATR_SNAPTOGRID(77); +constexpr TypedWhichId<SwParaConnectBorderItem> RES_PARATR_CONNECT_BORDER(78); +constexpr TypedWhichId<SfxUInt16Item> RES_PARATR_OUTLINELEVEL(79); +constexpr TypedWhichId<SvxRsidItem> RES_PARATR_RSID(80); +constexpr TypedWhichId<SfxGrabBagItem> RES_PARATR_GRABBAG(81); constexpr sal_uInt16 RES_PARATR_END(82); // list attributes for paragraphs. // intentionally these list attributes are not contained in paragraph styles constexpr sal_uInt16 RES_PARATR_LIST_BEGIN(RES_PARATR_END); -constexpr TypedWhichId<SfxStringItem> RES_PARATR_LIST_ID (RES_PARATR_LIST_BEGIN); // 82 -constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_LEVEL (83); -constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISRESTART (84); -constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_RESTARTVALUE (85); -constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISCOUNTED (86); -constexpr TypedWhichId<SwFormatAutoFormat> RES_PARATR_LIST_AUTOFMT (87);//TypedWhichId<SfxSetItem>(87) +constexpr TypedWhichId<SfxStringItem> RES_PARATR_LIST_ID(RES_PARATR_LIST_BEGIN); // 82 +constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_LEVEL(83); +constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISRESTART(84); +constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_RESTARTVALUE(85); +constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISCOUNTED(86); +constexpr TypedWhichId<SwFormatAutoFormat> + RES_PARATR_LIST_AUTOFMT(87); //TypedWhichId<SfxSetItem>(87) constexpr sal_uInt16 RES_PARATR_LIST_END(88); constexpr sal_uInt16 RES_FRMATR_BEGIN(RES_PARATR_LIST_END); -constexpr TypedWhichId<SwFormatFillOrder> RES_FILL_ORDER (RES_FRMATR_BEGIN); -constexpr TypedWhichId<SwFormatFrameSize> RES_FRM_SIZE (89); -constexpr TypedWhichId<SvxPaperBinItem> RES_PAPER_BIN (90); -constexpr TypedWhichId<SvxLRSpaceItem> RES_LR_SPACE (91); -constexpr TypedWhichId<SvxULSpaceItem> RES_UL_SPACE (92); -constexpr TypedWhichId<SwFormatPageDesc> RES_PAGEDESC (93); -constexpr TypedWhichId<SvxFormatBreakItem> RES_BREAK (94); -constexpr TypedWhichId<SwFormatContent> RES_CNTNT (95); -constexpr TypedWhichId<SwFormatHeader> RES_HEADER (96); -constexpr TypedWhichId<SwFormatFooter> RES_FOOTER (97); -constexpr TypedWhichId<SvxPrintItem> RES_PRINT (98); -constexpr TypedWhichId<SvxOpaqueItem> RES_OPAQUE (99); -constexpr TypedWhichId<SvxProtectItem> RES_PROTECT (100); -constexpr TypedWhichId<SwFormatSurround> RES_SURROUND (101); -constexpr TypedWhichId<SwFormatVertOrient> RES_VERT_ORIENT (102); -constexpr TypedWhichId<SwFormatHoriOrient> RES_HORI_ORIENT (103); -constexpr TypedWhichId<SwFormatAnchor> RES_ANCHOR (104); -constexpr TypedWhichId<SvxBrushItem> RES_BACKGROUND (105); -constexpr TypedWhichId<SvxBoxItem> RES_BOX (106); -constexpr TypedWhichId<SvxShadowItem> RES_SHADOW (107); -constexpr TypedWhichId<SvxMacroItem> RES_FRMMACRO (108); -constexpr TypedWhichId<SwFormatCol> RES_COL (109); -constexpr TypedWhichId<SvxFormatKeepItem> RES_KEEP (110); -constexpr TypedWhichId<SwFormatURL> RES_URL (111); -constexpr TypedWhichId<SwFormatEditInReadonly> RES_EDIT_IN_READONLY (112); -constexpr TypedWhichId<SwFormatLayoutSplit> RES_LAYOUT_SPLIT (113); -constexpr TypedWhichId<SwFormatChain> RES_CHAIN (114); -constexpr TypedWhichId<SwTextGridItem> RES_TEXTGRID (115); -constexpr TypedWhichId<SwFormatLineNumber> RES_LINENUMBER (116); -constexpr TypedWhichId<SwFormatFootnoteAtTextEnd> RES_FTN_AT_TXTEND (117); -constexpr TypedWhichId<SwFormatEndAtTextEnd> RES_END_AT_TXTEND (118); -constexpr TypedWhichId<SwFormatNoBalancedColumns> RES_COLUMNBALANCE (119); -constexpr TypedWhichId<SvxFrameDirectionItem> RES_FRAMEDIR (120); -constexpr TypedWhichId<SwHeaderAndFooterEatSpacingItem> RES_HEADER_FOOTER_EAT_SPACING (121); -constexpr TypedWhichId<SwFormatRowSplit> RES_ROW_SPLIT (122); -constexpr TypedWhichId<SwFormatFollowTextFlow> RES_FOLLOW_TEXT_FLOW (123); -constexpr TypedWhichId<SfxBoolItem> RES_COLLAPSING_BORDERS (124); -constexpr TypedWhichId<SwFormatWrapInfluenceOnObjPos> RES_WRAP_INFLUENCE_ON_OBJPOS (125); -constexpr TypedWhichId<SwFormatAutoFormat> RES_AUTO_STYLE (126); -constexpr TypedWhichId<SfxStringItem> RES_FRMATR_STYLE_NAME (127); -constexpr TypedWhichId<SfxStringItem> RES_FRMATR_CONDITIONAL_STYLE_NAME (128); -constexpr TypedWhichId<SfxGrabBagItem> RES_FRMATR_GRABBAG (129); -constexpr TypedWhichId<SdrTextVertAdjustItem> RES_TEXT_VERT_ADJUST (130); +constexpr TypedWhichId<SwFormatFillOrder> RES_FILL_ORDER(RES_FRMATR_BEGIN); +constexpr TypedWhichId<SwFormatFrameSize> RES_FRM_SIZE(89); +constexpr TypedWhichId<SvxPaperBinItem> RES_PAPER_BIN(90); +constexpr TypedWhichId<SvxLRSpaceItem> RES_LR_SPACE(91); +constexpr TypedWhichId<SvxULSpaceItem> RES_UL_SPACE(92); +constexpr TypedWhichId<SwFormatPageDesc> RES_PAGEDESC(93); +constexpr TypedWhichId<SvxFormatBreakItem> RES_BREAK(94); +constexpr TypedWhichId<SwFormatContent> RES_CNTNT(95); +constexpr TypedWhichId<SwFormatHeader> RES_HEADER(96); +constexpr TypedWhichId<SwFormatFooter> RES_FOOTER(97); +constexpr TypedWhichId<SvxPrintItem> RES_PRINT(98); +constexpr TypedWhichId<SvxOpaqueItem> RES_OPAQUE(99); +constexpr TypedWhichId<SvxProtectItem> RES_PROTECT(100); +constexpr TypedWhichId<SwFormatSurround> RES_SURROUND(101); +constexpr TypedWhichId<SwFormatVertOrient> RES_VERT_ORIENT(102); +constexpr TypedWhichId<SwFormatHoriOrient> RES_HORI_ORIENT(103); +constexpr TypedWhichId<SwFormatAnchor> RES_ANCHOR(104); +constexpr TypedWhichId<SvxBrushItem> RES_BACKGROUND(105); +constexpr TypedWhichId<SvxBoxItem> RES_BOX(106); +constexpr TypedWhichId<SvxShadowItem> RES_SHADOW(107); +constexpr TypedWhichId<SvxMacroItem> RES_FRMMACRO(108); +constexpr TypedWhichId<SwFormatCol> RES_COL(109); +constexpr TypedWhichId<SvxFormatKeepItem> RES_KEEP(110); +constexpr TypedWhichId<SwFormatURL> RES_URL(111); +constexpr TypedWhichId<SwFormatEditInReadonly> RES_EDIT_IN_READONLY(112); +constexpr TypedWhichId<SwFormatLayoutSplit> RES_LAYOUT_SPLIT(113); +constexpr TypedWhichId<SwFormatChain> RES_CHAIN(114); +constexpr TypedWhichId<SwTextGridItem> RES_TEXTGRID(115); +constexpr TypedWhichId<SwFormatLineNumber> RES_LINENUMBER(116); +constexpr TypedWhichId<SwFormatFootnoteAtTextEnd> RES_FTN_AT_TXTEND(117); +constexpr TypedWhichId<SwFormatEndAtTextEnd> RES_END_AT_TXTEND(118); +constexpr TypedWhichId<SwFormatNoBalancedColumns> RES_COLUMNBALANCE(119); +constexpr TypedWhichId<SvxFrameDirectionItem> RES_FRAMEDIR(120); +constexpr TypedWhichId<SwHeaderAndFooterEatSpacingItem> RES_HEADER_FOOTER_EAT_SPACING(121); +constexpr TypedWhichId<SwFormatRowSplit> RES_ROW_SPLIT(122); +constexpr TypedWhichId<SwFormatFollowTextFlow> RES_FOLLOW_TEXT_FLOW(123); +constexpr TypedWhichId<SfxBoolItem> RES_COLLAPSING_BORDERS(124); +constexpr TypedWhichId<SwFormatWrapInfluenceOnObjPos> RES_WRAP_INFLUENCE_ON_OBJPOS(125); +constexpr TypedWhichId<SwFormatAutoFormat> RES_AUTO_STYLE(126); +constexpr TypedWhichId<SfxStringItem> RES_FRMATR_STYLE_NAME(127); +constexpr TypedWhichId<SfxStringItem> RES_FRMATR_CONDITIONAL_STYLE_NAME(128); +constexpr TypedWhichId<SfxGrabBagItem> RES_FRMATR_GRABBAG(129); +constexpr TypedWhichId<SdrTextVertAdjustItem> RES_TEXT_VERT_ADJUST(130); constexpr sal_uInt16 RES_FRMATR_END(131); constexpr sal_uInt16 RES_GRFATR_BEGIN(RES_FRMATR_END); -constexpr TypedWhichId<SwMirrorGrf> RES_GRFATR_MIRRORGRF (RES_GRFATR_BEGIN); // 131 -constexpr TypedWhichId<SwCropGrf> RES_GRFATR_CROPGRF (132); - -constexpr TypedWhichId<SwRotationGrf> RES_GRFATR_ROTATION (133); -constexpr TypedWhichId<SwLuminanceGrf> RES_GRFATR_LUMINANCE (134); -constexpr TypedWhichId<SwContrastGrf> RES_GRFATR_CONTRAST (135); -constexpr TypedWhichId<SwChannelRGrf> RES_GRFATR_CHANNELR (136); -constexpr TypedWhichId<SwChannelGGrf> RES_GRFATR_CHANNELG (137); -constexpr TypedWhichId<SwChannelBGrf> RES_GRFATR_CHANNELB (138); -constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA (139); -constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT (140); -constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY (141); -constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE (142); - -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY1 (143); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY2 (144); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY3 (145); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4 (146); -constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5 (147); +constexpr TypedWhichId<SwMirrorGrf> RES_GRFATR_MIRRORGRF(RES_GRFATR_BEGIN); // 131 +constexpr TypedWhichId<SwCropGrf> RES_GRFATR_CROPGRF(132); + +constexpr TypedWhichId<SwRotationGrf> RES_GRFATR_ROTATION(133); +constexpr TypedWhichId<SwLuminanceGrf> RES_GRFATR_LUMINANCE(134); +constexpr TypedWhichId<SwContrastGrf> RES_GRFATR_CONTRAST(135); +constexpr TypedWhichId<SwChannelRGrf> RES_GRFATR_CHANNELR(136); +constexpr TypedWhichId<SwChannelGGrf> RES_GRFATR_CHANNELG(137); +constexpr TypedWhichId<SwChannelBGrf> RES_GRFATR_CHANNELB(138); +constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA(139); +constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT(140); +constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY(141); +constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE(142); + +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY1(143); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY2(144); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY3(145); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4(146); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5(147); constexpr sal_uInt16 RES_GRFATR_END(148); constexpr sal_uInt16 RES_BOXATR_BEGIN(RES_GRFATR_END); -constexpr TypedWhichId<SwTableBoxNumFormat> RES_BOXATR_FORMAT (RES_BOXATR_BEGIN); // 148 -constexpr TypedWhichId<SwTableBoxFormula> RES_BOXATR_FORMULA (149); -constexpr TypedWhichId<SwTableBoxValue> RES_BOXATR_VALUE (150); +constexpr TypedWhichId<SwTableBoxNumFormat> RES_BOXATR_FORMAT(RES_BOXATR_BEGIN); // 148 +constexpr TypedWhichId<SwTableBoxFormula> RES_BOXATR_FORMULA(149); +constexpr TypedWhichId<SwTableBoxValue> RES_BOXATR_VALUE(150); constexpr sal_uInt16 RES_BOXATR_END(151); constexpr sal_uInt16 RES_UNKNOWNATR_BEGIN(RES_BOXATR_END); -constexpr TypedWhichId<SvXMLAttrContainerItem> RES_UNKNOWNATR_CONTAINER (RES_UNKNOWNATR_BEGIN);// 151 +constexpr TypedWhichId<SvXMLAttrContainerItem> + RES_UNKNOWNATR_CONTAINER(RES_UNKNOWNATR_BEGIN); // 151 constexpr sal_uInt16 RES_UNKNOWNATR_END(152); constexpr sal_uInt16 POOLATTR_END(RES_UNKNOWNATR_END); // Format IDs constexpr sal_uInt16 RES_FMT_BEGIN(RES_UNKNOWNATR_END); -constexpr TypedWhichId<SwCharFormat> RES_CHRFMT (RES_FMT_BEGIN); // 152 -constexpr TypedWhichId<SwFrameFormat> RES_FRMFMT (153); -constexpr TypedWhichId<SwFlyFrameFormat> RES_FLYFRMFMT (154); -constexpr TypedWhichId<SwTextFormatColl> RES_TXTFMTCOLL (155); -constexpr TypedWhichId<SwGrfFormatColl> RES_GRFFMTCOLL (156); -constexpr TypedWhichId<SwDrawFrameFormat> RES_DRAWFRMFMT (157); -constexpr TypedWhichId<SwConditionTextFormatColl> RES_CONDTXTFMTCOLL (158); +constexpr TypedWhichId<SwCharFormat> RES_CHRFMT(RES_FMT_BEGIN); // 152 +constexpr TypedWhichId<SwFrameFormat> RES_FRMFMT(153); +constexpr TypedWhichId<SwFlyFrameFormat> RES_FLYFRMFMT(154); +constexpr TypedWhichId<SwTextFormatColl> RES_TXTFMTCOLL(155); +constexpr TypedWhichId<SwGrfFormatColl> RES_GRFFMTCOLL(156); +constexpr TypedWhichId<SwDrawFrameFormat> RES_DRAWFRMFMT(157); +constexpr TypedWhichId<SwConditionTextFormatColl> RES_CONDTXTFMTCOLL(158); constexpr sal_uInt16 RES_FMT_END(159); // ID's for Messages in the Formats constexpr sal_uInt16 RES_MSG_BEGIN(RES_FMT_END); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_OBJECTDYING (RES_MSG_BEGIN); // 159 -constexpr TypedWhichId<SwFormatChg> RES_FMT_CHG (160); -constexpr TypedWhichId<SwAttrSetChg> RES_ATTRSET_CHG (161); -constexpr TypedWhichId<SwInsText> RES_INS_TXT (162); -constexpr TypedWhichId<SwDelChr> RES_DEL_CHR (163); -constexpr TypedWhichId<SwDelText> RES_DEL_TXT (164); -constexpr TypedWhichId<SwUpdateAttr> RES_UPDATE_ATTR (165); -constexpr TypedWhichId<SwRefMarkFieldUpdate> RES_REFMARKFLD_UPDATE (166); -constexpr TypedWhichId<SwDocPosUpdate> RES_DOCPOS_UPDATE (167); -constexpr TypedWhichId<SwTableFormulaUpdate> RES_TABLEFML_UPDATE (168); -constexpr TypedWhichId<SwMsgPoolItem> RES_UPDATEDDETBL (169); -constexpr TypedWhichId<SwMsgPoolItem> RES_TBLHEADLINECHG (170); -constexpr TypedWhichId<SwAutoFormatGetDocNode> RES_AUTOFMT_DOCNODE (171); -constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_HIDDEN (172); -constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_NOT_HIDDEN (173); -constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_PIECE_ARRIVED (175); -constexpr TypedWhichId<SwMsgPoolItem> RES_HIDDENPARA_PRINT (176); -constexpr TypedWhichId<SwVirtPageNumInfo> RES_VIRTPAGENUM_INFO (178); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_REMOVE_UNO_OBJECT (179); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_OBJECTDYING(RES_MSG_BEGIN); // 159 +constexpr TypedWhichId<SwFormatChg> RES_FMT_CHG(160); +constexpr TypedWhichId<SwAttrSetChg> RES_ATTRSET_CHG(161); +constexpr TypedWhichId<SwInsText> RES_INS_TXT(162); +constexpr TypedWhichId<SwDelChr> RES_DEL_CHR(163); +constexpr TypedWhichId<SwDelText> RES_DEL_TXT(164); +constexpr TypedWhichId<SwUpdateAttr> RES_UPDATE_ATTR(165); +constexpr TypedWhichId<SwRefMarkFieldUpdate> RES_REFMARKFLD_UPDATE(166); +constexpr TypedWhichId<SwDocPosUpdate> RES_DOCPOS_UPDATE(167); +constexpr TypedWhichId<SwTableFormulaUpdate> RES_TABLEFML_UPDATE(168); +constexpr TypedWhichId<SwMsgPoolItem> RES_UPDATEDDETBL(169); +constexpr TypedWhichId<SwMsgPoolItem> RES_TBLHEADLINECHG(170); +constexpr TypedWhichId<SwAutoFormatGetDocNode> RES_AUTOFMT_DOCNODE(171); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_HIDDEN(172); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_NOT_HIDDEN(173); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_PIECE_ARRIVED(175); +constexpr TypedWhichId<SwMsgPoolItem> RES_HIDDENPARA_PRINT(176); +constexpr TypedWhichId<SwVirtPageNumInfo> RES_VIRTPAGENUM_INFO(178); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_REMOVE_UNO_OBJECT(179); // empty -constexpr TypedWhichId<SwFindNearestNode> RES_FINDNEARESTNODE (182); -constexpr TypedWhichId<SwPtrMsgPoolItem> RES_CONTENT_VISIBLE (183); -constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_SWAPIN (184); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_NAME_CHANGED (185); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_TITLE_CHANGED (186); -constexpr TypedWhichId<SwStringMsgPoolItem> RES_DESCRIPTION_CHANGED (187); -constexpr TypedWhichId<SwMsgPoolItem> RES_LINKED_GRAPHIC_STREAM_ARRIVED (187); +constexpr TypedWhichId<SwFindNearestNode> RES_FINDNEARESTNODE(182); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_CONTENT_VISIBLE(183); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_SWAPIN(184); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_NAME_CHANGED(185); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_TITLE_CHANGED(186); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_DESCRIPTION_CHANGED(187); +constexpr TypedWhichId<SwMsgPoolItem> RES_LINKED_GRAPHIC_STREAM_ARRIVED(187); constexpr sal_uInt16 RES_MSG_END(188); // An ID for the RTF-reader. The stylesheets are treated like attributes, // i.e. there is a StyleSheet-attribute. To avoid collision with other // Which()-values, the value is listed here. (The help system too defines // new attributes!) -constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_MSG_END); -constexpr TypedWhichId<SfxStringItem> RES_FLTR_BOOKMARK (RES_FLTRATTR_BEGIN); -constexpr TypedWhichId<SwFltAnchor> RES_FLTR_ANCHOR (189); -constexpr TypedWhichId<SfxStringItem> RES_FLTR_NUMRULE (190); -constexpr TypedWhichId<SwFltTOX> RES_FLTR_TOX (191); -constexpr TypedWhichId<SwFltRedline> RES_FLTR_REDLINE (192); -constexpr TypedWhichId<CntUInt16Item> RES_FLTR_ANNOTATIONMARK (193); -constexpr TypedWhichId<SwFltRDFMark> RES_FLTR_RDFMARK (194); -constexpr sal_uInt16 RES_FLTRATTR_END(195); +constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_MSG_END); +constexpr TypedWhichId<SfxStringItem> RES_FLTR_BOOKMARK(RES_FLTRATTR_BEGIN); +constexpr TypedWhichId<SwFltAnchor> RES_FLTR_ANCHOR(189); +constexpr TypedWhichId<SfxStringItem> RES_FLTR_NUMRULE(190); +constexpr TypedWhichId<SwFltTOX> RES_FLTR_TOX(191); +constexpr TypedWhichId<SwFltRedline> RES_FLTR_REDLINE(192); +constexpr TypedWhichId<CntUInt16Item> RES_FLTR_ANNOTATIONMARK(193); +constexpr TypedWhichId<SwFltRDFMark> RES_FLTR_RDFMARK(194); +constexpr sal_uInt16 RES_FLTRATTR_END(195); constexpr sal_uInt16 RES_TBX_DUMMY(RES_FLTRATTR_END + 1); @@ -470,13 +472,11 @@ inline bool isCHRATR(const sal_uInt16 nWhich) } inline bool isTXTATR_WITHEND(const sal_uInt16 nWhich) { - return (RES_TXTATR_WITHEND_BEGIN <= nWhich) - && (RES_TXTATR_WITHEND_END > nWhich); + return (RES_TXTATR_WITHEND_BEGIN <= nWhich) && (RES_TXTATR_WITHEND_END > nWhich); } inline bool isTXTATR_NOEND(const sal_uInt16 nWhich) { - return (RES_TXTATR_NOEND_BEGIN <= nWhich) - && (RES_TXTATR_NOEND_END > nWhich); + return (RES_TXTATR_NOEND_BEGIN <= nWhich) && (RES_TXTATR_NOEND_END > nWhich); } inline bool isTXTATR(const sal_uInt16 nWhich) { @@ -522,26 +522,28 @@ struct SfxItemInfo; typedef std::vector<SfxPoolItem*> SwDfltAttrTab; extern SwDfltAttrTab aAttrTab; -extern SfxItemInfo aSlotTab[]; +extern SfxItemInfo aSlotTab[]; /** Get the default attribute from corresponding default attribute table. @param[in] nWhich Position in table @return Attribute if found, null pointer otherwise */ -SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ); +SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr(sal_uInt16 nWhich); -template<class T> inline const T* GetDfltAttr( TypedWhichId<T> nWhich ) -{ return static_cast<const T*>(GetDfltAttr(sal_uInt16(nWhich))); } +template <class T> inline const T* GetDfltAttr(TypedWhichId<T> nWhich) +{ + return static_cast<const T*>(GetDfltAttr(sal_uInt16(nWhich))); +} -SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript ); +SW_DLLPUBLIC sal_uInt16 GetWhichOfScript(sal_uInt16 nWhich, sal_uInt16 nScript); // return for the given TextAttribute without an end the correct character. // This function returns // CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default) // CH_TXTATR_INWORD for Textattribute which doesn't breaks a word class SwTextAttr; -sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr ); +sal_Unicode GetCharOfTextAttr(const SwTextAttr& rAttr); // all Sets defined in init.cxx @@ -571,7 +573,7 @@ extern sal_uInt16 const aCharAutoFormatSetRange[]; extern sal_uInt16 const aPgFrameFormatSetRange[]; // check if ID is InRange of AttrSet-Ids -bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId ); +bool IsInRange(const sal_uInt16* pRange, const sal_uInt16 nId); #endif diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx index 606863909406..f3fc2bf7d4df 100644 --- a/sw/inc/pausethreadstarting.hxx +++ b/sw/inc/pausethreadstarting.hxx @@ -28,14 +28,12 @@ */ class SwPauseThreadStarting { - public: +public: + SwPauseThreadStarting(); + ~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE; - SwPauseThreadStarting(); - ~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE; - - private: - - bool mbPausedThreadStarting; +private: + bool mbPausedThreadStarting; }; #endif diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 41a2835ebe51..9966f610b2bd 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -25,7 +25,7 @@ class SwPrintOptions final : public SwPrintData, public utl::ConfigItem { private: - bool m_bIsWeb; + bool m_bIsWeb; css::uno::Sequence<OUString> GetPropertyNames() const; @@ -35,12 +35,12 @@ public: SwPrintOptions(bool bWeb); virtual ~SwPrintOptions() override; - virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify(const css::uno::Sequence<OUString>& aPropertyNames) override; virtual void doSetModified() override { SetModified(); } SwPrintOptions& operator=(const SwPrintData& rData) { - SwPrintData::operator=( rData ); + SwPrintData::operator=(rData); SetModified(); return *this; } diff --git a/sw/inc/sw_primitivetypes2d.hxx b/sw/inc/sw_primitivetypes2d.hxx index 44509820f72c..fbd8dbce1b77 100644 --- a/sw/inc/sw_primitivetypes2d.hxx +++ b/sw/inc/sw_primitivetypes2d.hxx @@ -22,10 +22,10 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -#define PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SW| 0) -#define PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 1) -#define PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 2) -#define PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 3) +#define PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SW | 0) +#define PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW | 1) +#define PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW | 2) +#define PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE (PRIMITIVE2D_ID_RANGE_SW | 3) #endif // INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 0a6b65a33897..fc79dc1cb18c 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -33,13 +33,13 @@ class SwOleClient final : public SfxInPlaceClient bool m_IsOldCheckForOLEInCaption; virtual void ObjectAreaChanged() override; - virtual void RequestNewObjectArea( tools::Rectangle& ) override; + virtual void RequestNewObjectArea(tools::Rectangle&) override; virtual void ViewChanged() override; public: - SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); + SwOleClient(SwView* pView, SwEditWin* pWin, const svt::EmbeddedObjectRef&); - void SetInDoVerb(bool const bFlag) { m_IsInDoVerb = bFlag; } + void SetInDoVerb(bool const bFlag) { m_IsInDoVerb = bFlag; } bool IsCheckForOLEInCaption() const { return m_IsOldCheckForOLEInCaption; } diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h index ac50f3e381b8..61f5c554be75 100644 --- a/sw/inc/swcommands.h +++ b/sw/inc/swcommands.h @@ -19,9 +19,8 @@ #ifndef INCLUDED_SW_INC_SWCOMMANDS_H #define INCLUDED_SW_INC_SWCOMMANDS_H -#define CMD_FN_READONLY_SELECTION_MODE ".uno:SelectTextMode" +#define CMD_FN_READONLY_SELECTION_MODE ".uno:SelectTextMode" #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 80b7593378d5..47cbb5a66cae 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -27,22 +27,22 @@ class SwDDETable final : public SwTable { sw::WriterMultiListener m_aDepends; SwDDEFieldType* m_pDDEType; -public: +public: // Ctor moves all lines/boxes from SwTable to it. // After that SwTable is empty and has to be deleted. - SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, - bool bUpdate = true ); + SwDDETable(SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate = true); virtual ~SwDDETable() override; void ChangeContent(); - bool NoDDETable(); + bool NoDDETable(); SwDDEFieldType* GetDDEFieldType(); inline const SwDDEFieldType* GetDDEFieldType() const; + private: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; - virtual void SwClientNotify( const SwModify&, const SfxHint& ) override; + virtual void Modify(const SfxPoolItem*, const SfxPoolItem*) override; + virtual void SwClientNotify(const SwModify&, const SfxHint&) override; }; inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx index 9cc9b3c8bfe0..08fda1af91d6 100644 --- a/sw/inc/swdll.hxx +++ b/sw/inc/swdll.hxx @@ -21,7 +21,10 @@ #include "swdllapi.h" -namespace sw { class Filters; } +namespace sw +{ +class Filters; +} /** * This class is a wrapper for a Load-On-Demand-DLL. One instance @@ -30,9 +33,9 @@ namespace sw { class Filters; } */ namespace SwGlobals { - void SW_DLLPUBLIC ensure(); +void SW_DLLPUBLIC ensure(); - sw::Filters & getFilters(); +sw::Filters& getFilters(); } #endif diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h index ceca351ee298..589a55cb2bc4 100644 --- a/sw/inc/swdllapi.h +++ b/sw/inc/swdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(SW_DLLIMPLEMENTATION) -#define SW_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SW_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SW_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SW_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_SW_INC_SWDLLAPI_H diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx index 417cc10cbebd..7582970c1fac 100644 --- a/sw/inc/toxe.hxx +++ b/sw/inc/toxe.hxx @@ -36,7 +36,7 @@ enum SwTOIKeyType // Somewhat redundantly fix TOXType's underlying type to int, so that // SwTOXEntryTabPage (sw/source/ui/index/cnttab.cxx) can initialize // aLastTOXType.eType to (TOXTypes)USHRT_MAX without causing -fsanitize=enum: -enum TOXTypes: int +enum TOXTypes : int { TOX_INDEX, TOX_USER, diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index afea9bc0af50..5b3d6bd33408 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -724,7 +724,8 @@ #define UNO_NAME_FILE_NAME_FROM_COLUMN "FileNameFromColumn" #define UNO_NAME_FILE_NAME_PREFIX "FileNamePrefix" #define UNO_NAME_CHAR_STYLE_NAMES "CharStyleNames" -#define UNO_NAME_DAD_COMMAND "Command" /* DAD = DataAccessDescriptor (see com.sun.star.sdb.DataAccessDescriptor) */ +#define UNO_NAME_DAD_COMMAND \ + "Command" /* DAD = DataAccessDescriptor (see com.sun.star.sdb.DataAccessDescriptor) */ #define UNO_NAME_DAD_COMMAND_TYPE "CommandType" #define UNO_NAME_CLSID "CLSID" #define UNO_NAME_COMPONENT "Component" diff --git a/sw/qa/core/test_ToxMiscTest.cxx b/sw/qa/core/test_ToxMiscTest.cxx index ac679250a09b..22ad986aca4e 100644 --- a/sw/qa/core/test_ToxMiscTest.cxx +++ b/sw/qa/core/test_ToxMiscTest.cxx @@ -14,7 +14,8 @@ using namespace sw; -class ToxMiscTest : public CppUnit::TestFixture { +class ToxMiscTest : public CppUnit::TestFixture +{ public: void testTdf73162(); CPPUNIT_TEST_SUITE(ToxMiscTest); @@ -25,7 +26,9 @@ public: void ToxMiscTest::testTdf73162() { //create Tokens with the help of input string - SwFormTokensHelper tokensHelper("<LS Index Link,65535,><E# ,65535,0,10><X ,65535,\001.\001><ET ,65535,><T ,65535,0,5,.,1><# ,65535,><LE ,65535,>"); //input token string + SwFormTokensHelper tokensHelper( + "<LS Index Link,65535,><E# ,65535,0,10><X ,65535,\001.\001><ET ,65535,><T " + ",65535,0,5,.,1><# ,65535,><LE ,65535,>"); //input token string SwFormTokens formTokens = tokensHelper.GetTokens(); //check the size of token vector / count of tokens diff --git a/sw/qa/core/test_ToxWhitespaceStripper.cxx b/sw/qa/core/test_ToxWhitespaceStripper.cxx index e8303ab3da73..7af8dae25184 100644 --- a/sw/qa/core/test_ToxWhitespaceStripper.cxx +++ b/sw/qa/core/test_ToxWhitespaceStripper.cxx @@ -21,17 +21,13 @@ using namespace sw; class ToxWhitespaceStripperTest : public CppUnit::TestFixture { - void - MappingCharactersToVariousStrippedStringsWorks(); + void MappingCharactersToVariousStrippedStringsWorks(); - void - StrippingWhitespacesFromVariousStringsWorks(); + void StrippingWhitespacesFromVariousStringsWorks(); - void - PositionAfterStringCanBeRequested(); + void PositionAfterStringCanBeRequested(); - void - InvalidPositionIsMappedToLastEntry(); + void InvalidPositionIsMappedToLastEntry(); CPPUNIT_TEST_SUITE(ToxWhitespaceStripperTest); CPPUNIT_TEST(MappingCharactersToVariousStrippedStringsWorks); @@ -40,11 +36,9 @@ class ToxWhitespaceStripperTest : public CppUnit::TestFixture CPPUNIT_TEST(InvalidPositionIsMappedToLastEntry); CPPUNIT_TEST_SUITE_END(); - }; -void -ToxWhitespaceStripperTest::MappingCharactersToVariousStrippedStringsWorks() +void ToxWhitespaceStripperTest::MappingCharactersToVariousStrippedStringsWorks() { { ToxWhitespaceStripper sut("abc\n"); @@ -89,8 +83,7 @@ ToxWhitespaceStripperTest::MappingCharactersToVariousStrippedStringsWorks() } } -void -ToxWhitespaceStripperTest::StrippingWhitespacesFromVariousStringsWorks() +void ToxWhitespaceStripperTest::StrippingWhitespacesFromVariousStringsWorks() { { ToxWhitespaceStripper sut("abc\n"); @@ -118,8 +111,7 @@ ToxWhitespaceStripperTest::StrippingWhitespacesFromVariousStringsWorks() } } -void -ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested() +void ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested() { OUString const test("abc"); ToxWhitespaceStripper sut(test); @@ -127,12 +119,12 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested() CPPUNIT_ASSERT_EQUAL(expected, sut.GetPositionInStrippedString(test.getLength())); } -void -ToxWhitespaceStripperTest::InvalidPositionIsMappedToLastEntry() +void ToxWhitespaceStripperTest::InvalidPositionIsMappedToLastEntry() { ToxWhitespaceStripper sut("ab c"); sal_Int32 const expected = 4; // the length of the string after merging the two whitespaces - sal_Int32 result = sut.GetPositionInStrippedString(40); // a value past the original string length + sal_Int32 result + = sut.GetPositionInStrippedString(40); // a value past the original string length CPPUNIT_ASSERT_EQUAL(expected, result); } diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 2554e7d23a7b..cf370a324789 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -127,10 +127,11 @@ private: FieldUnit m_eUnit; public: - HtmlExportTest() : - SwModelTestBase("/sw/qa/extras/htmlexport/data/", "HTML (StarWriter)"), - m_eUnit(FieldUnit::NONE) - {} + HtmlExportTest() + : SwModelTestBase("/sw/qa/extras/htmlexport/data/", "HTML (StarWriter)") + , m_eUnit(FieldUnit::NONE) + { + } /** * Wraps a reqif-xhtml fragment into an XHTML file, so an XML parser can @@ -193,11 +194,10 @@ private: { // FIXME if padding-top gets exported as inches, not cms, we get rounding errors. SwGlobals::ensure(); // make sure that SW_MOD() is not 0 - std::unique_ptr<Resetter> pResetter(new Resetter( - [this] () { - SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); - pPref->SetMetric(this->m_eUnit); - })); + std::unique_ptr<Resetter> pResetter(new Resetter([this]() { + SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); + pPref->SetMetric(this->m_eUnit); + })); SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); m_eUnit = pPref->GetMetric(); pPref->SetMetric(FieldUnit::CM); @@ -205,10 +205,10 @@ private: } return nullptr; } - }; -#define DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, HtmlExportTest) +#define DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(TestName, filename) \ + DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, HtmlExportTest) /// HTML export of the sw doc model tests. class SwHtmlDomExportTest : public SwModelTestBase, public HtmlTestTools @@ -275,7 +275,8 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo86857, "fdo86857.html") CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff0000), getProperty<sal_Int32>(xStyle, "BackColor")); // check that table background color works, which still uses RES_BACKGROUND uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); - uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), + uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY); uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); @@ -286,27 +287,35 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testCharacterBorder, "charborder.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); - uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1),1), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1), 1), uno::UNO_QUERY); // Different Border { - CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x6666FF,12,12,12,3,37), getProperty<table::BorderLine2>(xRun,"CharTopBorder")); - CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF9900,0,99,0,2,99), getProperty<table::BorderLine2>(xRun,"CharLeftBorder")); - CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF0000,0,169,0,1,169), getProperty<table::BorderLine2>(xRun,"CharBottomBorder")); - CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0000FF,0,169,0,0,169), getProperty<table::BorderLine2>(xRun,"CharRightBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x6666FF, 12, 12, 12, 3, 37), + getProperty<table::BorderLine2>(xRun, "CharTopBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF9900, 0, 99, 0, 2, 99), + getProperty<table::BorderLine2>(xRun, "CharLeftBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF0000, 0, 169, 0, 1, 169), + getProperty<table::BorderLine2>(xRun, "CharBottomBorder")); + CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0000FF, 0, 169, 0, 0, 169), + getProperty<table::BorderLine2>(xRun, "CharRightBorder")); } // Different Padding { - CPPUNIT_ASSERT_EQUAL(sal_Int32(450), getProperty<sal_Int32>(xRun,"CharTopBorderDistance")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(550), getProperty<sal_Int32>(xRun,"CharLeftBorderDistance")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getProperty<sal_Int32>(xRun,"CharBottomBorderDistance")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getProperty<sal_Int32>(xRun,"CharRightBorderDistance")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(450), getProperty<sal_Int32>(xRun, "CharTopBorderDistance")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(550), + getProperty<sal_Int32>(xRun, "CharLeftBorderDistance")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(150), + getProperty<sal_Int32>(xRun, "CharBottomBorderDistance")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(250), + getProperty<sal_Int32>(xRun, "CharRightBorderDistance")); } // No shadow } -#define DECLARE_HTMLEXPORT_TEST(TestName, filename) DECLARE_SW_EXPORT_TEST(TestName, filename, nullptr, HtmlExportTest) +#define DECLARE_HTMLEXPORT_TEST(TestName, filename) \ + DECLARE_SW_EXPORT_TEST(TestName, filename, nullptr, HtmlExportTest) DECLARE_HTMLEXPORT_TEST(testExportOfImages, "textAndImage.docx") { @@ -420,7 +429,8 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding, "tdf76291.odt") CPPUNIT_ASSERT(pDoc); // Test URI encoded hyperlink with Chinese characters - assertXPath(pDoc, "/html/body/p/a", "href", "http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12"); + assertXPath(pDoc, "/html/body/p/a", "href", + "http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12"); } DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, "tdf90905.odt") @@ -440,7 +450,35 @@ DECLARE_HTMLEXPORT_TEST(testExportImageBulletList, "tdf66822.odt") // Encoded base64 SVG bullet should match and render on browser assertXPath(pDoc, "/html/body/ul", 1); - assertXPath(pDoc, "/html/body/ul", "style", "list-style-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxMi4wLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDUxNDQ4KSAgLS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiIFsNCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCgk8IUVOVElUWSBuc194bGluayAiaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+DQpdPg0KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE0LjAwOCIgaGVpZ2h0PSIxNC4wMSINCgkgdmlld0JveD0iMCAwIDE0LjAwOCAxNC4wMSIgb3ZlcmZsb3c9InZpc2libGUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDE0LjAwOCAxNC4wMSIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cmFkaWFsR3JhZGllbnQgaWQ9IlhNTElEXzRfIiBjeD0iNy4wMDQ0IiBjeT0iNy4wMDQ5IiByPSI3LjAwNDQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4NCgkJPHN0b3AgIG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6IzM1REIzNSIvPg0KCQk8c3RvcCAgb2Zmc2V0PSIxIiBzdHlsZT0ic3RvcC1jb2xvcjojMDBBMDAwIi8+DQoJPC9yYWRpYWxHcmFkaWVudD4NCgk8Y2lyY2xlIGZpbGw9InVybCgjWE1MSURfNF8pIiBjeD0iNy4wMDQiIGN5PSI3LjAwNSIgcj0iNy4wMDQiLz4NCgk8ZGVmcz4NCgkJPGZpbHRlciBpZD0iQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeD0iMy40ODEiIHk9IjAuNjkzIiB3aWR0aD0iNi45ODgiIGhlaWdodD0iMy44OTMiPg0KCQkJPGZlQ29sb3JNYXRyaXggIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIxIDAgMCAwIDAgIDAgMSAwIDAgMCAgMCAwIDEgMCAwICAwIDAgMCAxIDAiLz4NCgkJPC9maWx0ZXI+DQoJPC9kZWZzPg0KCTxtYXNrIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjMuNDgxIiB5PSIwLjY5MyIgd2lkdGg9IjYuOTg4IiBoZWlnaHQ9IjMuODkzIiBpZD0iWE1MSURfNV8iPg0KCQk8ZyBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIj4NCgkJCTxsaW5lYXJHcmFkaWVudCBpZD0iWE1MSURfNl8iIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iNy4xMjIxIiB5MT0iMC4xMDMiIHgyPSI3LjEyMjEiIHkyPSI1LjIzNDQiPg0KCQkJCTxzdG9wICBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNGRkZGRkYiLz4NCgkJCQk8c3RvcCAgb2Zmc2V0PSIxIiBzdHlsZT0ic3RvcC1jb2xvcjojMDAwMDAwIi8+DQoJCQk8L2xpbmVhckdyYWRpZW50Pg0KCQkJPHJlY3QgeD0iMy4xOTkiIHk9IjAuMzM5IiBvcGFjaXR5PSIwLjciIGZpbGw9InVybCgjWE1MSURfNl8pIiB3aWR0aD0iNy44NDYiIGhlaWdodD0iNC42MDEiLz4NCgkJPC9nPg0KCTwvbWFzaz4NCgk8ZWxsaXBzZSBtYXNrPSJ1cmwoI1hNTElEXzVfKSIgZmlsbD0iI0ZGRkZGRiIgY3g9IjYuOTc1IiBjeT0iMi42NCIgcng9IjMuNDk0IiByeT0iMS45NDYiLz4NCjwvZz4NCjwvc3ZnPg0K);"); + assertXPath( + pDoc, "/html/body/ul", "style", + "list-style-image: url(data:image/svg+xml;base64," + "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3" + "RyYXRvciAxMi4wLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDUxNDQ4KSAg" + "LS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm" + "9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiIFsNCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cu" + "dzMub3JnLzIwMDAvc3ZnIj4NCgk8IUVOVElUWSBuc194bGluayAiaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluay" + "I+DQpdPg0KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGlu" + "az0iJm5zX3hsaW5rOyIgd2lkdGg9IjE0LjAwOCIgaGVpZ2h0PSIxNC4wMSINCgkgdmlld0JveD0iMCAwIDE0LjAwOC" + "AxNC4wMSIgb3ZlcmZsb3c9InZpc2libGUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDE0LjAwOCAxNC4wMSIg" + "eG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cmFkaWFsR3JhZGllbnQgaWQ9IlhNTElEXzRfIiBjeD0iNy4wMD" + "Q0IiBjeT0iNy4wMDQ5IiByPSI3LjAwNDQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4NCgkJPHN0b3Ag" + "IG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6IzM1REIzNSIvPg0KCQk8c3RvcCAgb2Zmc2V0PSIxIiBzdHlsZT" + "0ic3RvcC1jb2xvcjojMDBBMDAwIi8+DQoJPC9yYWRpYWxHcmFkaWVudD4NCgk8Y2lyY2xlIGZpbGw9InVybCgjWE1M" + "SURfNF8pIiBjeD0iNy4wMDQiIGN5PSI3LjAwNSIgcj0iNy4wMDQiLz4NCgk8ZGVmcz4NCgkJPGZpbHRlciBpZD0iQW" + "RvYmVfT3BhY2l0eU1hc2tGaWx0ZXIiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeD0iMy40ODEiIHk9IjAu" + "NjkzIiB3aWR0aD0iNi45ODgiIGhlaWdodD0iMy44OTMiPg0KCQkJPGZlQ29sb3JNYXRyaXggIHR5cGU9Im1hdHJpeC" + "IgdmFsdWVzPSIxIDAgMCAwIDAgIDAgMSAwIDAgMCAgMCAwIDEgMCAwICAwIDAgMCAxIDAiLz4NCgkJPC9maWx0ZXI+" + "DQoJPC9kZWZzPg0KCTxtYXNrIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjMuNDgxIiB5PSIwLjY5MyIgd2" + "lkdGg9IjYuOTg4IiBoZWlnaHQ9IjMuODkzIiBpZD0iWE1MSURfNV8iPg0KCQk8ZyBmaWx0ZXI9InVybCgjQWRvYmVf" + "T3BhY2l0eU1hc2tGaWx0ZXIpIj4NCgkJCTxsaW5lYXJHcmFkaWVudCBpZD0iWE1MSURfNl8iIGdyYWRpZW50VW5pdH" + "M9InVzZXJTcGFjZU9uVXNlIiB4MT0iNy4xMjIxIiB5MT0iMC4xMDMiIHgyPSI3LjEyMjEiIHkyPSI1LjIzNDQiPg0K" + "CQkJCTxzdG9wICBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNGRkZGRkYiLz4NCgkJCQk8c3RvcCAgb2Zmc2" + "V0PSIxIiBzdHlsZT0ic3RvcC1jb2xvcjojMDAwMDAwIi8+DQoJCQk8L2xpbmVhckdyYWRpZW50Pg0KCQkJPHJlY3Qg" + "eD0iMy4xOTkiIHk9IjAuMzM5IiBvcGFjaXR5PSIwLjciIGZpbGw9InVybCgjWE1MSURfNl8pIiB3aWR0aD0iNy44ND" + "YiIGhlaWdodD0iNC42MDEiLz4NCgkJPC9nPg0KCTwvbWFzaz4NCgk8ZWxsaXBzZSBtYXNrPSJ1cmwoI1hNTElEXzVf" + "KSIgZmlsbD0iI0ZGRkZGRiIgY3g9IjYuOTc1IiBjeT0iMi42NCIgcng9IjMuNDk0IiByeT0iMS45NDYiLz4NCjwvZz" + "4NCjwvc3ZnPg0K);"); } DECLARE_HTMLEXPORT_TEST(testTdf83890, "tdf83890.odt") @@ -453,7 +491,7 @@ DECLARE_HTMLEXPORT_TEST(testTdf83890, "tdf83890.odt") DECLARE_HTMLEXPORT_TEST(testExtbChars, "extb.html") { - OUString aExpected( u"\U00024b62"); + OUString aExpected(u"\U00024b62"); // Assert that UTF8 encoded non-BMP Unicode character is correct uno::Reference<text::XTextRange> xTextRange1 = getRun(getParagraph(1), 1); CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString()); @@ -512,9 +550,9 @@ DECLARE_HTMLEXPORT_TEST(testReqIfParagraph, "reqif-p.xhtml") sal_uInt64 nLength = pStream->TellEnd(); OString aExpected = "<reqif-xhtml:div><reqif-xhtml:p>aaa<reqif-xhtml:br/>\nbbb" - "</reqif-xhtml:p>" SAL_NEWLINE_STRING - // This was '<table' instead. - "<reqif-xhtml:table"; + "</reqif-xhtml:p>" SAL_NEWLINE_STRING + // This was '<table' instead. + "<reqif-xhtml:table"; OString aStream(read_uInt8s_ToOString(*pStream, nLength)); pStream->Seek(0); @@ -532,7 +570,8 @@ DECLARE_HTMLEXPORT_TEST(testReqIfParagraph, "reqif-p.xhtml") CPPUNIT_ASSERT(aStream.indexOf("<reqif-xhtml:strong>") != -1); // This was "<strike>" instead of CSS. - CPPUNIT_ASSERT(aStream.indexOf("<reqif-xhtml:span style=\"text-decoration: line-through\"") != -1); + CPPUNIT_ASSERT(aStream.indexOf("<reqif-xhtml:span style=\"text-decoration: line-through\"") + != -1); // This was "<font>" instead of CSS + namespace prefix was missing. CPPUNIT_ASSERT(aStream.indexOf("<reqif-xhtml:span style=\"color: #ce181e\"") != -1); @@ -700,7 +739,8 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOle2, "reqif-ole2.xhtml") uno::UNO_QUERY); uno::Reference<document::XEmbeddedObjectSupplier2> xObject(xObjects->getByIndex(0), uno::UNO_QUERY); - uno::Reference<io::XActiveDataStreamer> xEmbeddedObject(xObject->getExtendedControlOverEmbeddedObject(), uno::UNO_QUERY); + uno::Reference<io::XActiveDataStreamer> xEmbeddedObject( + xObject->getExtendedControlOverEmbeddedObject(), uno::UNO_QUERY); // This failed, the "RTF fragment" native data was loaded as-is, we had no // filter to handle it, so nothing happened on double-click. CPPUNIT_ASSERT(xEmbeddedObject.is()); @@ -940,10 +980,9 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifComment) { // Create a document with a comment in it. loadURL("private:factory/swriter", nullptr); - uno::Sequence<beans::PropertyValue> aPropertyValues = comphelper::InitPropertySequence( - { - {"Text", uno::makeAny(OUString("some text"))}, - {"Author", uno::makeAny(OUString("me"))}, + uno::Sequence<beans::PropertyValue> aPropertyValues = comphelper::InitPropertySequence({ + { "Text", uno::makeAny(OUString("some text")) }, + { "Author", uno::makeAny(OUString("me")) }, }); dispatchCommand(mxComponent, ".uno:InsertAnnotation", aPropertyValues); @@ -1101,8 +1140,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOle1Paint) comphelper::makePropertyValue("FilterName", OUString("HTML (StarWriter)")), comphelper::makePropertyValue("FilterOptions", OUString("xhtmlns=reqif-xhtml")), }; - mxComponent - = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", aLoadProperties); + mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", aLoadProperties); // Save it as ODT to inspect the result of the OLE1 -> OLE2 conversion. uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); @@ -1211,7 +1249,8 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testUnderlineNone) uno::Reference<text::XText> xText = xTextDocument->getText(); xText->insertString(xText->getEnd(), "x", /*bAbsorb=*/false); uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1), uno::UNO_QUERY); - xParagraph->setPropertyValue("CharUnderline", uno::makeAny(sal_Int16(awt::FontUnderline::NONE))); + xParagraph->setPropertyValue("CharUnderline", + uno::makeAny(sal_Int16(awt::FontUnderline::NONE))); // Export to reqif-xhtml. uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx index c0d6d2ba95b3..24a1b2ded86c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx @@ -12,7 +12,10 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase("/sw/qa/extras/ooxmlexport/data/", "Office Open XML Text") {} + Test() + : SwModelTestBase("/sw/qa/extras/ooxmlexport/data/", "Office Open XML Text") + { + } protected: bool mustTestImportOf(const char* filename) const override diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx index d4348732fb52..f29950b3c9cf 100644 --- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx @@ -26,7 +26,7 @@ class TestName : public Test \ { \ protected: \ - virtual OUString getTestName() override { return #TestName; } \ + virtual OUString getTestName() override { return #TestName; } \ virtual void postLoad(const char*) override \ { \ if (!bUseTempDir) \ @@ -70,7 +70,7 @@ aOpt.SetSaveRelFSys(true); \ CPPUNIT_ASSERT(aOpt.IsSaveRelFSys()); \ } \ - executeLoadReloadVerify(FileName); \ + executeLoadReloadVerify(FileName); \ } \ void verify() override; \ }; \ @@ -82,7 +82,7 @@ class TestName : public Test \ { \ protected: \ - virtual OUString getTestName() override { return #TestName; } \ + virtual OUString getTestName() override { return #TestName; } \ \ public: \ CPPUNIT_TEST_SUITE(TestName); \ @@ -242,8 +242,9 @@ DECLARE_LINKS_EXPORT_TEST(testNon_ascii_link_export, "non_ascii_link.docx", USE_ xmlDocUniquePtr pXmlDoc = parseExport("word/_rels/document.xml.rels"); assertXPath(pXmlDoc, "/rels:Relationships/rels:Relationship[@TargetMode='External']", "Target", - INetURLObject::decode( OUString("file:///C:/TEMP/%C3%A9kezet.docx"), INetURLObject::DecodeMechanism::ToIUri, - RTL_TEXTENCODING_UTF8)); + INetURLObject::decode(OUString("file:///C:/TEMP/%C3%A9kezet.docx"), + INetURLObject::DecodeMechanism::ToIUri, + RTL_TEXTENCODING_UTF8)); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index f948311c777f..821ed9883451 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -31,34 +31,30 @@ protected: virtual ~SwAccessibleHeaderFooter() override; public: - SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap, - const SwHeaderFrame* pHdFrame ); - SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap, - const SwFooterFrame* pFtFrame ); + SwAccessibleHeaderFooter(std::shared_ptr<SwAccessibleMap> const& pInitMap, + const SwHeaderFrame* pHdFrame); + SwAccessibleHeaderFooter(std::shared_ptr<SwAccessibleMap> const& pInitMap, + const SwFooterFrame* pFtFrame); // XAccessibleContext /// Return this object's description. - virtual OUString SAL_CALL - getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleDescription() override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL - getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; /** Return whether the specified service is supported by this class. */ - virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() override; }; diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx index 8b04869afc5a..71c390d4bbbe 100644 --- a/sw/source/core/attr/fmtfollowtextflow.cxx +++ b/sw/source/core/attr/fmtfollowtextflow.cxx @@ -22,7 +22,7 @@ #include <sal/log.hxx> -SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const +SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone(SfxItemPool*) const { return new SwFormatFollowTextFlow(*this); } diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index 096705e8ba73..e99c11a02f93 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -30,41 +30,39 @@ SwSmartTagMgr* SwSmartTagMgr::spTheSwSmartTagMgr = nullptr; SwSmartTagMgr& SwSmartTagMgr::Get() { - if ( !spTheSwSmartTagMgr ) + if (!spTheSwSmartTagMgr) { - spTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() ); + spTheSwSmartTagMgr = new SwSmartTagMgr(SwDocShell::Factory().GetModuleName()); spTheSwSmartTagMgr->Init("Writer"); } return *spTheSwSmartTagMgr; } -SwSmartTagMgr::SwSmartTagMgr( const OUString& rModuleName ) : - SmartTagMgr( rModuleName ) +SwSmartTagMgr::SwSmartTagMgr(const OUString& rModuleName) + : SmartTagMgr(rModuleName) { } -SwSmartTagMgr::~SwSmartTagMgr() -{ -} +SwSmartTagMgr::~SwSmartTagMgr() {} -void SwSmartTagMgr::modified( const lang::EventObject& rEO ) +void SwSmartTagMgr::modified(const lang::EventObject& rEO) { SolarMutexGuard aGuard; // Installed recognizers have changed. We remove all existing smart tags: - SwModule::CheckSpellChanges( false, true, true, true ); + SwModule::CheckSpellChanges(false, true, true, true); - SmartTagMgr::modified( rEO ); + SmartTagMgr::modified(rEO); } -void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) +void SwSmartTagMgr::changesOccurred(const util::ChangesEvent& rEvent) { SolarMutexGuard aGuard; // Configuration has changed. We remove all existing smart tags: - SwModule::CheckSpellChanges( false, true, true, true ); + SwModule::CheckSpellChanges(false, true, true, true); - SmartTagMgr::changesOccurred( rEvent ); + SmartTagMgr::changesOccurred(rEvent); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx index 69066ff5cbac..f6e00314dbe0 100644 --- a/sw/source/core/bastyp/checkit.cxx +++ b/sw/source/core/bastyp/checkit.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::i18n; SwCheckIt::SwCheckIt() { - Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext(); xCheck = InputSequenceChecker::create(xContext); } diff --git a/sw/source/core/bastyp/proofreadingiterator.cxx b/sw/source/core/bastyp/proofreadingiterator.cxx index 7d09b1676ccd..64c0ac2b1d09 100644 --- a/sw/source/core/bastyp/proofreadingiterator.cxx +++ b/sw/source/core/bastyp/proofreadingiterator.cxx @@ -18,27 +18,24 @@ #include <proofreadingiterator.hxx> -namespace { - +namespace +{ css::uno::Reference<css::linguistic2::XProofreadingIterator> instance; bool disposed = false; -void doDispose( - css::uno::Reference<css::linguistic2::XProofreadingIterator> const & - inst) +void doDispose(css::uno::Reference<css::linguistic2::XProofreadingIterator> const& inst) { css::uno::Reference<css::lang::XComponent> comp(inst, css::uno::UNO_QUERY); - if (comp.is()) { + if (comp.is()) + { SolarMutexReleaser r; comp->dispose(); } } - } css::uno::Reference<css::linguistic2::XProofreadingIterator> -sw::proofreadingiterator::get( - css::uno::Reference<css::uno::XComponentContext> const & context) +sw::proofreadingiterator::get(css::uno::Reference<css::uno::XComponentContext> const& context) { css::uno::Reference<css::linguistic2::XProofreadingIterator> inst( css::linguistic2::ProofreadingIterator::create(context)); @@ -48,13 +45,15 @@ sw::proofreadingiterator::get( instance = inst; disp = disposed; } - if (disp) { + if (disp) + { doDispose(inst); } return inst; } -void sw::proofreadingiterator::dispose() { +void sw::proofreadingiterator::dispose() +{ css::uno::Reference<css::linguistic2::XProofreadingIterator> inst; { SolarMutexGuard g; diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 59c01abb55cb..507804363e9a 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -49,22 +49,16 @@ Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev) return aSize; } -uno::Reference< linguistic2::XSpellChecker1 > GetSpellChecker() +uno::Reference<linguistic2::XSpellChecker1> GetSpellChecker() { return LinguMgr::GetSpellChecker(); } -uno::Reference< linguistic2::XHyphenator > GetHyphenator() -{ - return LinguMgr::GetHyphenator(); -} +uno::Reference<linguistic2::XHyphenator> GetHyphenator() { return LinguMgr::GetHyphenator(); } -uno::Reference< linguistic2::XThesaurus > GetThesaurus() -{ - return LinguMgr::GetThesaurus(); -} +uno::Reference<linguistic2::XThesaurus> GetThesaurus() { return LinguMgr::GetThesaurus(); } -uno::Reference< linguistic2::XLinguProperties > GetLinguPropertySet() +uno::Reference<linguistic2::XLinguProperties> GetLinguPropertySet() { return LinguMgr::GetLinguPropertySet(); } diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx index 5c986ab86552..0dd0f5dff6c0 100644 --- a/sw/source/core/crsr/BlockCursor.cxx +++ b/sw/source/core/crsr/BlockCursor.cxx @@ -20,13 +20,8 @@ #include <viscrs.hxx> #include "BlockCursor.hxx" -SwBlockCursor::~SwBlockCursor() -{ -} +SwBlockCursor::~SwBlockCursor() {} -SwShellCursor& SwBlockCursor::getShellCursor() -{ - return maCursor; -} +SwShellCursor& SwBlockCursor::getShellCursor() { return maCursor; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx index b1301b2f13f6..4b27b02746a1 100644 --- a/sw/source/core/doc/swstylemanager.hxx +++ b/sw/source/core/doc/swstylemanager.hxx @@ -25,7 +25,7 @@ class IStyleAccess; class SfxItemSet; -std::unique_ptr<IStyleAccess> createStyleManager( SfxItemSet const * pIgnorableParagraphItems ); +std::unique_ptr<IStyleAccess> createStyleManager(SfxItemSet const* pIgnorableParagraphItems); #endif // INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index ecd226b51645..010e1f4dec6f 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -31,16 +31,16 @@ class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable> { public: - explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread ); + explicit CancellableJob(const ::rtl::Reference<ObservableThread>& rThread); // css::util::XCancellable: virtual void SAL_CALL cancel() override; private: - CancellableJob( CancellableJob const & ) = delete; - void operator =( CancellableJob const & ) = delete; + CancellableJob(CancellableJob const&) = delete; + void operator=(CancellableJob const&) = delete; - ::rtl::Reference< ObservableThread > mrThread; + ::rtl::Reference<ObservableThread> mrThread; }; #endif diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx index 70e3ed72f695..286f9d35c1e0 100644 --- a/sw/source/core/docnode/ndsect.hxx +++ b/sw/source/core/docnode/ndsect.hxx @@ -24,8 +24,7 @@ class SwSectionNode; -void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd ); - +void sw_DeleteFootnote(SwSectionNode* pNd, sal_uLong nStt, sal_uLong nEnd); #endif diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx index 5d93ea9236d9..953bd3a3f8fd 100644 --- a/sw/source/core/docnode/pausethreadstarting.cxx +++ b/sw/source/core/docnode/pausethreadstarting.cxx @@ -27,10 +27,10 @@ */ SwPauseThreadStarting::SwPauseThreadStarting() - : mbPausedThreadStarting( false ) + : mbPausedThreadStarting(false) { - if ( SwThreadManager::ExistsThreadManager() && - !SwThreadManager::GetThreadManager().StartingOfThreadsSuspended() ) + if (SwThreadManager::ExistsThreadManager() + && !SwThreadManager::GetThreadManager().StartingOfThreadsSuspended()) { SwThreadManager::GetThreadManager().SuspendStartingOfThreads(); mbPausedThreadStarting = true; @@ -39,7 +39,7 @@ SwPauseThreadStarting::SwPauseThreadStarting() SwPauseThreadStarting::~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE { - if ( mbPausedThreadStarting ) + if (mbPausedThreadStarting) { SwThreadManager::GetThreadManager().ResumeStartingOfThreads(); } diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx index ee5a3144cdf3..d13540d33ff8 100644 --- a/sw/source/core/docnode/swthreadjoiner.cxx +++ b/sw/source/core/docnode/swthreadjoiner.cxx @@ -29,26 +29,25 @@ using namespace ::com::sun::star; namespace { - class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex> {}; +class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex> +{ +}; - uno::Reference< util::XJobManager > pThreadJoiner; +uno::Reference<util::XJobManager> pThreadJoiner; } -uno::Reference< util::XJobManager >& SwThreadJoiner::GetThreadJoiner() +uno::Reference<util::XJobManager>& SwThreadJoiner::GetThreadJoiner() { osl::MutexGuard aGuard(theJoinerMutex::get()); - if ( !pThreadJoiner.is() ) + if (!pThreadJoiner.is()) { - pThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() ); + pThreadJoiner = util::JobManager::create(comphelper::getProcessComponentContext()); } return pThreadJoiner; } -void SwThreadJoiner::ReleaseThreadJoiner() -{ - pThreadJoiner.clear(); -} +void SwThreadJoiner::ReleaseThreadJoiner() { pThreadJoiner.clear(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index ebf5cabab643..3247d0500523 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -30,24 +30,25 @@ using namespace com::sun::star; bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const { - const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); - uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); + const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); + uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext); std::vector<SwFormatField*> vFields; - for(const auto& pFieldType : *pFieldTypes) + for (const auto& pFieldType : *pFieldTypes) { - if(IsUsed(*pFieldType) && pFieldType->Which() == SwFieldIds::Database) + if (IsUsed(*pFieldType) && pFieldType->Which() == SwFieldIds::Database) pFieldType->GatherFields(vFields); } - if(!vFields.size()) + if (!vFields.size()) return true; - const SwDBData& rData = static_cast<SwDBFieldType*>(vFields.front()->GetField()->GetTyp())->GetDBData(); + const SwDBData& rData + = static_cast<SwDBFieldType*>(vFields.front()->GetField()->GetTyp())->GetDBData(); try { return xDBContext->getByName(rData.sDataSource).hasValue(); } - catch(uno::Exception const &) + catch (uno::Exception const&) { rUsedDataSource = rData.sDataSource; return false; diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 46c682817247..4880fc75eaf4 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -30,39 +30,37 @@ class OutputDevice; class JobSetup; class SwPrintData; -namespace sw { - +namespace sw +{ class DocumentDeviceManager : public IDocumentDeviceAccess { - public: + DocumentDeviceManager(SwDoc& i_rSwdoc); - DocumentDeviceManager( SwDoc& i_rSwdoc ); + SfxPrinter* getPrinter(/*[in]*/ bool bCreate) const override; - SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const override; + void setPrinter(/*[in]*/ SfxPrinter* pP, /*[in]*/ bool bDeleteOld, + /*[in]*/ bool bCallPrtDataChanged) override; - void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) override; + VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate) const override; - VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override; + void setVirtualDevice(/*[in]*/ VirtualDevice* pVd) override; - void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) override; + OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate) const override; - OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override; - - void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) override; + void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes) override; const JobSetup* getJobsetup() const override; - void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) override; + void setJobsetup(/*[in]*/ const JobSetup& rJobSetup) override; - const SwPrintData & getPrintData() const override; + const SwPrintData& getPrintData() const override; - void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) override; + void setPrintData(/*[in]*/ const SwPrintData& rPrtData) override; virtual ~DocumentDeviceManager() override; private: - DocumentDeviceManager(DocumentDeviceManager const&) = delete; DocumentDeviceManager& operator=(DocumentDeviceManager const&) = delete; @@ -77,7 +75,6 @@ private: VclPtr<VirtualDevice> mpVirDev; std::unique_ptr<SwPrintData> mpPrtData; }; - } #endif diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index 2f86e2d732ee..b55dd333ba99 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -30,12 +30,10 @@ class SwDoc; namespace sw { - class DocumentDrawModelManager : public IDocumentDrawModelAccess { public: - - DocumentDrawModelManager( SwDoc& i_rSwdoc ); + DocumentDrawModelManager(SwDoc& i_rSwdoc); void InitDrawModel(); void ReleaseDrawModel(); @@ -53,16 +51,15 @@ public: virtual SdrLayerID GetInvisibleHellId() const override; virtual SdrLayerID GetInvisibleControlsId() const override; - virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) override; + virtual void NotifyInvisibleLayers(SdrPageView& _rSdrPageView) override; - virtual bool IsVisibleLayerId( SdrLayerID _nLayerId ) const override; + virtual bool IsVisibleLayerId(SdrLayerID _nLayerId) const override; - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId ) override; + virtual SdrLayerID GetInvisibleLayerIdByVisibleOne(SdrLayerID _nVisibleLayerId) override; virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) override; private: - DocumentDrawModelManager(DocumentDrawModelManager const&) = delete; DocumentDrawModelManager& operator=(DocumentDrawModelManager const&) = delete; @@ -82,7 +79,6 @@ private: SdrLayerID mnInvisibleHell; SdrLayerID mnInvisibleControls; }; - } #endif diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx index 068d87eed006..3cbe1957d910 100644 --- a/sw/source/core/inc/DocumentExternalDataManager.hxx +++ b/sw/source/core/inc/DocumentExternalDataManager.hxx @@ -22,11 +22,10 @@ #include <IDocumentExternalData.hxx> -namespace sw { - +namespace sw +{ class DocumentExternalDataManager : public IDocumentExternalData { - private: DocumentExternalDataManager(DocumentExternalDataManager const&) = delete; DocumentExternalDataManager& operator=(DocumentExternalDataManager const&) = delete; @@ -34,13 +33,12 @@ private: public: DocumentExternalDataManager() = default; - void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) override; + void setExternalData(::sw::tExternalDataType eType, + ::sw::tExternalDataPointer pPayload) override; ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) override; }; - } #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 7986610e9bfc..b74d530cd51c 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -27,25 +27,22 @@ class SwDoc; struct SwDocStat; -namespace sw { - +namespace sw +{ class DocumentStatisticsManager : public IDocumentStatistics { - public: - - DocumentStatisticsManager( SwDoc& i_rSwdoc ); + DocumentStatisticsManager(SwDoc& i_rSwdoc); void DocInfoChgd(bool isEnableSetModified) override; - const SwDocStat &GetDocStat() const override; + const SwDocStat& GetDocStat() const override; void SetDocStatModified(bool bSet); - const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool bFields) override; + const SwDocStat& GetUpdatedDocStat(bool bCompleteAsync, bool bFields) override; void SetDocStat(const SwDocStat& rStat) override; void UpdateDocStat(bool bCompleteAsync, bool bFields) override; virtual ~DocumentStatisticsManager() override; private: - DocumentStatisticsManager(DocumentStatisticsManager const&) = delete; DocumentStatisticsManager& operator=(DocumentStatisticsManager const&) = delete; @@ -60,13 +57,12 @@ private: bool IncrementalDocStatCalculate(tools::Long nChars, bool bFields = true); // Our own 'StatsUpdateTimer' calls the following method - DECL_LINK( DoIdleStatsUpdate, Timer *, void ); + DECL_LINK(DoIdleStatsUpdate, Timer*, void); - std::unique_ptr<SwDocStat> mpDocStat;//< Statistics information - bool mbInitialized; //< allow first time update - SwDocIdle maStatsUpdateIdle; //< Idle for asynchronous stats calculation + std::unique_ptr<SwDocStat> mpDocStat; //< Statistics information + bool mbInitialized; //< allow first time update + SwDocIdle maStatsUpdateIdle; //< Idle for asynchronous stats calculation }; - } #endif diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index 65346efdb494..0ac1c1206322 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -30,7 +30,6 @@ class SwDoc; namespace sw { - class DocumentTimerManager : public IDocumentTimerAccess { public: @@ -43,7 +42,7 @@ public: Fields, }; - DocumentTimerManager( SwDoc& i_rSwdoc ); + DocumentTimerManager(SwDoc& i_rSwdoc); virtual ~DocumentTimerManager() override; void StartIdling() override; @@ -62,9 +61,9 @@ private: /// Delay starting idle jobs to allow for post-load activity. /// Used by LOK only. - DECL_LINK( FireIdleJobsTimeout, Timer *, void ); + DECL_LINK(FireIdleJobsTimeout, Timer*, void); - DECL_LINK( DoIdleJobs, Timer *, void ); + DECL_LINK(DoIdleJobs, Timer*, void); IdleJob GetNextIdleJob() const; @@ -81,7 +80,6 @@ inline bool DocumentTimerManager::IsDocIdle() const { return ((0 == m_nIdleBlockCount) && (GetNextIdleJob() != IdleJob::Busy)); } - } #endif diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index f37605556353..69375aa9644a 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -35,32 +35,35 @@ class SwGrammarMarkUp : public SwWrongList { - std::vector< sal_Int32 > maSentence; + std::vector<sal_Int32> maSentence; public: - SwGrammarMarkUp() : SwWrongList( WRONGLIST_GRAMMAR ) {} + SwGrammarMarkUp() + : SwWrongList(WRONGLIST_GRAMMAR) + { + } virtual ~SwGrammarMarkUp() override; virtual SwWrongList* Clone() override; - virtual void CopyFrom( const SwWrongList& rCopy ) override; + virtual void CopyFrom(const SwWrongList& rCopy) override; /* SwWrongList::Move() + handling of maSentence */ - void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ); + void MoveGrammar(sal_Int32 nPos, sal_Int32 nDiff); /* SwWrongList::SplitList() + handling of maSentence */ - SwGrammarMarkUp* SplitGrammarList( sal_Int32 nSplitPos ); + SwGrammarMarkUp* SplitGrammarList(sal_Int32 nSplitPos); /* SwWrongList::JoinList() + handling of maSentence */ - void JoinGrammarList( SwGrammarMarkUp* pNext, sal_Int32 nInsertPos ); + void JoinGrammarList(SwGrammarMarkUp* pNext, sal_Int32 nInsertPos); /* SwWrongList::ClearList() + handling of maSentence */ - void ClearGrammarList( sal_Int32 nSentenceEnd = COMPLETE_STRING ); + void ClearGrammarList(sal_Int32 nSentenceEnd = COMPLETE_STRING); /* setSentence to define the start position of a sentence, at the moment the end position is given by the next start position */ - void setSentence( sal_Int32 nStart ); + void setSentence(sal_Int32 nStart); /* getSentenceStart returns the last start position of a sentence which is lower or equal to the given parameter */ - sal_Int32 getSentenceStart( sal_Int32 nPos ); + sal_Int32 getSentenceStart(sal_Int32 nPos); /* getSentenceEnd returns the first start position of a sentence which is greater than the given parameter */ - sal_Int32 getSentenceEnd( sal_Int32 nPos ); + sal_Int32 getSentenceEnd(sal_Int32 nPos); }; #endif diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx index a871e7135472..cc47fd684d7b 100644 --- a/sw/source/core/inc/SwUndoTOXChange.hxx +++ b/sw/source/core/inc/SwUndoTOXChange.hxx @@ -35,12 +35,12 @@ private: sal_uLong const m_nNodeIndex; public: - SwUndoTOXChange(const SwDoc& rDoc, SwTOXBaseSection const& rTOX, const SwTOXBase & rNew); + SwUndoTOXChange(const SwDoc& rDoc, SwTOXBaseSection const& rTOX, const SwTOXBase& rNew); virtual ~SwUndoTOXChange() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual void RepeatImpl( ::sw::RepeatContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; + virtual void RepeatImpl(::sw::RepeatContext&) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index 6d44bda440be..c10ed451c57d 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -27,9 +27,10 @@ class SwHistoryBookmark; class SwHistoryNoTextFieldmark; class SwHistoryTextFieldmark; -namespace sw::mark { - class IMark; - class IFieldmark; +namespace sw::mark +{ +class IMark; +class IFieldmark; } class SwDoc; @@ -39,10 +40,10 @@ class SwUndoBookmark : public SwUndo const std::unique_ptr<SwHistoryBookmark> m_pHistoryBookmark; protected: - SwUndoBookmark( SwUndoId nUndoId, const ::sw::mark::IMark& ); + SwUndoBookmark(SwUndoId nUndoId, const ::sw::mark::IMark&); - void SetInDoc( SwDoc* ); - void ResetInDoc( SwDoc& ); + void SetInDoc(SwDoc*); + void ResetInDoc(SwDoc&); public: virtual ~SwUndoBookmark() override; @@ -65,19 +66,19 @@ public: class SwUndoInsBookmark : public SwUndoBookmark { public: - SwUndoInsBookmark( const ::sw::mark::IMark& ); + SwUndoInsBookmark(const ::sw::mark::IMark&); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; class SwUndoDeleteBookmark : public SwUndoBookmark { public: - SwUndoDeleteBookmark( const ::sw::mark::IMark& ); + SwUndoDeleteBookmark(const ::sw::mark::IMark&); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; class SwUndoRenameBookmark : public SwUndo @@ -86,14 +87,14 @@ class SwUndoRenameBookmark : public SwUndo const OUString m_sNewName; public: - SwUndoRenameBookmark( const OUString& rOldName, const OUString& rNewName, const SwDoc& rDoc ); + SwUndoRenameBookmark(const OUString& rOldName, const OUString& rNewName, const SwDoc& rDoc); virtual ~SwUndoRenameBookmark() override; private: virtual SwRewriter GetRewriter() const override; - static void Rename( ::sw::UndoRedoContext const &, const OUString& sFrom, const OUString& sTo ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + static void Rename(::sw::UndoRedoContext const&, const OUString& sFrom, const OUString& sTo); + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; /// Handling undo / redo of checkbox and drop-down form field insertion @@ -105,8 +106,8 @@ private: public: SwUndoInsNoTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; /// Handling undo / redo of checkbox and drop-down form field deletion @@ -119,8 +120,8 @@ public: SwUndoDelNoTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark); ~SwUndoDelNoTextFieldmark(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; /// Handling undo / redo of text form field insertion @@ -132,8 +133,8 @@ private: public: SwUndoInsTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; /// Handling undo / redo of text form field deletion @@ -146,8 +147,8 @@ public: SwUndoDelTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark); ~SwUndoDelTextFieldmark(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 468db932a476..07dfca71ca74 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -39,12 +39,12 @@ class SwSdrUndo : public SwUndo std::unique_ptr<SdrMarkList> m_pMarkList; // MarkList for all selected SdrObjects public: - SwSdrUndo( std::unique_ptr<SdrUndoAction> , const SdrMarkList* pMarkList, const SwDoc& rDoc ); + SwSdrUndo(std::unique_ptr<SdrUndoAction>, const SdrMarkList* pMarkList, const SwDoc& rDoc); virtual ~SwSdrUndo() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; virtual OUString GetComment() const override; }; @@ -56,15 +56,15 @@ class SwUndoDrawGroup : public SwUndo bool m_bDeleteFormat; public: - SwUndoDrawGroup( sal_uInt16 nCnt, const SwDoc& rDoc ); + SwUndoDrawGroup(sal_uInt16 nCnt, const SwDoc& rDoc); virtual ~SwUndoDrawGroup() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; - void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject* ); - void SetGroupFormat( SwDrawFrameFormat* ); + void AddObj(sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject*); + void SetGroupFormat(SwDrawFrameFormat*); }; // Action "ungroup drawing object" is now split into three parts - see @@ -85,48 +85,47 @@ class SwUndoDrawUnGroup : public SwUndo bool m_bDeleteFormat; public: - SwUndoDrawUnGroup( SdrObjGroup*, const SwDoc& rDoc ); + SwUndoDrawUnGroup(SdrObjGroup*, const SwDoc& rDoc); virtual ~SwUndoDrawUnGroup() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; - void AddObj( sal_uInt16 nPos, SwDrawFrameFormat* ); + void AddObj(sal_uInt16 nPos, SwDrawFrameFormat*); }; class SwUndoDrawUnGroupConnectToLayout : public SwUndo { private: - std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > > m_aDrawFormatsAndObjs; + std::vector<std::pair<SwDrawFrameFormat*, SdrObject*>> m_aDrawFormatsAndObjs; public: SwUndoDrawUnGroupConnectToLayout(const SwDoc& rDoc); virtual ~SwUndoDrawUnGroupConnectToLayout() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; - void AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat, - SdrObject* pDrawObject ); + void AddFormatAndObj(SwDrawFrameFormat* pDrawFrameFormat, SdrObject* pDrawObject); }; class SwUndoDrawDelete : public SwUndo { std::unique_ptr<SwUndoGroupObjImpl[]> m_pObjArray; - std::unique_ptr<SdrMarkList> m_pMarkList; // MarkList for all selected SdrObjects + std::unique_ptr<SdrMarkList> m_pMarkList; // MarkList for all selected SdrObjects bool m_bDeleteFormat; public: - SwUndoDrawDelete( sal_uInt16 nCnt, const SwDoc& rDoc ); + SwUndoDrawDelete(sal_uInt16 nCnt, const SwDoc& rDoc); virtual ~SwUndoDrawDelete() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; - virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void UndoImpl(::sw::UndoRedoContext&) override; + virtual void RedoImpl(::sw::UndoRedoContext&) override; - void AddObj( SwDrawFrameFormat*, const SdrMark& ); + void AddObj(SwDrawFrameFormat*, const SdrMark&); void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 7c78661e7920..e2e1125ffd07 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -22,17 +22,17 @@ #include "ftnboss.hxx" -class SwColumnFrame: public SwFootnoteBossFrame +class SwColumnFrame : public SwFootnoteBossFrame { private: virtual void DestroyImpl() override; virtual ~SwColumnFrame() override; public: - SwColumnFrame( SwFrameFormat*, SwFrame* ); + SwColumnFrame(SwFrameFormat*, SwFrame*); virtual void PaintBreak() const override; - virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines(const SwPageFrame*, const SwRect&) const override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX diff --git a/sw/source/core/inc/docedt.hxx b/sw/source/core/inc/docedt.hxx index 13ba7c8a8467..036d516d993c 100644 --- a/sw/source/core/inc/docedt.hxx +++ b/sw/source/core/inc/docedt.hxx @@ -22,9 +22,9 @@ class SwPaM; -bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ); +bool sw_JoinText(SwPaM& rPam, bool bJoinPrev); -void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev ); +void sw_GetJoinFlags(SwPaM& rPam, bool& rJoinText, bool& rJoinPrev); #endif diff --git a/sw/source/core/inc/docredln.hxx b/sw/source/core/inc/docredln.hxx index 1a65c354054a..f60cb930dc66 100644 --- a/sw/source/core/inc/docredln.hxx +++ b/sw/source/core/inc/docredln.hxx @@ -26,7 +26,7 @@ class SwDoc; -void sw_DebugRedline( const SwDoc* pDoc ); +void sw_DebugRedline(const SwDoc* pDoc); #endif diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx index aa3d5a2a5be5..23965035eb6a 100644 --- a/sw/source/core/inc/environmentofanchoredobject.hxx +++ b/sw/source/core/inc/environmentofanchoredobject.hxx @@ -25,72 +25,72 @@ class SwLayoutFrame; namespace objectpositioning { - class SwEnvironmentOfAnchoredObject - { - private: - const bool mbFollowTextFlow; - - public: - /** constructor - - @param _bFollowTextFlow - input parameter - indicates, if the anchored object, for which - this environment is instantiated, follow the text flow or not - */ - SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow ); - - /** destructor - */ - ~SwEnvironmentOfAnchoredObject(); - - /** determine environment layout frame for possible horizontal object - positions respectively for alignment to 'page areas' - - this is, if object has to follow the text flow: - - cell frame, if anchored inside a cell - - fly frame, if anchored inside a fly frame - otherwise it's the page frame - - this is, if object hasn't to follow the text flow: - - page frame. - - no exception any more. Thus remove - parameter <_bForPageAlignment> - - @param _rHoriOrientFrame - input parameter - frame, at which the horizontal position is - oriented at (typically it's the anchor frame). - starting point for the search of the layout frame. - - @return reference to the layout frame, which determines the - horizontal environment the object has to be positioned in. - */ - const SwLayoutFrame& GetHoriEnvironmentLayoutFrame( const SwFrame& _rHoriOrientFrame ) const; - - /** determine environment layout frame for possible vertical object - positions respectively for alignments to 'page areas' - - this is, if object has to follow the text flow: - - cell frame, if anchored inside a cell - - fly frame, if anchored inside a fly frame - - header/footer frame, if anchored inside page header/footer - - footnote frame, if anchored inside footnote - otherwise it's the document body frame - - this is, if object hasn't to follow the text flow: - - page frame. - - no exception any more. Thus remove - parameter <_bForPageAlignment> - - @param _rVertOrientFrame - input parameter - frame, at which the vertical position is - oriented at (typically it's the anchor frame). - starting point for the search of the layout frame. - - @return reference to the layout frame, which determines the - vertical environment the object has to be positioned in. - */ - const SwLayoutFrame& GetVertEnvironmentLayoutFrame( const SwFrame& _rVertOrientFrame ) const; - }; +class SwEnvironmentOfAnchoredObject +{ +private: + const bool mbFollowTextFlow; + +public: + /** constructor + + @param _bFollowTextFlow + input parameter - indicates, if the anchored object, for which + this environment is instantiated, follow the text flow or not + */ + SwEnvironmentOfAnchoredObject(const bool _bFollowTextFlow); + + /** destructor + */ + ~SwEnvironmentOfAnchoredObject(); + + /** determine environment layout frame for possible horizontal object + positions respectively for alignment to 'page areas' + + this is, if object has to follow the text flow: + - cell frame, if anchored inside a cell + - fly frame, if anchored inside a fly frame + otherwise it's the page frame + + this is, if object hasn't to follow the text flow: + - page frame. + - no exception any more. Thus remove + parameter <_bForPageAlignment> + + @param _rHoriOrientFrame + input parameter - frame, at which the horizontal position is + oriented at (typically it's the anchor frame). + starting point for the search of the layout frame. + + @return reference to the layout frame, which determines the + horizontal environment the object has to be positioned in. + */ + const SwLayoutFrame& GetHoriEnvironmentLayoutFrame(const SwFrame& _rHoriOrientFrame) const; + + /** determine environment layout frame for possible vertical object + positions respectively for alignments to 'page areas' + + this is, if object has to follow the text flow: + - cell frame, if anchored inside a cell + - fly frame, if anchored inside a fly frame + - header/footer frame, if anchored inside page header/footer + - footnote frame, if anchored inside footnote + otherwise it's the document body frame + + this is, if object hasn't to follow the text flow: + - page frame. + - no exception any more. Thus remove + parameter <_bForPageAlignment> + + @param _rVertOrientFrame + input parameter - frame, at which the vertical position is + oriented at (typically it's the anchor frame). + starting point for the search of the layout frame. + + @return reference to the layout frame, which determines the + vertical environment the object has to be positioned in. + */ + const SwLayoutFrame& GetVertEnvironmentLayoutFrame(const SwFrame& _rVertOrientFrame) const; +}; } #endif diff --git a/sw/source/core/inc/fefly.hxx b/sw/source/core/inc/fefly.hxx index 07b56d5fcbcb..411bf7586169 100644 --- a/sw/source/core/inc/fefly.hxx +++ b/sw/source/core/inc/fefly.hxx @@ -23,8 +23,7 @@ class SwFlyFrame; class SfxItemSet; -bool sw_ChkAndSetNewAnchor( const SwFlyFrame& rFly, SfxItemSet& rSet ); - +bool sw_ChkAndSetNewAnchor(const SwFlyFrame& rFly, SfxItemSet& rSet); #endif diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx index 929d6ea19587..2e1bcd60ca8e 100644 --- a/sw/source/core/inc/fieldhint.hxx +++ b/sw/source/core/inc/fieldhint.hxx @@ -31,11 +31,11 @@ public: SwPaM* m_pPaM; SwRootFrame const* m_pLayout; - SwFieldHint(SwPaM *const pPaM, SwRootFrame const*const pLayout) + SwFieldHint(SwPaM* const pPaM, SwRootFrame const* const pLayout) : m_pPaM(pPaM) , m_pLayout(pLayout) - {} - + { + } }; #endif diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index 4475e3a03296..ef0e2f03adee 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -54,26 +54,28 @@ class Point; class SwNode2Layout { std::unique_ptr<SwNode2LayImpl> m_pImpl; + public: /// Use this ctor for inserting before/after rNd /// @param nIdx is the index of the to-be-inserted Node - SwNode2Layout( const SwNode& rNd, sal_uLong nIdx ); + SwNode2Layout(const SwNode& rNd, sal_uLong nIdx); ~SwNode2Layout(); SwFrame* NextFrame(); - SwLayoutFrame* UpperFrame( SwFrame* &rpFrame, const SwNode& rNode ); + SwLayoutFrame* UpperFrame(SwFrame*& rpFrame, const SwNode& rNode); - SwFrame *GetFrame( const Point* pDocPos ) const; + SwFrame* GetFrame(const Point* pDocPos) const; }; class SwNode2LayoutSaveUpperFrames { std::unique_ptr<SwNode2LayImpl> m_pImpl; + public: /// Use this ctor for collecting the UpperFrames - SwNode2LayoutSaveUpperFrames( const SwNode& rNd ); + SwNode2LayoutSaveUpperFrames(const SwNode& rNd); ~SwNode2LayoutSaveUpperFrames(); - void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd ); + void RestoreUpperFrames(SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd); }; #endif diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index fd52fffb5dea..1e5775d3c099 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -25,7 +25,7 @@ class SwNoteURL }; // globale Variable, in NoteURL.Cxx angelegt -extern SwNoteURL *pNoteURL; +extern SwNoteURL* pNoteURL; #endif diff --git a/sw/source/core/inc/paintfrm.hxx b/sw/source/core/inc/paintfrm.hxx index b3d4812d6aad..dca4a3871b47 100644 --- a/sw/source/core/inc/paintfrm.hxx +++ b/sw/source/core/inc/paintfrm.hxx @@ -25,11 +25,12 @@ extern Color aGlobalRetoucheColor; class OutputDevice; -namespace vcl { - typedef OutputDevice RenderContext; +namespace vcl +{ +typedef OutputDevice RenderContext; }; -void SwCalcPixStatics( vcl::RenderContext const *pOut ); +void SwCalcPixStatics(vcl::RenderContext const* pOut); #endif // INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx index 04c62873fc5a..a5e40f2e3f77 100644 --- a/sw/source/core/inc/ptqueue.hxx +++ b/sw/source/core/inc/ptqueue.hxx @@ -45,10 +45,10 @@ class SwRect; class SwPaintQueue { public: - static SwQueuedPaint *s_pPaintQueue; + static SwQueuedPaint* s_pPaintQueue; - static void Add( SwViewShell *pSh, const SwRect &rNew ); - static void Remove( SwViewShell const *pSh ); + static void Add(SwViewShell* pSh, const SwRect& rNew); + static void Remove(SwViewShell const* pSh); static void Repaint(); }; diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index e131730c20e6..505c0e635535 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -25,15 +25,16 @@ class SwTableLine; class SwBorderAttrs; /// SwRowFrame is one table row in the document layout. -class SwRowFrame: public SwLayoutFrame +class SwRowFrame : public SwLayoutFrame { - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; + virtual void Format(vcl::RenderContext* pRenderContext, + const SwBorderAttrs* pAttrs = nullptr) override; /// Only change the Frame size, not the PrtArea SSize - virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame(SwTwips, bool bTst = false, bool bInfo = false) override; + virtual SwTwips GrowFrame(SwTwips, bool bTst = false, bool bInfo = false) override; - const SwTableLine * m_pTabLine; - SwRowFrame * m_pFollowRow; ///< note: this is *only* set on old-style tables! + const SwTableLine* m_pTabLine; + SwRowFrame* m_pFollowRow; ///< note: this is *only* set on old-style tables! // #i29550# sal_uInt16 mnTopMarginForLowers; sal_uInt16 mnBottomMarginForLowers; @@ -51,10 +52,10 @@ class SwRowFrame: public SwLayoutFrame protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual void Modify(const SfxPoolItem*, const SfxPoolItem*) override; public: - SwRowFrame( const SwTableLine &, SwFrame*, bool bInsertContent = true ); + SwRowFrame(const SwTableLine&, SwFrame*, bool bInsertContent = true); virtual void Cut() override; @@ -64,45 +65,45 @@ public: * been created; the same holds true for the Page at which the Flys * are to be registered at. */ - void RegistFlys( SwPageFrame *pPage = nullptr ); + void RegistFlys(SwPageFrame* pPage = nullptr); - const SwTableLine *GetTabLine() const { return m_pTabLine; } + const SwTableLine* GetTabLine() const { return m_pTabLine; } /** * Adapts the Cells to the current height; invalidates the Cells if * the Direction does not match the height */ - void AdjustCells( const SwTwips nHeight, const bool bHeight ); + void AdjustCells(const SwTwips nHeight, const bool bHeight); SwRowFrame* GetFollowRow() const { return m_pFollowRow; } - void SetFollowRow( SwRowFrame* pNew ) { m_pFollowRow = pNew; } + void SetFollowRow(SwRowFrame* pNew) { m_pFollowRow = pNew; } // #i29550# sal_uInt16 GetTopMarginForLowers() const { return mnTopMarginForLowers; } - void SetTopMarginForLowers( sal_uInt16 nNew ) { mnTopMarginForLowers = nNew; } + void SetTopMarginForLowers(sal_uInt16 nNew) { mnTopMarginForLowers = nNew; } sal_uInt16 GetBottomMarginForLowers() const { return mnBottomMarginForLowers; } - void SetBottomMarginForLowers( sal_uInt16 nNew ) { mnBottomMarginForLowers = nNew; } + void SetBottomMarginForLowers(sal_uInt16 nNew) { mnBottomMarginForLowers = nNew; } sal_uInt16 GetBottomLineSize() const { return mnBottomLineSize; } - void SetBottomLineSize( sal_uInt16 nNew ) { mnBottomLineSize = nNew; } + void SetBottomLineSize(sal_uInt16 nNew) { mnBottomLineSize = nNew; } // <-- collapsing bool IsRepeatedHeadline() const { return m_bIsRepeatedHeadline; } - void SetRepeatedHeadline( bool bNew ) { m_bIsRepeatedHeadline = bNew; } + void SetRepeatedHeadline(bool bNew) { m_bIsRepeatedHeadline = bNew; } // --> split table rows bool IsRowSplitAllowed() const; bool IsForceRowSplitAllowed() const { return m_bForceRowSplitAllowed; } - void SetForceRowSplitAllowed( bool bNew) { m_bForceRowSplitAllowed = bNew; }; + void SetForceRowSplitAllowed(bool bNew) { m_bForceRowSplitAllowed = bNew; }; bool IsFollowFlowRow() const { return m_bIsFollowFlowRow; } - void SetFollowFlowRow( bool bNew ) { m_bIsFollowFlowRow = bNew; } + void SetFollowFlowRow(bool bNew) { m_bIsFollowFlowRow = bNew; } // <-- split table rows // #131283# Table row keep feature - bool ShouldRowKeepWithNext( const bool bCheckParents = true ) const; + bool ShouldRowKeepWithNext(const bool bCheckParents = true) const; // #i4032# NEW TABLES bool IsRowSpanLine() const { return m_bIsRowSpanLine; } - void SetRowSpanLine( bool bNew ) { m_bIsRowSpanLine = bNew; } + void SetRowSpanLine(bool bNew) { m_bIsRowSpanLine = bNew; } // A row may only be split if the minimum height of the row frame // fits into the vertical space left. diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx index 0fe63587ba81..9eb3903211b2 100644 --- a/sw/source/core/inc/swselectionlist.hxx +++ b/sw/source/core/inc/swselectionlist.hxx @@ -39,8 +39,8 @@ class SwFrame; class SwSelectionList { - std::list< SwPaM* > m_aList; // container for the selected text portions - const SwFrame* m_pContext; // the context of these text portions + std::list<SwPaM*> m_aList; // container for the selected text portions + const SwFrame* m_pContext; // the context of these text portions public: /** Ctor to create an empty list for a given context @@ -48,7 +48,7 @@ public: The frame (normally a SwTextFrame) where the block cursor selection starts, it will be used to get the allowed context for the text selections. */ - explicit SwSelectionList( const SwFrame* pInitCxt ); + explicit SwSelectionList(const SwFrame* pInitCxt); /** Start of the container for the selected text portions */ @@ -63,7 +63,7 @@ public: @param pPam represents a text portion to select */ - void insertPaM( SwPaM* pPam ) { m_aList.push_front( pPam ); } + void insertPaM(SwPaM* pPam) { m_aList.push_front(pPam); } /** Reports if the list does not contain any text portion @@ -83,7 +83,7 @@ public: @return true, if the context of the frame is equal to the one of the list */ - bool checkContext( const SwFrame* pCheck ); + bool checkContext(const SwFrame* pCheck); }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx index e22fb90ae628..18e1e11930c0 100644 --- a/sw/source/core/inc/swthreadjoiner.hxx +++ b/sw/source/core/inc/swthreadjoiner.hxx @@ -21,15 +21,21 @@ #include <sal/types.h> -namespace com::sun::star::uno { template <class interface_type> class Reference; } -namespace com::sun::star::util { class XJobManager; } +namespace com::sun::star::uno +{ +template <class interface_type> class Reference; +} +namespace com::sun::star::util +{ +class XJobManager; +} /** Testing */ namespace SwThreadJoiner { - css::uno::Reference< css::util::XJobManager >& GetThreadJoiner(); +css::uno::Reference<css::util::XJobManager>& GetThreadJoiner(); - void ReleaseThreadJoiner(); +void ReleaseThreadJoiner(); } #endif diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 6e533a079017..de6b745e36ad 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -27,23 +27,27 @@ class SwXTextFrame; class SwXTextGraphicObject; class SwXTextEmbeddedObject; class SwFormatINetFormat; -namespace sw { class ICoreFrameStyle; } +namespace sw +{ +class ICoreFrameStyle; +} class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor { //XServiceInfo virtual OUString SAL_CALL getImplementationName() override; + protected: virtual ~SwHyperlinkEventDescriptor() override; -public: - SwHyperlinkEventDescriptor(); +public: + SwHyperlinkEventDescriptor(); void copyMacrosFromINetFormat(const SwFormatINetFormat& aFormat); void copyMacrosIntoINetFormat(SwFormatINetFormat& aFormat); - void copyMacrosFromNameReplace( - css::uno::Reference<css::container::XNameReplace> const & xReplace); + void + copyMacrosFromNameReplace(css::uno::Reference<css::container::XNameReplace> const& xReplace); }; // SwEventDescriptor for @@ -56,9 +60,9 @@ class SwFrameEventDescriptor : public SvEventDescriptor SwXFrame& rFrame; public: - SwFrameEventDescriptor( SwXTextFrame& rFrameRef ); - SwFrameEventDescriptor( SwXTextGraphicObject& rGraphicRef ); - SwFrameEventDescriptor( SwXTextEmbeddedObject& rObjectRef ); + SwFrameEventDescriptor(SwXTextFrame& rFrameRef); + SwFrameEventDescriptor(SwXTextGraphicObject& rGraphicRef); + SwFrameEventDescriptor(SwXTextEmbeddedObject& rObjectRef); virtual ~SwFrameEventDescriptor() override; @@ -75,7 +79,7 @@ class SwFrameStyleEventDescriptor : public SvEventDescriptor sw::ICoreFrameStyle& m_rStyle; public: - SwFrameStyleEventDescriptor( sw::ICoreFrameStyle& rStyle ); + SwFrameStyleEventDescriptor(sw::ICoreFrameStyle& rStyle); virtual ~SwFrameStyleEventDescriptor() override; diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index ccc5b9be7769..d2d3b25ac52d 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -27,11 +27,12 @@ class SwDoc; class SwURLStateChanged : public SfxListener { SwDoc& m_rDoc; + public: - SwURLStateChanged( SwDoc& rD ); + SwURLStateChanged(SwDoc& rD); virtual ~SwURLStateChanged() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; #endif diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index e7709204fd9d..b65eb966a468 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -27,7 +27,7 @@ bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const { - if(rA->GetNdIndex() == rB->GetNdIndex()) + if (rA->GetNdIndex() == rB->GetNdIndex()) { // In this case, the order number decides! return rA->GetOrdNum() < rB->GetOrdNum(); @@ -36,15 +36,18 @@ bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFram return rA->GetNdIndex() < rB->GetNdIndex(); } -SwPosFlyFrame::SwPosFlyFrame(const SwNodeIndex& rIdx, const SwFrameFormat* pFormat, sal_uInt16 nArrPos) - : m_pFrameFormat(pFormat), m_pNodeIndex(const_cast<SwNodeIndex*>(&rIdx)), m_nOrdNum(SAL_MAX_UINT32) +SwPosFlyFrame::SwPosFlyFrame(const SwNodeIndex& rIdx, const SwFrameFormat* pFormat, + sal_uInt16 nArrPos) + : m_pFrameFormat(pFormat) + , m_pNodeIndex(const_cast<SwNodeIndex*>(&rIdx)) + , m_nOrdNum(SAL_MAX_UINT32) { const SwFormatAnchor& rAnchor = pFormat->GetAnchor(); - if(RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId()) + if (RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId()) m_pNodeIndex = new SwNodeIndex(rIdx); - else if(pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell()) + else if (pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell()) pFormat->CallSwClientNotify(sw::GetZOrderHint(m_nOrdNum)); - if(m_nOrdNum == SAL_MAX_UINT32) + if (m_nOrdNum == SAL_MAX_UINT32) { m_nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size(); m_nOrdNum += nArrPos; diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index 7e1f91493c39..fa91ea252d5f 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -20,6 +20,6 @@ #include <noteurl.hxx> // Global variable -SwNoteURL *pNoteURL = nullptr; +SwNoteURL* pNoteURL = nullptr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx index 0c7dc85037b9..b0fff5e34b2a 100644 --- a/sw/source/core/text/porref.hxx +++ b/sw/source/core/text/porref.hxx @@ -24,8 +24,8 @@ class SwRefPortion : public SwTextPortion { public: - SwRefPortion(){ SetWhichPor( PortionType::Ref ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const override; + SwRefPortion() { SetWhichPor(PortionType::Ref); } + virtual void Paint(const SwTextPaintInfo& rInf) const override; }; class SwIsoRefPortion : public SwRefPortion @@ -33,14 +33,14 @@ class SwIsoRefPortion : public SwRefPortion sal_uInt16 nViewWidth; public: - SwIsoRefPortion(); - virtual bool Format( SwTextFormatInfo &rInf ) override; - virtual void Paint( const SwTextPaintInfo &rInf ) const override; - virtual SwLinePortion *Compress() override; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; + SwIsoRefPortion(); + virtual bool Format(SwTextFormatInfo& rInf) override; + virtual void Paint(const SwTextPaintInfo& rInf) const override; + virtual SwLinePortion* Compress() override; + virtual sal_uInt16 GetViewWidth(const SwTextSizeInfo& rInf) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const override; + virtual void HandlePortion(SwPortionHandler& rPH) const override; }; #endif diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx index b2c8f23a76df..8b61c1064217 100644 --- a/sw/source/core/text/portox.hxx +++ b/sw/source/core/text/portox.hxx @@ -25,8 +25,8 @@ class SwToxPortion : public SwTextPortion { public: - SwToxPortion(){ SetWhichPor( PortionType::Tox ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const override; + SwToxPortion() { SetWhichPor(PortionType::Tox); } + virtual void Paint(const SwTextPaintInfo& rInf) const override; }; class SwIsoToxPortion : public SwToxPortion @@ -34,14 +34,14 @@ class SwIsoToxPortion : public SwToxPortion sal_uInt16 nViewWidth; public: - SwIsoToxPortion(); - virtual bool Format( SwTextFormatInfo &rInf ) override; - virtual void Paint( const SwTextPaintInfo &rInf ) const override; - virtual SwLinePortion *Compress() override; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; + SwIsoToxPortion(); + virtual bool Format(SwTextFormatInfo& rInf) override; + virtual void Paint(const SwTextPaintInfo& rInf) const override; + virtual SwLinePortion* Compress() override; + virtual sal_uInt16 GetViewWidth(const SwTextSizeInfo& rInf) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const override; + virtual void HandlePortion(SwPortionHandler& rPH) const override; }; #endif diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index d04a0eb63323..192fb42ee20f 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -32,11 +32,11 @@ class SwTextLine : public SwCacheObj virtual void UpdateCachePos() override; public: - SwTextLine( SwTextFrame const *pFrame, std::unique_ptr<SwParaPortion> pNew = nullptr ); + SwTextLine(SwTextFrame const* pFrame, std::unique_ptr<SwParaPortion> pNew = nullptr); virtual ~SwTextLine() override; - SwParaPortion *GetPara() { return pLine.get(); } - const SwParaPortion *GetPara() const { return pLine.get(); } + SwParaPortion* GetPara() { return pLine.get(); } + const SwParaPortion* GetPara() const { return pLine.get(); } void SetPara(SwParaPortion* pNew, bool bDelete) { @@ -48,14 +48,13 @@ public: class SwTextLineAccess : public SwCacheAccess { - protected: - virtual SwCacheObj *NewObj() override; + virtual SwCacheObj* NewObj() override; public: - explicit SwTextLineAccess( const SwTextFrame *pOwner ); + explicit SwTextLineAccess(const SwTextFrame* pOwner); - SwParaPortion *GetPara(); + SwParaPortion* GetPara(); bool IsAvailable() const; }; diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx index b5fac1e16855..15a60eeb4bac 100644 --- a/sw/source/core/txtnode/chrfmt.cxx +++ b/sw/source/core/txtnode/chrfmt.cxx @@ -22,7 +22,6 @@ #include <charfmt.hxx> #include <docary.hxx> - void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("SwCharFormat")); diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx index 05566a1bd2f3..b35a31a912b5 100644 --- a/sw/source/core/undo/SwRewriter.cxx +++ b/sw/source/core/undo/SwRewriter.cxx @@ -22,17 +22,15 @@ using namespace std; -SwRewriter::SwRewriter() -{ -} +SwRewriter::SwRewriter() {} -void SwRewriter::AddRule(SwUndoArg eWhat, const OUString & rWith) +void SwRewriter::AddRule(SwUndoArg eWhat, const OUString& rWith) { SwRewriteRule aRule(eWhat, rWith); - vector<SwRewriteRule>::iterator aIt = find_if( - mRules.begin(), mRules.end(), - [&aRule](SwRewriteRule const & a) { return a.first == aRule.first; }); + vector<SwRewriteRule>::iterator aIt + = find_if(mRules.begin(), mRules.end(), + [&aRule](SwRewriteRule const& a) { return a.first == aRule.first; }); if (aIt != mRules.end()) *aIt = aRule; @@ -40,7 +38,7 @@ void SwRewriter::AddRule(SwUndoArg eWhat, const OUString & rWith) mRules.push_back(aRule); } -OUString SwRewriter::Apply(const OUString & rStr) const +OUString SwRewriter::Apply(const OUString& rStr) const { OUString aResult = rStr; diff --git a/sw/source/core/view/vprint.hxx b/sw/source/core/view/vprint.hxx index fc8e35c99eef..2d91e3f90d4c 100644 --- a/sw/source/core/view/vprint.hxx +++ b/sw/source/core/view/vprint.hxx @@ -30,4 +30,3 @@ SwPageFrame const* sw_getPage(SwRootFrame const& rLayout, sal_Int32 const nPage) #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index cb0fdc191bb2..8be5e5352f61 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -33,12 +33,12 @@ class SwASCWriter : public Writer virtual ErrCode WriteStream() override; public: - SwASCWriter( const OUString& rFilterName ); + SwASCWriter(const OUString& rFilterName); virtual ~SwASCWriter() override; const OUString& GetLineEnd() const { return m_sLineEnd; } }; -#endif // _ INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX +#endif // _ INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/docx/swdocxreader.hxx b/sw/source/filter/docx/swdocxreader.hxx index 214d2742d287..dc641d13c13d 100644 --- a/sw/source/filter/docx/swdocxreader.hxx +++ b/sw/source/filter/docx/swdocxreader.hxx @@ -29,12 +29,12 @@ public: virtual SwReaderType GetReaderType() override; virtual bool HasGlossaries() const override; - virtual bool ReadGlossaries( SwTextBlocks& rBlocks, bool bSaveRelFiles ) const override; + virtual bool ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const override; private: - virtual ErrCode Read( SwDoc&, const OUString&, SwPaM&, const OUString& ) override; + virtual ErrCode Read(SwDoc&, const OUString&, SwPaM&, const OUString&) override; - static bool MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks ); + static bool MakeEntries(SwDoc* pD, SwTextBlocks& rBlocks); }; #endif diff --git a/sw/source/filter/html/css1atr.hxx b/sw/source/filter/html/css1atr.hxx index ea07dec5cf30..c5e394e18f89 100644 --- a/sw/source/filter/html/css1atr.hxx +++ b/sw/source/filter/html/css1atr.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_CSS1ATR_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_CSS1ATR_HXX -bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); - +bool swhtml_css1atr_equalFontItems(const SfxPoolItem& r1, const SfxPoolItem& r2); #endif diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index eee703adce66..47be061d9de6 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -205,7 +205,6 @@ extern const char* const sCSS1_PV_landscape; //extern const char* const sCSS1_PV_crop; //extern const char* const sCSS1_PV_cross; - extern const char* const sCSS1_P_so_language; extern const char* const sCSS1_P_direction; extern const char* const sCSS1_PV_ltr; diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx index 36cfc9e07ca5..80c50959e598 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLD_HXX - #define OOO_STRING_SW_HTML_FT_author "AUTHOR" #define OOO_STRING_SW_HTML_FT_sender "SENDER" #define OOO_STRING_SW_HTML_FT_datetime "DATETIME" diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index 5564a7d29315..0a3f02db47d1 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -22,10 +22,10 @@ #include <sal/types.h> -extern const char * aEventListenerTable[]; -extern const char * aEventMethodTable[]; -extern const char * aEventSDOptionTable[]; -extern const char * aEventOptionTable[]; +extern const char* aEventListenerTable[]; +extern const char* aEventMethodTable[]; +extern const char* aEventSDOptionTable[]; +extern const char* aEventOptionTable[]; #endif diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 9d5ed50d57e7..345645a240c8 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -21,14 +21,13 @@ #include <ndtxt.hxx> #include <doc.hxx> -void SwHTMLNumRuleInfo::Set( const SwTextNode& rTextNd ) +void SwHTMLNumRuleInfo::Set(const SwTextNode& rTextNd) { - const SwNumRule* pTextNdNumRule( rTextNd.GetNumRule() ); - if ( pTextNdNumRule && - pTextNdNumRule != rTextNd.GetDoc().GetOutlineNumRule() ) + const SwNumRule* pTextNdNumRule(rTextNd.GetNumRule()); + if (pTextNdNumRule && pTextNdNumRule != rTextNd.GetDoc().GetOutlineNumRule()) { pNumRule = const_cast<SwNumRule*>(pTextNdNumRule); - nDeep = static_cast< sal_uInt16 >(pNumRule ? rTextNd.GetActualListLevel() + 1 : 0); + nDeep = static_cast<sal_uInt16>(pNumRule ? rTextNd.GetActualListLevel() + 1 : 0); bNumbered = rTextNd.IsCountedInList(); // #i57919# - correction of refactoring done by cws swnumtree: // <bRestart> has to be set to <true>, if numbering is restarted at this diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 54ff7cf07679..eb48d253d24a 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -29,24 +29,26 @@ class SwNodeIndex; // the special readers -class HTMLReader: public Reader +class HTMLReader : public Reader { // we don't want to have the streams/storages open virtual bool SetStrmStgPtr() override; - virtual ErrCode Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; + virtual ErrCode Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override; virtual OUString GetTemplateName(SwDoc& rDoc) const override; /// Parse FilterOptions passed to the importer. void SetupFilterOptions(); OUString m_aNamespace; + public: HTMLReader(); }; class XMLReader : public Reader { - virtual ErrCode Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; + virtual ErrCode Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override; + public: virtual SwReaderType GetReaderType() override; @@ -54,17 +56,17 @@ public: // read the sections of the document, which is equal to the medium. // returns the count of it - virtual size_t GetSectionList( SfxMedium& rMedium, - std::vector<OUString>& rStrings) const override; + virtual size_t GetSectionList(SfxMedium& rMedium, + std::vector<OUString>& rStrings) const override; }; // the special writers -void GetWW8Writer( const OUString&, const OUString&, WriterRef& ); +void GetWW8Writer(const OUString&, const OUString&, WriterRef&); // Get size of fly (if 'automatic' in WW) and check if not too small SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, - SwTwips nPageWidth); + SwTwips nPageWidth); #endif diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index d1e4d3fa9e3a..f0bff55c5923 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -24,21 +24,24 @@ class RTFSurround { union { - struct { + struct + { sal_uInt8 nGoldCut : 1; // should ideally be bool sal_uInt8 nOrder : 4; sal_uInt8 nJunk : 3; } Flags; sal_uInt8 nVal; } Value; + public: - RTFSurround( bool bGoldCut, sal_uInt8 nOrder ) { + RTFSurround(bool bGoldCut, sal_uInt8 nOrder) + { Value.Flags.nGoldCut = sal_uInt8(bGoldCut); Value.Flags.nOrder = nOrder; Value.Flags.nJunk = 0; } - sal_uInt16 GetValue() const { return Value.nVal; } + sal_uInt16 GetValue() const { return Value.nVal; } }; #endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index e1ea582b524c..120f80cf4638 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -27,7 +27,6 @@ class SvStream; namespace sw { - class WW8FFData final { private: @@ -60,9 +59,9 @@ private: OUString msMacroEnter; OUString msMacroExit; - std::vector< OUString > msListEntries; + std::vector<OUString> msListEntries; - static void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero); + static void WriteOUString(SvStream* pStream, const OUString& rStr, bool bAddZero); public: WW8FFData(); @@ -72,15 +71,15 @@ public: void setResult(sal_uInt8 nResult) { mnResult = nResult; } - void setName(const OUString & rName) { msName = rName; } + void setName(const OUString& rName) { msName = rName; } - void setHelp(const OUString & rHelp); + void setHelp(const OUString& rHelp); - void setStatus(const OUString & rStatus); + void setStatus(const OUString& rStatus); - void addListboxEntry(const OUString & rEntry); + void addListboxEntry(const OUString& rEntry); - void Write(SvStream * pDataStrm); + void Write(SvStream* pDataStrm); }; } diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx index 2c94015a1ca6..9a257e366aa6 100644 --- a/sw/source/filter/ww8/WW8FibData.cxx +++ b/sw/source/filter/ww8/WW8FibData.cxx @@ -22,14 +22,12 @@ namespace ww8 { WW8FibData::WW8FibData() - : m_bReadOnlyRecommended(false), - m_bWriteReservation(false) + : m_bReadOnlyRecommended(false) + , m_bWriteReservation(false) { } -WW8FibData::~WW8FibData() -{ -} +WW8FibData::~WW8FibData() {} void WW8FibData::setReadOnlyRecommended(bool bReadOnlyRecommended) { @@ -40,8 +38,6 @@ void WW8FibData::setWriteReservation(bool bWriteReservation) { m_bWriteReservation = bWriteReservation; } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx index b47cdf6de2dd..ee5caf75fe8c 100644 --- a/sw/source/filter/ww8/WW8FibData.hxx +++ b/sw/source/filter/ww8/WW8FibData.hxx @@ -35,8 +35,8 @@ public: void setReadOnlyRecommended(bool bReadOnlyRecommended); void setWriteReservation(bool bWriteReservation); - bool getReadOnlyRecommended() const { return m_bReadOnlyRecommended;} - bool getWriteReservation() const { return m_bWriteReservation;} + bool getReadOnlyRecommended() const { return m_bReadOnlyRecommended; } + bool getWriteReservation() const { return m_bWriteReservation; } }; } diff --git a/sw/source/filter/ww8/docxhelper.hxx b/sw/source/filter/ww8/docxhelper.hxx index 4791aaa8306c..6133c6dfb8e0 100644 --- a/sw/source/filter/ww8/docxhelper.hxx +++ b/sw/source/filter/ww8/docxhelper.hxx @@ -18,7 +18,7 @@ struct DocxStringTokenMap sal_Int32 nToken; }; -sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, const OUString& rName); +sal_Int32 DocxStringGetToken(DocxStringTokenMap const* pMap, const OUString& rName); #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXHELPER_HXX diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx index 9f3b0aafa252..a539c645cf85 100644 --- a/sw/source/filter/ww8/fields.hxx +++ b/sw/source/filter/ww8/fields.hxx @@ -25,22 +25,22 @@ namespace ww { - /** Find the English Field Name from a winword index - - See OpenOffice.org issue 12831 - (https://bz.apache.org/ooo/show_bug.cgi?id=12831) and MS - Knowledge Base article 268717 - (http://support.microsoft.com/default.aspx?scid=kb;en-us;268717) for - details of why to use english field names and not localized ones since - Word 2000. - - @param - nIndex the index to search for - - @return 0 if not found, otherwise the fieldname as a C style ASCII - string - */ - const char *GetEnglishFieldName(eField eIndex) throw(); +/** Find the English Field Name from a winword index + + See OpenOffice.org issue 12831 + (https://bz.apache.org/ooo/show_bug.cgi?id=12831) and MS + Knowledge Base article 268717 + (http://support.microsoft.com/default.aspx?scid=kb;en-us;268717) for + details of why to use english field names and not localized ones since + Word 2000. + + @param + nIndex the index to search for + + @return 0 if not found, otherwise the fieldname as a C style ASCII + string +*/ +const char* GetEnglishFieldName(eField eIndex) throw(); } #endif diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index 1e970ff8ed04..807f454645f3 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -25,16 +25,16 @@ class SwXMLExport; class SwXMLBrushItemExport { - SwXMLExport& rExport; + SwXMLExport& rExport; SwXMLExport& GetExport() { return rExport; } -public: - explicit SwXMLBrushItemExport( SwXMLExport& rExport ); +public: + explicit SwXMLBrushItemExport(SwXMLExport& rExport); ~SwXMLBrushItemExport(); // core API - void exportXML( const SvxBrushItem& rItem ); + void exportXML(const SvxBrushItem& rItem); }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index d3a58c6b5ea2..8fee9ffd877f 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -24,13 +24,13 @@ using namespace ::com::sun::star; -SvXMLImportContext *SwXMLImport::CreateScriptContext() +SvXMLImportContext* SwXMLImport::CreateScriptContext() { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContext* pContext = nullptr; - if( !(IsStylesOnlyMode() || IsInsertMode()) ) + if (!(IsStylesOnlyMode() || IsInsertMode())) { - pContext = new XMLScriptContext( *this, GetModel() ); + pContext = new XMLScriptContext(*this, GetModel()); } return pContext; diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 0930caf03982..88ac9e40dc8d 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -26,10 +26,10 @@ class SwMailMergeWizard; class SwMailMergeDocSelectPage : public vcl::OWizardPage { - OUString m_sLoadFileName; - OUString m_sLoadTemplateName; + OUString m_sLoadFileName; + OUString m_sLoadTemplateName; - SwMailMergeWizard* m_pWizard; + SwMailMergeWizard* m_pWizard; std::unique_ptr<weld::RadioButton> m_xCurrentDocRB; std::unique_ptr<weld::RadioButton> m_xNewDocRB; @@ -43,7 +43,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage DECL_LINK(DocSelectHdl, weld::ToggleButton&, void); DECL_LINK(FileSelectHdl, weld::Button&, void); - virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; + virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override; public: SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 14284d3224dd..3fd55ea2b002 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -31,7 +31,7 @@ class SwMailMergeWizard; class SwGreetingsHandler { protected: - SwMailMergeWizard* m_pWizard; + SwMailMergeWizard* m_pWizard; /// The mail merge state, available even when m_pWizard is nullptr. SwMailMergeConfigItem& m_rConfigItem; bool m_bIsTabPage; @@ -79,12 +79,11 @@ protected: DECL_LINK(IndividualHdl_Impl, weld::ToggleButton&, void); DECL_LINK(GreetingHdl_Impl, weld::Button&, void); - void Contains(bool bContainsGreeting); - virtual void UpdatePreview(); + void Contains(bool bContainsGreeting); + virtual void UpdatePreview(); }; -class SwMailMergeGreetingsPage : public vcl::OWizardPage - , public SwGreetingsHandler +class SwMailMergeGreetingsPage : public vcl::OWizardPage, public SwGreetingsHandler { std::unique_ptr<SwAddressPreview> m_xPreview; std::unique_ptr<weld::Label> m_xPreviewFI; @@ -94,7 +93,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage std::unique_ptr<weld::Button> m_xNextSetIB; std::unique_ptr<weld::CustomWeld> m_xPreviewWIN; - OUString m_sDocument; + OUString m_sDocument; DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void); DECL_LINK(InsertDataHdl_Impl, weld::Button&, void); @@ -102,9 +101,10 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage DECL_LINK(GreetingSelectListBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(AssignHdl_Impl, weld::Button&, void); - virtual void UpdatePreview() override; - virtual void Activate() override; - virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; + virtual void UpdatePreview() override; + virtual void Activate() override; + virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override; + public: SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeGreetingsPage() override; @@ -118,11 +118,12 @@ class SwMailBodyDialog : public SfxDialogController, public SwGreetingsHandler DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void); DECL_LINK(OKHdl, weld::Button&, void); + public: SwMailBodyDialog(weld::Window* pParent); virtual ~SwMailBodyDialog() override; - void SetBody(const OUString& rBody ) { m_xBodyMLE->set_text(rBody); } + void SetBody(const OUString& rBody) { m_xBodyMLE->set_text(rBody); } OUString GetBody() const { return m_xBodyMLE->get_text(); } }; #endif diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 92a60da30941..eccd2bb9d08f 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -25,7 +25,7 @@ class SwMailMergeWizard; class SwMailMergeOutputTypePage : public vcl::OWizardPage { - SwMailMergeWizard* m_pWizard; + SwMailMergeWizard* m_pWizard; std::unique_ptr<weld::RadioButton> m_xLetterRB; std::unique_ptr<weld::RadioButton> m_xMailRB; diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 91e6d06f6a11..19db636a54bb 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; SwSelectDBTableDialog::SwSelectDBTableDialog(weld::Window* pParent, - const uno::Reference< sdbc::XConnection>& rConnection) + const uno::Reference<sdbc::XConnection>& rConnection) : SfxDialogController(pParent, "modules/swriter/ui/selecttabledialog.ui", "SelectTableDialog") , m_xConnection(rConnection) , m_xTable(m_xBuilder->weld_tree_view("table")) @@ -83,9 +83,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(weld::Window* pParent, } } -SwSelectDBTableDialog::~SwSelectDBTableDialog() -{ -} +SwSelectDBTableDialog::~SwSelectDBTableDialog() {} IMPL_LINK_NOARG(SwSelectDBTableDialog, PreviewHdl, weld::Button&, void) { @@ -98,7 +96,7 @@ IMPL_LINK_NOARG(SwSelectDBTableDialog, PreviewHdl, weld::Button&, void) OUString sDataSourceName; Reference<XChild> xChild(m_xConnection, UNO_QUERY); - if(xChild.is()) + if (xChild.is()) { Reference<XDataSource> xSource(xChild->getParent(), UNO_QUERY); Reference<XPropertySet> xPrSet(xSource, UNO_QUERY); @@ -138,8 +136,7 @@ void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsTab { for (int i = 0, nCount = m_xTable->n_children(); i < nCount; ++i) { - if (m_xTable->get_text(i, 0) == rTable && - m_xTable->get_id(i).isEmpty() == bIsTable) + if (m_xTable->get_text(i, 0) == rTable && m_xTable->get_id(i).isEmpty() == bIsTable) { m_xTable->select(i); break; diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index 01f4b1ea29ca..01e013895563 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -26,9 +26,7 @@ SwInsertAbstractDlg::SwInsertAbstractDlg(weld::Window* pParent) { } -SwInsertAbstractDlg::~SwInsertAbstractDlg() -{ -} +SwInsertAbstractDlg::~SwInsertAbstractDlg() {} sal_uInt8 SwInsertAbstractDlg::GetLevel() const { diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index 3c16519ab46c..0dde165fc05a 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -25,8 +25,8 @@ SwAddrDlg::SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialogController(pParent, &rSet) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL ); - if ( fnCreatePage ) + ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(RID_SFXPAGE_GENERAL); + if (fnCreatePage) { // create TabPage SetTabPage(fnCreatePage(get_content_area(), this, &rSet)); diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 846618ac0b3b..e141dab80d0d 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -23,19 +23,18 @@ namespace swui { - SwAbstractDialogFactory& GetFactory() - { - static SwAbstractDialogFactory_Impl aFactory; - return aFactory; - } +SwAbstractDialogFactory& GetFactory() +{ + static SwAbstractDialogFactory_Impl aFactory; + return aFactory; +} } -extern "C" +extern "C" { +SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* SwCreateDialogFactory() { - SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* SwCreateDialogFactory() - { - return &::swui::GetFactory(); - } + return &::swui::GetFactory(); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 28da3d63d07d..610f595133a0 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -27,18 +27,18 @@ class SwTextFormatColl; class SwEnvFormatPage : public SfxTabPage { SwEnvDlg* m_pDialog; - std::vector<sal_uInt16> m_aIDs; + std::vector<sal_uInt16> m_aIDs; SwEnvPreview m_aPreview; - std::unique_ptr<weld::MetricSpinButton> m_xAddrLeftField; - std::unique_ptr<weld::MetricSpinButton> m_xAddrTopField; + std::unique_ptr<weld::MetricSpinButton> m_xAddrLeftField; + std::unique_ptr<weld::MetricSpinButton> m_xAddrTopField; std::unique_ptr<weld::MenuButton> m_xAddrEditButton; - std::unique_ptr<weld::MetricSpinButton> m_xSendLeftField; - std::unique_ptr<weld::MetricSpinButton> m_xSendTopField; + std::unique_ptr<weld::MetricSpinButton> m_xSendLeftField; + std::unique_ptr<weld::MetricSpinButton> m_xSendTopField; std::unique_ptr<weld::MenuButton> m_xSendEditButton; std::unique_ptr<weld::ComboBox> m_xSizeFormatBox; - std::unique_ptr<weld::MetricSpinButton> m_xSizeWidthField; - std::unique_ptr<weld::MetricSpinButton> m_xSizeHeightField; + std::unique_ptr<weld::MetricSpinButton> m_xSizeWidthField; + std::unique_ptr<weld::MetricSpinButton> m_xSizeHeightField; std::unique_ptr<weld::CustomWeld> m_xPreview; DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); @@ -48,22 +48,24 @@ class SwEnvFormatPage : public SfxTabPage void SetMinMax(); - SfxItemSet *GetCollItemSet(SwTextFormatColl const * pColl, bool bSender); + SfxItemSet* GetCollItemSet(SwTextFormatColl const* pColl, bool bSender); void Edit(const OString& rIdent, bool bSender); - SwEnvDlg *GetParentSwEnvDlg() { return m_pDialog; } + SwEnvDlg* GetParentSwEnvDlg() { return m_pDialog; } public: - SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); void Init(SwEnvDlg* pDialog); virtual ~SwEnvFormatPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwEnvItem& rItem); + void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 00a610cad3e9..4fde994f6eeb 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -37,30 +37,32 @@ class SwEnvPrtPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xBottomButton; std::unique_ptr<weld::MetricSpinButton> m_xRightField; std::unique_ptr<weld::MetricSpinButton> m_xDownField; - std::unique_ptr<weld::Label> m_xPrinterInfo; - std::unique_ptr<weld::Button> m_xPrtSetup; + std::unique_ptr<weld::Label> m_xPrinterInfo; + std::unique_ptr<weld::Button> m_xPrtSetup; - std::unique_ptr<weld::RadioButton> m_aIdsL[ENV_VER_RGHT-ENV_HOR_LEFT+1]; - std::unique_ptr<weld::RadioButton> m_aIdsU[ENV_VER_RGHT-ENV_HOR_LEFT+1]; + std::unique_ptr<weld::RadioButton> m_aIdsL[ENV_VER_RGHT - ENV_HOR_LEFT + 1]; + std::unique_ptr<weld::RadioButton> m_aIdsU[ENV_VER_RGHT - ENV_HOR_LEFT + 1]; - VclPtr<Printer> m_xPrt; + VclPtr<Printer> m_xPrt; DECL_LINK(LowerHdl, weld::ToggleButton&, void); DECL_LINK(UpperHdl, weld::ToggleButton&, void); DECL_LINK(ClickHdl, weld::ToggleButton&, void); - DECL_LINK(ButtonHdl, weld::Button&, void ); + DECL_LINK(ButtonHdl, weld::Button&, void); - SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetDialogController()); } + SwEnvDlg* GetParentSwEnvDlg() { return static_cast<SwEnvDlg*>(GetDialogController()); } public: - SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); virtual ~SwEnvPrtPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwEnvItem& rItem); + void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 0f4243aacac1..48e513d6275c 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -58,7 +58,6 @@ class SwLabPreview : public weld::CustomWidgetController virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; public: - SwLabPreview(); void UpdateItem(const SwLabItem& rItem); @@ -72,53 +71,54 @@ class SwLabFormatPage : public SfxTabPage SwLabPreview m_aPreview; - std::unique_ptr<weld::Label> m_xMakeFI; - std::unique_ptr<weld::Label> m_xTypeFI; + std::unique_ptr<weld::Label> m_xMakeFI; + std::unique_ptr<weld::Label> m_xTypeFI; std::unique_ptr<weld::CustomWeld> m_xPreview; - std::unique_ptr<weld::MetricSpinButton> m_xHDistField; - std::unique_ptr<weld::MetricSpinButton> m_xVDistField; - std::unique_ptr<weld::MetricSpinButton> m_xWidthField; - std::unique_ptr<weld::MetricSpinButton> m_xHeightField; - std::unique_ptr<weld::MetricSpinButton> m_xLeftField; - std::unique_ptr<weld::MetricSpinButton> m_xUpperField; + std::unique_ptr<weld::MetricSpinButton> m_xHDistField; + std::unique_ptr<weld::MetricSpinButton> m_xVDistField; + std::unique_ptr<weld::MetricSpinButton> m_xWidthField; + std::unique_ptr<weld::MetricSpinButton> m_xHeightField; + std::unique_ptr<weld::MetricSpinButton> m_xLeftField; + std::unique_ptr<weld::MetricSpinButton> m_xUpperField; std::unique_ptr<weld::SpinButton> m_xColsField; std::unique_ptr<weld::SpinButton> m_xRowsField; - std::unique_ptr<weld::MetricSpinButton> m_xPWidthField; - std::unique_ptr<weld::MetricSpinButton> m_xPHeightField; + std::unique_ptr<weld::MetricSpinButton> m_xPWidthField; + std::unique_ptr<weld::MetricSpinButton> m_xPHeightField; std::unique_ptr<weld::Button> m_xSavePB; - - DECL_LINK( ModifyHdl, weld::SpinButton&, void ); - DECL_LINK( MetricModifyHdl, weld::MetricSpinButton&, void ); - DECL_LINK( PreviewHdl, Timer *, void ); - DECL_LINK( SaveHdl, weld::Button&, void ); + DECL_LINK(ModifyHdl, weld::SpinButton&, void); + DECL_LINK(MetricModifyHdl, weld::MetricSpinButton&, void); + DECL_LINK(PreviewHdl, Timer*, void); + DECL_LINK(SaveHdl, weld::Button&, void); void ChangeMinMax(); public: - SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); virtual ~SwLabFormatPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwLabItem& rItem); + void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; - SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetDialogController());} + SwLabDlg* GetParentSwLabDlg() { return static_cast<SwLabDlg*>(GetDialogController()); } }; class SwSaveLabelDlg : public weld::GenericDialogController { - bool bSuccess; - SwLabDlg* m_pLabDialog; - SwLabRec& rLabRec; + bool bSuccess; + SwLabDlg* m_pLabDialog; + SwLabRec& rLabRec; std::unique_ptr<weld::ComboBox> m_xMakeCB; - std::unique_ptr<weld::Entry> m_xTypeED; - std::unique_ptr<weld::Button> m_xOKPB; + std::unique_ptr<weld::Entry> m_xTypeED; + std::unique_ptr<weld::Button> m_xOKPB; DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(ModifyEntryHdl, weld::Entry&, void); diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index c69d44ea4514..4f1673a7215c 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -28,31 +28,33 @@ class SwLabItem; class SwLabPrtPage : public SfxTabPage { - VclPtr<Printer> pPrinter; // for the shaft setting - unfortunately + VclPtr<Printer> pPrinter; // for the shaft setting - unfortunately - std::unique_ptr<weld::RadioButton> m_xPageButton; - std::unique_ptr<weld::RadioButton> m_xSingleButton; + std::unique_ptr<weld::RadioButton> m_xPageButton; + std::unique_ptr<weld::RadioButton> m_xSingleButton; std::unique_ptr<weld::Widget> m_xSingleGrid; std::unique_ptr<weld::Widget> m_xPrinterFrame; std::unique_ptr<weld::SpinButton> m_xColField; std::unique_ptr<weld::SpinButton> m_xRowField; - std::unique_ptr<weld::CheckButton> m_xSynchronCB; - std::unique_ptr<weld::Label> m_xPrinterInfo; + std::unique_ptr<weld::CheckButton> m_xSynchronCB; + std::unique_ptr<weld::Label> m_xPrinterInfo; std::unique_ptr<weld::Button> m_xPrtSetup; - DECL_LINK( CountHdl, weld::Button&, void ); + DECL_LINK(CountHdl, weld::Button&, void); - SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetDialogController());} + SwLabDlg* GetParentSwLabDlg() { return static_cast<SwLabDlg*>(GetDialogController()); } public: - SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); virtual ~SwLabPrtPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwLabItem& rItem); + void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; Printer* GetPrt() { return pPrinter; } diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 5634b4c2c5eb..b4229e0c22c8 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -26,9 +26,9 @@ class SwLabPage : public SfxTabPage { - SwDBManager* pDBManager; - OUString sActDBName; - SwLabItem aItem; + SwDBManager* pDBManager; + OUString sActDBName; + SwLabItem aItem; std::unique_ptr<weld::Widget> m_xAddressFrame; std::unique_ptr<weld::CheckButton> m_xAddrBox; @@ -45,13 +45,13 @@ class SwLabPage : public SfxTabPage std::unique_ptr<weld::Label> m_xFormatInfo; DECL_LINK(AddrHdl, weld::ToggleButton&, void); - DECL_LINK(DatabaseHdl, weld::ComboBox&, void ); + DECL_LINK(DatabaseHdl, weld::ComboBox&, void); DECL_LINK(FieldHdl, weld::Button&, void); DECL_LINK(PageHdl, weld::ToggleButton&, void); DECL_LINK(MakeHdl, weld::ComboBox&, void); DECL_LINK(TypeHdl, weld::ComboBox&, void); - void DisplayFormat (); + void DisplayFormat(); SwLabRec* GetSelectedEntryPos(); public: @@ -59,17 +59,18 @@ public: virtual ~SwLabPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwLabItem& rItem); + void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; - SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetDialogController());} + SwLabDlg* GetParentSwLabDlg() { return static_cast<SwLabDlg*>(GetDialogController()); } - void SetToBusinessCard(); + void SetToBusinessCard(); void InitDatabaseBox(); void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; } @@ -98,10 +99,12 @@ class SwPrivateDataPage : public SfxTabPage std::unique_ptr<weld::Entry> m_xMailED; public: - SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); virtual ~SwPrivateDataPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -127,10 +130,12 @@ class SwBusinessDataPage : public SfxTabPage std::unique_ptr<weld::Entry> m_xMailED; public: - SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); virtual ~SwBusinessDataPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index a9de137b21dd..097ed1823027 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -29,8 +29,8 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet) { m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ); - if ( fnCreatePage ) + ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG); + if (fnCreatePage) { std::unique_ptr<SfxTabPage> xRet = (*fnCreatePage)(get_content_area(), this, &rSet); xRet->PageCreated(rSet); diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 5635b06ed400..81917da684c2 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -35,22 +35,20 @@ SwBorderDlg::SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes m_xDialog->set_title(SwResId(STR_FRMUI_BORDER)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ); + ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER); if (fnCreatePage) { std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(get_content_area(), this, &rSet); SfxAllItemSet aSet(*(rSet.GetPool())); - aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE, static_cast<sal_uInt16>(nType))); - if(SwBorderModes::TABLE == nType) - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL)); + aSet.Put(SfxUInt16Item(SID_SWMODE_TYPE, static_cast<sal_uInt16>(nType))); + if (SwBorderModes::TABLE == nType) + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, SVX_HIDESHADOWCTL)); xNewPage->PageCreated(aSet); SetTabPage(std::move(xNewPage)); } } -SwBorderDlg::~SwBorderDlg() -{ -} +SwBorderDlg::~SwBorderDlg() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/swuiexp.hxx b/sw/source/ui/inc/swuiexp.hxx index 4419a7029549..3ea2f5f30464 100644 --- a/sw/source/ui/inc/swuiexp.hxx +++ b/sw/source/ui/inc/swuiexp.hxx @@ -23,7 +23,7 @@ namespace swui { - SwAbstractDialogFactory& GetFactory(); +SwAbstractDialogFactory& GetFactory(); } #endif diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 6d021eb07c13..e944bf24a50f 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -22,7 +22,8 @@ #include <wrtsh.hxx> SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) - : GenericDialogController(pParent, "modules/swriter/ui/selectindexdialog.ui", "SelectIndexDialog") + : GenericDialogController(pParent, "modules/swriter/ui/selectindexdialog.ui", + "SelectIndexDialog") , m_rMgr(rTOXMgr) , m_nPos(0) , m_xTextFT(m_xBuilder->weld_label("type")) @@ -34,14 +35,14 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) m_xTOXLB->connect_changed(LINK(this, SwMultiTOXMarkDlg, SelectHdl)); sal_uInt16 nSize = m_rMgr.GetTOXMarkCount(); - for(sal_uInt16 i=0; i < nSize; ++i) + for (sal_uInt16 i = 0; i < nSize; ++i) m_xTOXLB->append_text(m_rMgr.GetTOXMark(i)->GetText(m_rMgr.GetShell()->GetLayout())); m_xTOXLB->select(0); m_xTextFT->set_label(m_rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); } -IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void ) +IMPL_LINK(SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void) { if (rBox.get_selected_index() != -1) { @@ -59,8 +60,6 @@ short SwMultiTOXMarkDlg::run() return nRet; } -SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() -{ -} +SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 2d0d1eef4d13..60c5d3737b23 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -56,7 +56,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, void) const sal_Int32 nTmpLen = sTmp.getLength(); sTmp = sTmp.replaceAll(OUStringChar(BookmarkTable::aForbiddenChars.getStr()[i]), ""); if (sTmp.getLength() != nTmpLen) - sMsg += OUStringChar(BookmarkTable::aForbiddenChars.getStr()[i]); + sMsg += OUStringChar(BookmarkTable::aForbiddenChars.getStr()[i]); } const bool bHasForbiddenChars = sTmp.getLength() != nLen; m_xForbiddenChars->set_visible(bHasForbiddenChars); @@ -80,7 +80,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, void) } // allow to add new bookmark only if one name provided and it's not taken - m_xInsertBtn->set_sensitive(nEntries == 1 && nSelectedEntries == 0 && !bHasForbiddenChars && !m_bAreProtected); + m_xInsertBtn->set_sensitive(nEntries == 1 && nSelectedEntries == 0 && !bHasForbiddenChars + && !m_bAreProtected); // allow to delete only if all bookmarks are recognized m_xDeleteBtn->set_sensitive(nEntries > 0 && nSelectedEntries == nEntries && !m_bAreProtected); @@ -96,9 +97,10 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, weld::Button&, void) int nSelectedRows(0); - m_xBookmarksBox->selected_foreach([this, &nSelectedRows](weld::TreeIter& rEntry){ + m_xBookmarksBox->selected_foreach([this, &nSelectedRows](weld::TreeIter& rEntry) { // remove from model - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(rEntry).toInt64()); + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(rEntry).toInt64()); OUString sRemoved = pBookmark->GetName(); IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); pMarkAccess->deleteMark(pMarkAccess->findMark(sRemoved)); @@ -106,7 +108,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, weld::Button&, void) aReq.AppendItem(SfxStringItem(FN_DELETE_BOOKMARK, sRemoved)); aReq.Done(); aTableBookmarks.erase(std::remove(aTableBookmarks.begin(), aTableBookmarks.end(), - std::make_pair(pBookmark, sRemoved)), aTableBookmarks.end()); + std::make_pair(pBookmark, sRemoved)), + aTableBookmarks.end()); ++nSelectedRows; @@ -128,10 +131,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl, weld::Button&, void) } // callback to a goto button -IMPL_LINK_NOARG(SwInsertBookmarkDlg, GotoHdl, weld::Button&, void) -{ - GotoSelectedBookmark(); -} +IMPL_LINK_NOARG(SwInsertBookmarkDlg, GotoHdl, weld::Button&, void) { GotoSelectedBookmark(); } IMPL_LINK_NOARG(SwInsertBookmarkDlg, DoubleClickHdl, weld::TreeView&, bool) { @@ -149,15 +149,17 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, SelectionChangedHdl, weld::TreeView&, void) OUStringBuffer sEditBoxText; int nSelectedRows = 0; - m_xBookmarksBox->selected_foreach([this, &sEditBoxText, &nSelectedRows](weld::TreeIter& rEntry){ - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(rEntry).toInt64()); - const OUString& sEntryName = pBookmark->GetName(); - if (!sEditBoxText.isEmpty()) - sEditBoxText.append(";"); - sEditBoxText.append(sEntryName); - ++nSelectedRows; - return false; - }); + m_xBookmarksBox->selected_foreach( + [this, &sEditBoxText, &nSelectedRows](weld::TreeIter& rEntry) { + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(rEntry).toInt64()); + const OUString& sEntryName = pBookmark->GetName(); + if (!sEditBoxText.isEmpty()) + sEditBoxText.append(";"); + sEditBoxText.append(sEntryName); + ++nSelectedRows; + return false; + }); if (nSelectedRows) { m_xInsertBtn->set_sensitive(false); @@ -183,7 +185,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, weld::Button&, void) if (!xSelected) return; - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(*xSelected).toInt64()); + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(*xSelected).toInt64()); uno::Reference<frame::XModel> xModel = rSh.GetView().GetDocShell()->GetBaseModel(); uno::Reference<text::XBookmarksSupplier> xBkms(xModel, uno::UNO_QUERY); uno::Reference<container::XNameAccess> xNameAccess = xBkms->getBookmarks(); @@ -192,8 +195,10 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, weld::Button&, void) aObj >>= xTmp; uno::Reference<container::XNamed> xNamed(xTmp, uno::UNO_QUERY); SwAbstractDialogFactory& rFact = swui::GetFactory(); - ScopedVclPtr<AbstractSwRenameXNamedDlg> pDlg(rFact.CreateSwRenameXNamedDlg(m_xDialog.get(), xNamed, xNameAccess)); - pDlg->SetForbiddenChars(BookmarkTable::aForbiddenChars + OUStringChar(BookmarkTable::cSeparator)); + ScopedVclPtr<AbstractSwRenameXNamedDlg> pDlg( + rFact.CreateSwRenameXNamedDlg(m_xDialog.get(), xNamed, xNameAccess)); + pDlg->SetForbiddenChars(BookmarkTable::aForbiddenChars + + OUStringChar(BookmarkTable::cSeparator)); if (pDlg->Execute()) { @@ -209,7 +214,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, weld::Button&, void) IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, weld::Button&, void) { OUString sBookmark = m_xEditBox->get_text(); - rSh.SetBookmark2(vcl::KeyCode(), sBookmark, m_xHideCB->get_active(), m_xConditionED->get_text()); + rSh.SetBookmark2(vcl::KeyCode(), sBookmark, m_xHideCB->get_active(), + m_xConditionED->get_text()); m_xDialog->response(RET_OK); } @@ -231,7 +237,8 @@ void SwInsertBookmarkDlg::GotoSelectedBookmark() if (!xSelected) return; - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(*xSelected).toInt64()); + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xBookmarksBox->get_id(*xSelected).toInt64()); rSh.EnterStdMode(); rSh.GotoMark(pBookmark); @@ -254,7 +261,8 @@ bool SwInsertBookmarkDlg::HaveBookmarksChanged() if (pMarkAccess->getBookmarksCount() != m_nLastBookmarksCount) return true; - std::vector<std::pair<sw::mark::IMark*, OUString>>::const_iterator aListIter = aTableBookmarks.begin(); + std::vector<std::pair<sw::mark::IMark*, OUString>>::const_iterator aListIter + = aTableBookmarks.begin(); for (IDocumentMarkAccess::const_iterator_t ppBookmark = pMarkAccess->getBookmarksBegin(); ppBookmark != pMarkAccess->getBookmarksEnd(); ++ppBookmark) { @@ -263,8 +271,7 @@ bool SwInsertBookmarkDlg::HaveBookmarksChanged() // more bookmarks then expected if (aListIter == aTableBookmarks.end()) return true; - if (aListIter->first != *ppBookmark || - aListIter->second != (*ppBookmark)->GetName()) + if (aListIter->first != *ppBookmark || aListIter->second != (*ppBookmark)->GetName()) return true; ++aListIter; } @@ -326,14 +333,15 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS) m_xEditBox->set_text(m_xBookmarksBox->GetNameProposal()); m_xEditBox->set_position(-1); - m_xForbiddenChars->set_label(SwResId(STR_BOOKMARK_FORBIDDENCHARS) + " " + BookmarkTable::aForbiddenChars); + m_xForbiddenChars->set_label(SwResId(STR_BOOKMARK_FORBIDDENCHARS) + " " + + BookmarkTable::aForbiddenChars); m_xForbiddenChars->set_visible(false); - if ( !officecfg::Office::Common::Misc::ExperimentalMode::get() ) + if (!officecfg::Office::Common::Misc::ExperimentalMode::get()) { - m_xHideCB->set_visible( false ); - m_xConditionFT->set_visible( false ); - m_xConditionED->set_visible( false ); + m_xHideCB->set_visible(false); + m_xConditionFT->set_visible(false); + m_xConditionED->set_visible(false); } m_bAreProtected = rSh.getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_BOOKMARKS); @@ -374,9 +382,7 @@ IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, nColumn, void) } } -SwInsertBookmarkDlg::~SwInsertBookmarkDlg() -{ -} +SwInsertBookmarkDlg::~SwInsertBookmarkDlg() {} BookmarkTable::BookmarkTable(std::unique_ptr<weld::TreeView> xControl) : m_xControl(std::move(xControl)) @@ -450,8 +456,9 @@ void BookmarkTable::InsertBookmark(sw::mark::IMark* pMark) std::unique_ptr<weld::TreeIter> BookmarkTable::GetRowByBookmarkName(const OUString& sName) { std::unique_ptr<weld::TreeIter> xRet; - m_xControl->all_foreach([this, &sName, &xRet](weld::TreeIter& rEntry){ - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xControl->get_id(rEntry).toInt64()); + m_xControl->all_foreach([this, &sName, &xRet](weld::TreeIter& rEntry) { + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xControl->get_id(rEntry).toInt64()); if (pBookmark->GetName() == sName) { xRet = m_xControl->make_iterator(&rEntry); @@ -485,7 +492,8 @@ OUString BookmarkTable::GetNameProposal() const sal_Int32 nHighestBookmarkId = 0; for (int i = 0, nCount = m_xControl->n_children(); i < nCount; ++i) { - sw::mark::IMark* pBookmark = reinterpret_cast<sw::mark::IMark*>(m_xControl->get_id(i).toInt64()); + sw::mark::IMark* pBookmark + = reinterpret_cast<sw::mark::IMark*>(m_xControl->get_id(i).toInt64()); const OUString& sName = pBookmark->GetName(); sal_Int32 nIndex = 0; if (sName.getToken(0, ' ', nIndex) == sDefaultBookmarkName) diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index fe49843b5264..3684ba04ff56 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -36,9 +36,8 @@ static int nSaveButtonState = -1; // 0: tab, 1: semicolon, 2: paragraph, 3: othe static bool bIsKeepColumn = true; static sal_Unicode uOther = ','; -void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, - SwInsertTableOptions& rInsTableOpts, - SwTableAutoFormat const*& prTAFormat ) +void SwConvertTableDlg::GetValues(sal_Unicode& rDelim, SwInsertTableOptions& rInsTableOpts, + SwTableAutoFormat const*& prTAFormat) { if (m_xTabBtn->get_active()) { @@ -86,8 +85,8 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, } SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) - : SfxDialogController(rView.GetFrameWeld(), - "modules/swriter/ui/converttexttable.ui", "ConvertTextTableDialog") + : SfxDialogController(rView.GetFrameWeld(), "modules/swriter/ui/converttexttable.ui", + "ConvertTextTableDialog") , m_xTabBtn(m_xBuilder->weld_radio_button("tabs")) , m_xSemiBtn(m_xBuilder->weld_radio_button("semicolons")) , m_xParaBtn(m_xBuilder->weld_radio_button("paragraph")) @@ -121,11 +120,10 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) m_xOtherBtn->set_active(true); if (uOther) m_xOtherEd->set_text(OUString(uOther)); - break; + break; } - } - if( bToTable ) + if (bToTable) { m_xDialog->set_title(SwResId(STR_CONVERT_TEXT_TABLE)); m_xAutoFormatBtn->connect_clicked(LINK(this, SwConvertTableDlg, AutoFormatHdl)); @@ -140,7 +138,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) } m_xKeepColumn->save_state(); - Link<weld::Button&,void> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); + Link<weld::Button&, void> aLk(LINK(this, SwConvertTableDlg, BtnHdl)); m_xTabBtn->connect_clicked(aLk); m_xSemiBtn->connect_clicked(aLk); m_xParaBtn->connect_clicked(aLk); @@ -149,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); - bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON); + bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell()) & HTMLMODE_ON); SwInsertTableOptions aInsOpts = pModOpt->GetInsTableFlags(bHTMLMode); SwInsertTableFlags nInsTableFlags = aInsOpts.mnInsMode; @@ -168,7 +166,8 @@ IMPL_LINK_NOARG(SwConvertTableDlg, AutoFormatHdl, weld::Button&, void) { SwAbstractDialogFactory& rFact = swui::GetFactory(); - ScopedVclPtr<AbstractSwAutoFormatDlg> pDlg(rFact.CreateSwAutoFormatDlg(m_xDialog.get(), pShell, false, mxTAutoFormat.get())); + ScopedVclPtr<AbstractSwAutoFormatDlg> pDlg( + rFact.CreateSwAutoFormatDlg(m_xDialog.get(), pShell, false, mxTAutoFormat.get())); if (RET_OK == pDlg->Execute()) mxTAutoFormat = pDlg->FillAutoFormatOfIndex(); } diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 5713709145e4..c715b8a5f6a1 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -19,7 +19,7 @@ #include <mergetbl.hxx> -SwMergeTableDlg::SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev) +SwMergeTableDlg::SwMergeTableDlg(weld::Window* pParent, bool& rWithPrev) : GenericDialogController(pParent, "modules/swriter/ui/mergetabledialog.ui", "MergeTableDialog") , m_rMergePrev(rWithPrev) , m_xMergePrevRB(m_xBuilder->weld_radio_button("prev")) @@ -27,10 +27,7 @@ SwMergeTableDlg::SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev) m_xMergePrevRB->set_active(true); } -void SwMergeTableDlg::Apply() -{ - m_rMergePrev = m_xMergePrevRB->get_active(); -} +void SwMergeTableDlg::Apply() { m_rMergePrev = m_xMergePrevRB->get_active(); } short SwMergeTableDlg::run() { diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index e322bd8462a0..0deb5d03093c 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -21,7 +21,7 @@ #include <splittbl.hxx> #include <tblenum.hxx> -SwSplitTableDlg::SwSplitTableDlg(weld::Window *pParent, SwWrtShell &rSh) +SwSplitTableDlg::SwSplitTableDlg(weld::Window* pParent, SwWrtShell& rSh) : GenericDialogController(pParent, "modules/swriter/ui/splittable.ui", "SplitTableDialog") , m_xContentCopyRB(m_xBuilder->weld_radio_button("copyheading")) , m_xBoxAttrCopyWithParaRB(m_xBuilder->weld_radio_button("customheadingapplystyle")) diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 7b66b6ba6218..6678dcdbddc3 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -22,7 +22,7 @@ #include <ooo/vba/word/XAddin.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XAddin > SwVbaAddin_BASE; +typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XAddin> SwVbaAddin_BASE; class SwVbaAddin : public SwVbaAddin_BASE { @@ -32,16 +32,18 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ); + SwVbaAddin(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent, + const css::uno::Reference<css::uno::XComponentContext>& rContext, + const OUString& rFileURL); virtual ~SwVbaAddin() override; // Attributes virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName( const OUString& _name ) override; + virtual void SAL_CALL setName(const OUString& _name) override; virtual OUString SAL_CALL getPath() override; virtual sal_Bool SAL_CALL getAutoload() override; virtual sal_Bool SAL_CALL getInstalled() override; - virtual void SAL_CALL setInstalled( sal_Bool _installed ) override; + virtual void SAL_CALL setInstalled(sal_Bool _installed) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 67a9edb3c998..0072b36d5aa8 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -22,20 +22,21 @@ #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/word/XAddins.hpp> -typedef CollTestImplHelper< ooo::vba::word::XAddins > SwVbaAddins_BASE; +typedef CollTestImplHelper<ooo::vba::word::XAddins> SwVbaAddins_BASE; class SwVbaAddins : public SwVbaAddins_BASE { public: /// @throws css::uno::RuntimeException - SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ); + SwVbaAddins(const css::uno::Reference<ov::XHelperInterface>& xParent, + const css::uno::Reference<css::uno::XComponentContext>& xContext); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; + virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() override; // SwVbaAddins_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; + virtual css::uno::Any createCollectionObject(const css::uno::Any& aSource) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 6333354262c9..6bc123bb34f1 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -23,13 +23,13 @@ #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/text/XTextContent.hpp> -typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XBookmark > SwVbaBookmark_BASE; +typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XBookmark> SwVbaBookmark_BASE; class SwVbaBookmark : public SwVbaBookmark_BASE { private: - css::uno::Reference< css::frame::XModel > mxModel; - css::uno::Reference< css::text::XTextContent > mxBookmark; + css::uno::Reference<css::frame::XModel> mxModel; + css::uno::Reference<css::text::XTextContent> mxBookmark; OUString maBookmarkName; bool mbValid; @@ -39,13 +39,14 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ); + SwVbaBookmark(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent, + const css::uno::Reference<css::uno::XComponentContext>& rContext, + const css::uno::Reference<css::frame::XModel>& rModel, const OUString& rName); virtual ~SwVbaBookmark() override; - // Methods + // Methods virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName( const OUString& ) override; + virtual void SAL_CALL setName(const OUString&) override; virtual void SAL_CALL Delete() override; virtual void SAL_CALL Select() override; virtual css::uno::Any SAL_CALL Range() override; diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 23e40c45d962..1d8c0b4f8a2a 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -28,36 +28,36 @@ #include <cppuhelper/implbase.hxx> #include <vbahelper/vbaglobalbase.hxx> -typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; +typedef ::cppu::ImplInheritanceHelper<VbaGlobalsBase, ov::word::XGlobals> SwVbaGlobals_BASE; class SwVbaGlobals : public SwVbaGlobals_BASE { private: - css::uno::Reference< ooo::vba::word::XApplication > mxApplication; + css::uno::Reference<ooo::vba::word::XApplication> mxApplication; /// @throws css::uno::RuntimeException - css::uno::Reference< ooo::vba::word::XApplication > const & getApplication(); + css::uno::Reference<ooo::vba::word::XApplication> const& getApplication(); public: - - SwVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext ); + SwVbaGlobals(css::uno::Sequence<css::uno::Any> const& aArgs, + css::uno::Reference<css::uno::XComponentContext> const& rxContext); virtual ~SwVbaGlobals() override; // XGlobals virtual OUString SAL_CALL getName() override; - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override; - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() override; - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() override; - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() override; - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() override; - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) override; - virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override; + virtual css::uno::Reference<ooo::vba::word::XSystem> SAL_CALL getSystem() override; + virtual css::uno::Reference<ov::word::XDocument> SAL_CALL getActiveDocument() override; + virtual css::uno::Reference<ov::word::XWindow> SAL_CALL getActiveWindow() override; + virtual css::uno::Reference<ooo::vba::word::XOptions> SAL_CALL getOptions() override; + virtual css::uno::Reference<ooo::vba::word::XSelection> SAL_CALL getSelection() override; + virtual css::uno::Any SAL_CALL CommandBars(const css::uno::Any& aIndex) override; + virtual css::uno::Any SAL_CALL Documents(const css::uno::Any& aIndex) override; + virtual css::uno::Any SAL_CALL Addins(const css::uno::Any& aIndex) override; + virtual css::uno::Any SAL_CALL Dialogs(const css::uno::Any& aIndex) override; + virtual css::uno::Any SAL_CALL ListGalleries(const css::uno::Any& aIndex) override; + virtual float SAL_CALL CentimetersToPoints(float Centimeters) override; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; + virtual css::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx index ed3c5d2d9d21..ca66b208addf 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx @@ -26,21 +26,21 @@ class HeaderFooterHelper { public: /// @throws css::uno::RuntimeException - static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isHeaderFooter(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ); + static bool isHeaderFooter(const css::uno::Reference<css::text::XText>& xText); /// @throws css::uno::RuntimeException - static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isHeader(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isFirstPageHeader(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isEvenPagesHeader(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isFooter(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isFirstPageFooter(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ); + static bool isEvenPagesFooter(const css::uno::Reference<css::frame::XModel>& xModel); }; #endif diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx index 01e5500bab86..c60b300cd430 100644 --- a/sw/source/ui/vba/vbainformationhelper.hxx +++ b/sw/source/ui/vba/vbainformationhelper.hxx @@ -26,13 +26,16 @@ class SwVbaInformationHelper { public: /// @throws css::uno::RuntimeException - static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ); + static sal_Int32 + handleWdActiveEndPageNumber(const css::uno::Reference<css::text::XTextViewCursor>& xTVCursor); /// @throws css::uno::RuntimeException - static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ); + static sal_Int32 + handleWdNumberOfPagesInDocument(const css::uno::Reference<css::frame::XModel>& xModel); /// @throws css::uno::RuntimeException - static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ); + static double handleWdVerticalPositionRelativeToPage( + const css::uno::Reference<css::frame::XModel>& xModel, + const css::uno::Reference<css::text::XTextViewCursor>& xTVCursor); //static double verticalPositionRelativeToPageBoundary( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor, const css::uno::Reference< css::beans::XPropertySet >& xStyleProps ) throw( css::uno::RuntimeException ); - }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAINFORMATIONHELPER_HXX diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index e5c13bf1c324..63edfa390725 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -22,22 +22,23 @@ #include <ooo/vba/word/XPane.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XPane > SwVbaPane_BASE; +typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XPane> SwVbaPane_BASE; class SwVbaPane : public SwVbaPane_BASE { private: - css::uno::Reference< css::frame::XModel > mxModel; + css::uno::Reference<css::frame::XModel> mxModel; public: /// @throws css::uno::RuntimeException - SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& xModel ); + SwVbaPane(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent, + const css::uno::Reference<css::uno::XComponentContext>& rContext, + const css::uno::Reference<css::frame::XModel>& xModel); virtual ~SwVbaPane() override; // Methods - virtual css::uno::Any SAL_CALL View( ) override; - virtual void SAL_CALL Close( ) override; + virtual css::uno::Any SAL_CALL View() override; + virtual void SAL_CALL Close() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index de956205db96..3be2c29e4747 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -22,13 +22,14 @@ #include <ooo/vba/word/XTabStop.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTabStop > SwVbaTabStop_BASE; +typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XTabStop> SwVbaTabStop_BASE; class SwVbaTabStop : public SwVbaTabStop_BASE { public: /// @throws css::uno::RuntimeException - SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); + SwVbaTabStop(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent, + const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~SwVbaTabStop() override; // XHelperInterface diff --git a/sw/source/uibase/app/appenv.hxx b/sw/source/uibase/app/appenv.hxx index 64fcd4a81af0..862e5b08f090 100644 --- a/sw/source/uibase/app/appenv.hxx +++ b/sw/source/uibase/app/appenv.hxx @@ -15,8 +15,7 @@ class SwWrtShell; class SwFieldMgr; -OUString InsertLabEnvText( SwWrtShell& , SwFieldMgr& , const OUString& ); - +OUString InsertLabEnvText(SwWrtShell&, SwFieldMgr&, const OUString&); #endif diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx index bcbcaf005df9..bee7110e0e1a 100644 --- a/sw/source/uibase/app/swdllimpl.hxx +++ b/sw/source/uibase/app/swdllimpl.hxx @@ -16,7 +16,10 @@ #include <memory> -namespace sw { class Filters; } +namespace sw +{ +class Filters; +} class SvxAutoCorrCfg; @@ -30,14 +33,14 @@ public: SwDLL(); ~SwDLL() COVERITY_NOEXCEPT_FALSE; - sw::Filters & getFilters(); + sw::Filters& getFilters(); private: SwDLL(SwDLL const&) = delete; SwDLL& operator=(SwDLL const&) = delete; - std::unique_ptr< sw::Filters > filters_; - SvxAutoCorrCfg *m_pAutoCorrCfg; + std::unique_ptr<sw::Filters> filters_; + SvxAutoCorrCfg* m_pAutoCorrCfg; }; #endif diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index 8dda357ee391..32d777713fda 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -35,17 +35,17 @@ void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth) { const sal_uInt16 nCount = rCol.GetColumns().size(); - for(sal_uInt16 i = 0; i < nCount; ++i) + for (sal_uInt16 i = 0; i < nCount; ++i) { const sal_uInt16 nTmp = rCol.CalcColWidth(i, nWidth); - auto & col = rCol.GetColumns()[i]; + auto& col = rCol.GetColumns()[i]; col.SetWishWidth(nTmp); // If necessary, shrink borders (as equally as possible) to keep up the invariant that // GetWishWidth() >= GetLeft() + GetRight(): sal_uInt32 const borders = col.GetLeft() + col.GetRight(); if (borders > nTmp) { - auto const shrink = borders - nTmp; + auto const shrink = borders - nTmp; auto const half = shrink / 2; // rounds down if (col.GetLeft() < col.GetRight()) { @@ -67,34 +67,34 @@ void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth) // public methods // set column quantity and Gutterwidth -void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth) +void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth) { aFormatCol.Init(nCount, nGutterWidth, nWidth); aFormatCol.SetWishWidth(nWidth); aFormatCol.SetGutterWidth(nGutterWidth, nWidth); } -sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const +sal_uInt16 SwColMgr::GetGutterWidth(sal_uInt16 nPos) const { sal_uInt16 nRet; - if(nPos == USHRT_MAX ) + if (nPos == USHRT_MAX) nRet = GetCount() > 1 ? aFormatCol.GetGutterWidth() : DEF_GUTTER_WIDTH; else { - OSL_ENSURE(nPos < GetCount() - 1, "column overindexed" ); + OSL_ENSURE(nPos < GetCount() - 1, "column overindexed"); const SwColumns& rCols = aFormatCol.GetColumns(); nRet = rCols[nPos].GetRight() + rCols[nPos + 1].GetLeft(); } return nRet; } -void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) +void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos) { - if(nPos == USHRT_MAX) + if (nPos == USHRT_MAX) aFormatCol.SetGutterWidth(nGutterWidth, nWidth); else { - OSL_ENSURE(nPos < GetCount() - 1, "column overindexed" ); + OSL_ENSURE(nPos < GetCount() - 1, "column overindexed"); SwColumns& rCols = aFormatCol.GetColumns(); sal_uInt16 nGutterWidth2 = nGutterWidth / 2; rCols[nPos].SetRight(nGutterWidth2); @@ -124,7 +124,6 @@ void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd) { OSL_ENSURE(nIdx < GetCount(), "Column array overindexed."); aFormatCol.GetColumns()[nIdx].SetWishWidth(nWd); - } // newly set size @@ -135,21 +134,19 @@ void SwColMgr::SetActualWidth(sal_uInt16 nW) } // ctor -SwColMgr::SwColMgr(const SfxItemSet& rSet) : - aFormatCol(rSet.Get(RES_COL)) +SwColMgr::SwColMgr(const SfxItemSet& rSet) + : aFormatCol(rSet.Get(RES_COL)) { nWidth = static_cast<sal_uInt16>(rSet.Get(RES_FRM_SIZE).GetWidth()); if (nWidth < MINLAY) nWidth = USHRT_MAX; - const SvxLRSpaceItem &rLR = rSet.Get(RES_LR_SPACE); + const SvxLRSpaceItem& rLR = rSet.Get(RES_LR_SPACE); nWidth = nWidth - static_cast<sal_uInt16>(rLR.GetLeft()); nWidth = nWidth - static_cast<sal_uInt16>(rLR.GetRight()); ::FitToActualSize(aFormatCol, nWidth); } -SwColMgr::~SwColMgr() -{ -} +SwColMgr::~SwColMgr() {} void SwColMgr::SetLineWidthAndColor(SvxBorderLineStyle eStyle, sal_uLong nLWidth, const Color& rCol) { diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index 38a3eab69fe1..a2d2aa1b012f 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -18,10 +18,10 @@ class SwDashedLine : public Control Color& (*m_pColorFn)(); public: - SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); - virtual ~SwDashedLine( ) override; + SwDashedLine(vcl::Window* pParent, Color& (*pColorFn)()); + virtual ~SwDashedLine() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; }; #endif diff --git a/sw/source/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/uibase/inc/SidebarWindowsConsts.hxx index a6becb92b499..2e920b990765 100644 --- a/sw/source/uibase/inc/SidebarWindowsConsts.hxx +++ b/sw/source/uibase/inc/SidebarWindowsConsts.hxx @@ -22,8 +22,8 @@ #include <sal/types.h> -namespace sw::sidebarwindows { - +namespace sw::sidebarwindows +{ const sal_Int8 ANCHORLINE_WIDTH = 1; } // end of namespace sw::sidebarwindows diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 6d6f6ba60d03..2bba7126debe 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -30,8 +30,8 @@ public: SwInsertAbstractDlg(weld::Window* pParent); virtual ~SwInsertAbstractDlg() override; - sal_uInt8 GetLevel() const; - sal_uInt8 GetPara() const; + sal_uInt8 GetLevel() const; + sal_uInt8 GetPara() const; }; #endif diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 330159551f96..c50d51956cd7 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -37,7 +37,7 @@ class SwAsciiFilterDlg : public SfxDialogController std::unique_ptr<weld::Label> m_xFontFT; std::unique_ptr<weld::ComboBox> m_xFontLB; std::unique_ptr<weld::Label> m_xLanguageFT; - std::unique_ptr<SvxLanguageBox> m_xLanguageLB; + std::unique_ptr<SvxLanguageBox> m_xLanguageLB; std::unique_ptr<weld::RadioButton> m_xCRLF_RB; std::unique_ptr<weld::RadioButton> m_xCR_RB; std::unique_ptr<weld::RadioButton> m_xLF_RB; @@ -45,9 +45,9 @@ class SwAsciiFilterDlg : public SfxDialogController DECL_LINK(CharSetSelHdl, weld::ComboBox&, void); DECL_LINK(LineEndHdl, weld::ToggleButton&, void); - void SetCRLF( LineEnd eEnd ); + void SetCRLF(LineEnd eEnd); LineEnd GetCRLF() const; - void SetIncludeBOM( bool bIncludeBOM ); + void SetIncludeBOM(bool bIncludeBOM); bool GetIncludeBOM() const; void UpdateIncludeBOMSensitiveState(); @@ -57,7 +57,7 @@ public: SwAsciiFilterDlg(weld::Window* pParent, SwDocShell& rDocSh, SvStream* pStream); virtual ~SwAsciiFilterDlg() override; - void FillOptions( SwAsciiOptions& rOptions ); + void FillOptions(SwAsciiOptions& rOptions); }; #endif diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx index f40f2c7d1516..a980cbc064e9 100644 --- a/sw/source/uibase/inc/barcfg.hxx +++ b/sw/source/uibase/inc/barcfg.hxx @@ -26,19 +26,19 @@ enum class SelectionType : sal_Int32; class SwToolbarConfigItem : public utl::ConfigItem { - sal_Int32 aTbxIdArray[5]; + sal_Int32 aTbxIdArray[5]; static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; public: - SwToolbarConfigItem( bool bWeb ); + SwToolbarConfigItem(bool bWeb); virtual ~SwToolbarConfigItem() override; - virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify(const css::uno::Sequence<OUString>& aPropertyNames) override; - void SetTopToolbar(SelectionType nSelType, ToolbarId eBarId); + void SetTopToolbar(SelectionType nSelType, ToolbarId eBarId); }; #endif diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx index abf64aa65533..1556c2acc136 100644 --- a/sw/source/uibase/inc/beziersh.hxx +++ b/sw/source/uibase/inc/beziersh.hxx @@ -21,7 +21,7 @@ #include "basesh.hxx" -class SwBezierShell: public SwBaseShell +class SwBezierShell : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_BEZIERSHELL) @@ -31,10 +31,10 @@ private: static void InitInterface_Impl(); public: - SwBezierShell(SwView &rView); + SwBezierShell(SwView& rView); - void GetState(SfxItemSet &); - void Execute(SfxRequest const &); + void GetState(SfxItemSet&); + void Execute(SfxRequest const&); }; #endif diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index a69f020d6c51..002cdea92c3b 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -24,20 +24,20 @@ class SwBookmarkControl : public SfxStatusBarControl { - virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Command(const CommandEvent& rCEvt) override; public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); - SwBookmarkControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SwBookmarkControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SwBookmarkControl() override; private: - OUString sPageNumber; + OUString sPageNumber; }; #endif diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 9ee79926fb1a..9de8a9f4a366 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -36,12 +36,12 @@ class SwBreakDlg : public weld::GenericDialogController std::unique_ptr<weld::SpinButton> m_xPageNumEdit; std::unique_ptr<weld::Button> m_xOkBtn; - SwWrtShell &rSh; - OUString m_aTemplate; - sal_uInt16 nKind; - ::std::optional<sal_uInt16> oPgNum; + SwWrtShell& rSh; + OUString m_aTemplate; + sal_uInt16 nKind; + ::std::optional<sal_uInt16> oPgNum; - bool bHtmlMode; + bool bHtmlMode; DECL_LINK(ToggleHdl, weld::ToggleButton&, void); DECL_LINK(ChangeHdl, weld::ComboBox&, void); @@ -53,10 +53,10 @@ class SwBreakDlg : public weld::GenericDialogController void rememberResult(); public: - SwBreakDlg(weld::Window *pParent, SwWrtShell &rSh); + SwBreakDlg(weld::Window* pParent, SwWrtShell& rSh); const OUString& GetTemplateName() const { return m_aTemplate; } sal_uInt16 GetKind() const { return nKind; } - const ::std::optional<sal_uInt16>& GetPageNumber() const { return oPgNum; } + const ::std::optional<sal_uInt16>& GetPageNumber() const { return oPgNum; } }; #endif diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index a5714d6120bb..1c4df0086b55 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -30,8 +30,8 @@ class SW_DLLPUBLIC ConditionEditDropTarget : public DropTargetHelper private: ConditionEdit& m_rEdit; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override; + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override; public: ConditionEditDropTarget(ConditionEdit& rEdit); @@ -53,7 +53,10 @@ public: void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } - void connect_changed(const Link<weld::Entry&, void>& rLink) { m_xControl->connect_changed(rLink); } + void connect_changed(const Link<weld::Entry&, void>& rLink) + { + m_xControl->connect_changed(rLink); + } void replace_selection(const OUString& rText) { m_xControl->replace_selection(rText); } void hide() { m_xControl->hide(); } weld::Entry& get_widget() { return *m_xControl; } diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx index d1fad7db3e94..e9250eb39e89 100644 --- a/sw/source/uibase/inc/conpoly.hxx +++ b/sw/source/uibase/inc/conpoly.hxx @@ -30,7 +30,7 @@ public: // Mouse- & Key-Events virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 08a831b0b459..103490eac0f9 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -49,7 +49,7 @@ class SwConvertTableDlg : public SfxDialogController std::unique_ptr<weld::Button> m_xAutoFormatBtn; std::unique_ptr<SwTableAutoFormat> mxTAutoFormat; - SwWrtShell* pShell; + SwWrtShell* pShell; DECL_LINK(AutoFormatHdl, weld::Button&, void); DECL_LINK(BtnHdl, weld::Button&, void); @@ -59,9 +59,8 @@ class SwConvertTableDlg : public SfxDialogController public: SwConvertTableDlg(SwView& rView, bool bToTable); - void GetValues( sal_Unicode& rDelim, - SwInsertTableOptions& rInsTableOpts, - SwTableAutoFormat const*& prTAFormat ); + void GetValues(sal_Unicode& rDelim, SwInsertTableOptions& rInsTableOpts, + SwTableAutoFormat const*& prTAFormat); }; #endif diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 16fa1f063da9..b26a1fb2178f 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -33,14 +33,14 @@ class SwCaptionDialog : public SfxDialogController { OUString m_sNone; TextFilterAutoConvert m_aTextFilter; - SwView &rView; // search per active, avoid View - std::unique_ptr<SwFieldMgr> pMgr; // pointer to save the include + SwView& rView; // search per active, avoid View + std::unique_ptr<SwFieldMgr> pMgr; // pointer to save the include - OUString sCharacterStyle; - bool bCopyAttributes; - bool bOrderNumberingFirst; //#i61007# order of captions + OUString sCharacterStyle; + bool bCopyAttributes; + bool bOrderNumberingFirst; //#i61007# order of captions - css::uno::Reference< css::container::XNameAccess > xNameAccess; + css::uno::Reference<css::container::XNameAccess> xNameAccess; SwCaptionPreview m_aPreview; std::unique_ptr<weld::Entry> m_xTextEdit; @@ -73,7 +73,7 @@ class SwCaptionDialog : public SfxDialogController static OUString our_aSepTextSave; // Save caption separator text public: - SwCaptionDialog(weld::Window *pParent, SwView &rV); + SwCaptionDialog(weld::Window* pParent, SwView& rV); virtual short run() override; virtual ~SwCaptionDialog() override; }; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 38ace352a2cd..ea42bb44da13 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -23,14 +23,14 @@ #include <swdllapi.h> -class PrintMonitor: public weld::GenericDialogController +class PrintMonitor : public weld::GenericDialogController { public: std::unique_ptr<weld::Label> m_xDocName; std::unique_ptr<weld::Label> m_xPrinter; std::unique_ptr<weld::Label> m_xPrintInfo; - PrintMonitor(weld::Window *pParent); + PrintMonitor(weld::Window* pParent); virtual ~PrintMonitor() override; }; @@ -41,26 +41,26 @@ public: std::unique_ptr<weld::Label> m_xPrinter; std::unique_ptr<weld::Label> m_xPrintInfo; - SaveMonitor(weld::Window *pParent); + SaveMonitor(weld::Window* pParent); virtual ~SaveMonitor() override; }; class CreateMonitor : public weld::GenericDialogController { public: - CreateMonitor(weld::Window *pParent); + CreateMonitor(weld::Window* pParent); virtual ~CreateMonitor() override; - void SetTotalCount( sal_Int32 nTotal ); - void SetCurrentPosition( sal_Int32 nCurrent ); + void SetTotalCount(sal_Int32 nTotal); + void SetCurrentPosition(sal_Int32 nCurrent); private: void UpdateCountingText(); private: - OUString m_sCountingPattern; - sal_Int32 m_nTotalCount; - sal_Int32 m_nCurrentPosition; + OUString m_sCountingPattern; + sal_Int32 m_nTotalCount; + sal_Int32 m_nCurrentPosition; std::unique_ptr<weld::Label> m_xCounting; }; diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 521e2114a4e0..6e232c85ac63 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -25,14 +25,14 @@ class SwWrtShell; class SwFootNoteOptionDlg : public SfxTabDialogController { - SwWrtShell &rSh; + SwWrtShell& rSh; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; + virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; DECL_LINK(OkHdl, weld::Button&, void); public: - SwFootNoteOptionDlg(weld::Window *pParent, SwWrtShell &rSh); + SwFootNoteOptionDlg(weld::Window* pParent, SwWrtShell& rSh); }; #endif diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx index cac7e5ce4396..e6002e1d6107 100644 --- a/sw/source/uibase/inc/dselect.hxx +++ b/sw/source/uibase/inc/dselect.hxx @@ -24,10 +24,10 @@ // draw rectangle class DrawSelection : public SwDrawBase { - public: +public: DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); - virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 7455d35791a0..a851aa3880e1 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -24,7 +24,7 @@ #include <vcl/customweld.hxx> #include "envimg.hxx" -#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP)) +#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP)) #define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP) inline int getfieldval(const weld::MetricSpinButton& rField) @@ -58,32 +58,33 @@ public: class SwEnvDlg : public SfxTabDialogController { -friend class SwEnvPage; -friend class SwEnvFormatPage; -friend class SwEnvPrtPage; -friend class SwEnvPreview; + friend class SwEnvPage; + friend class SwEnvFormatPage; + friend class SwEnvPrtPage; + friend class SwEnvPreview; - SwEnvItem aEnvItem; - SwWrtShell *pSh; + SwEnvItem aEnvItem; + SwWrtShell* pSh; VclPtr<Printer> pPrinter; std::unique_ptr<SfxItemSet> pAddresseeSet; std::unique_ptr<SfxItemSet> pSenderSet; std::unique_ptr<weld::Button> m_xModify; - virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; - virtual short Ok() override; + virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + virtual short Ok() override; public: - SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); + SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, + bool bInsert); virtual ~SwEnvDlg() override; }; class SwEnvPage : public SfxTabPage { SwEnvDlg* m_pDialog; - SwWrtShell* m_pSh; - OUString m_sActDBName; + SwWrtShell* m_pSh; + OUString m_sActDBName; SwEnvPreview m_aPreview; std::unique_ptr<weld::TextView> m_xAddrEdit; @@ -108,11 +109,12 @@ public: void Init(SwEnvDlg* pDialog); virtual ~SwEnvPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; - void FillItem(SwEnvItem& rItem); + void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; }; diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx index 262ecfc68538..e83267bd700b 100644 --- a/sw/source/uibase/inc/formatclipboard.hxx +++ b/sw/source/uibase/inc/formatclipboard.hxx @@ -40,8 +40,8 @@ public: * Test if the object contains text or paragraph attribute */ bool HasContent() const; - bool HasContentForThisType( SelectionType nSelectionType ) const; - static bool CanCopyThisType( SelectionType nSelectionType ); + bool HasContentForThisType(SelectionType nSelectionType) const; + static bool CanCopyThisType(SelectionType nSelectionType); /** * Store/Backup the text and paragraph attribute of the current selection. @@ -49,7 +49,7 @@ public: * @param bPersistentCopy * input parameter - specify if the Paste function will erase the current object. */ - void Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy ); + void Copy(SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy); /** * Paste the stored text and paragraph attributes on the current selection and current paragraph. @@ -60,8 +60,8 @@ public: * @param bNoParagraphFormats * Do not paste the paragraph formats. */ - void Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPool - , bool bNoCharacterFormats, bool bNoParagraphFormats ); + void Paste(SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPool, bool bNoCharacterFormats, + bool bNoParagraphFormats); /** * Clear the currently stored text and paragraph attributes. @@ -87,7 +87,7 @@ private: //no frame style because it contains position information /** specify if the Paste function have to clear the current object */ - bool m_bPersistentCopy; + bool m_bPersistentCopy; }; #endif diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index b5ba48a97711..a012381ce25d 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -44,7 +44,7 @@ class SwGlossaryGroupDlg final : public SfxDialogController weld::Window* m_pParent; SwGlossaryHdl* pGlosHdl; - OUString sCreatedGroup; + OUString sCreatedGroup; std::unique_ptr<weld::Entry> m_xNameED; std::unique_ptr<weld::ComboBox> m_xPathLB; @@ -54,7 +54,7 @@ class SwGlossaryGroupDlg final : public SfxDialogController std::unique_ptr<weld::Button> m_xDelPB; std::unique_ptr<weld::Button> m_xRenamePB; - bool IsDeleteAllowed(const OUString &rGroup); + bool IsDeleteAllowed(const OUString& rGroup); void Apply(); DECL_LINK(SelectHdl, weld::TreeView&, void); @@ -67,13 +67,12 @@ class SwGlossaryGroupDlg final : public SfxDialogController DECL_LINK(EntrySizeAllocHdl, const Size&, void); public: - SwGlossaryGroupDlg(weld::Window* pParent, - std::vector<OUString> const& rPathArr, - SwGlossaryHdl *pGlosHdl); + SwGlossaryGroupDlg(weld::Window* pParent, std::vector<OUString> const& rPathArr, + SwGlossaryHdl* pGlosHdl); virtual short run() override; virtual ~SwGlossaryGroupDlg() override; - const OUString& GetCreatedGroupName() const {return sCreatedGroup;} + const OUString& GetCreatedGroupName() const { return sCreatedGroup; } }; #endif diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx index 357fabf4201d..c5de732025f6 100644 --- a/sw/source/uibase/inc/grfsh.hxx +++ b/sw/source/uibase/inc/grfsh.hxx @@ -27,7 +27,7 @@ #include <sfx2/shell.hxx> -class SwGrfShell: public SwBaseShell +class SwGrfShell : public SwBaseShell { class SwExternalToolEdit; std::vector<std::unique_ptr<SwExternalToolEdit>> m_ExternalEdits; @@ -41,13 +41,13 @@ private: public: void Execute(SfxRequest& rRequest); - void ExecAttr(SfxRequest const & rRequest); + void ExecAttr(SfxRequest const& rRequest); void GetAttrState(SfxItemSet& rRequest); - void ExecuteRotation(SfxRequest const &rRequest); + void ExecuteRotation(SfxRequest const& rRequest); void GetAttrStateForRotation(SfxItemSet& rRequest); - SwGrfShell(SwView &rView); + SwGrfShell(SwView& rView); virtual ~SwGrfShell() override; }; diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx index c9eec95d3bc3..a74f7b39328f 100644 --- a/sw/source/uibase/inc/initui.hxx +++ b/sw/source/uibase/inc/initui.hxx @@ -34,8 +34,8 @@ class SwGlossaryList; bool HasGlossaryList(); SwGlossaryList* GetGlossaryList(); -extern void InitUI(); -extern void FinitUI(); +extern void InitUI(); +extern void FinitUI(); #endif diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index aa36dc655c00..05c02af5c2a8 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -33,17 +33,17 @@ class SwInsTableDlg : public SfxDialogController { - TextFilter m_aTextFilter; + TextFilter m_aTextFilter; - SwWrtShell* pShell; + SwWrtShell* pShell; SwTableAutoFormatTable* pTableTable; - SwTableAutoFormat* pTAutoFormat; + SwTableAutoFormat* pTAutoFormat; - sal_uInt8 lbIndex; - sal_uInt8 tbIndex; - sal_uInt8 minTableIndexInLb; - sal_uInt8 maxTableIndexInLb; - sal_Int64 nEnteredValRepeatHeaderNF; + sal_uInt8 lbIndex; + sal_uInt8 tbIndex; + sal_uInt8 minTableIndexInLb; + sal_uInt8 maxTableIndexInLb; + sal_Int64 nEnteredValRepeatHeaderNF; AutoFormatPreview m_aWndPreview; @@ -62,7 +62,7 @@ class SwInsTableDlg : public SfxDialogController // Returns 255 if mapping is not possible. // This means there cannot be more than 255 autotable style. - sal_uInt8 lbIndexToTableIndex( const sal_uInt8 listboxIndex ); + sal_uInt8 lbIndexToTableIndex(const sal_uInt8 listboxIndex); void InitAutoTableFormat(); DECL_LINK(TextFilterHdl, OUString&, bool); @@ -77,9 +77,9 @@ class SwInsTableDlg : public SfxDialogController public: SwInsTableDlg(SwView& rView); - void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, - SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName, - std::unique_ptr<SwTableAutoFormat>& prTAFormat ); + void GetValues(OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, + SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName, + std::unique_ptr<SwTableAutoFormat>& prTAFormat); }; #endif diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx index 0caecf64282e..83bc9b321c06 100644 --- a/sw/source/uibase/inc/listsh.hxx +++ b/sw/source/uibase/inc/listsh.hxx @@ -21,7 +21,7 @@ #include "basesh.hxx" -class SwListShell: public SwBaseShell +class SwListShell : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_LISTSHELL) @@ -31,10 +31,10 @@ private: static void InitInterface_Impl(); public: - SwListShell(SwView &rView); + SwListShell(SwView& rView); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest&); + void GetState(SfxItemSet&); }; #endif diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx index 6c1ce2c4dbdc..afc6fe56c568 100644 --- a/sw/source/uibase/inc/macassgn.hxx +++ b/sw/source/uibase/inc/macassgn.hxx @@ -38,9 +38,9 @@ enum DlgEventType class SwMacroAssignDlg { public: - static SfxEventNamesItem AddEvents( DlgEventType eType ); + static SfxEventNamesItem AddEvents(DlgEventType eType); static bool INetFormatDlg(weld::Window* pParent, SwWrtShell& rSh, - std::unique_ptr<SvxMacroItem>& rpINetItem ); + std::unique_ptr<SvxMacroItem>& rpINetItem); }; #endif diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index c4cdf253c620..e6f9f0cc7888 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -41,9 +41,7 @@ class IMailDispatcherListener; must not be shared among different client threads. Instead each client thread should create an own instance of this class. */ -class SW_DLLPUBLIC MailDispatcher - : public salhelper::SimpleReferenceObject - , private ::osl::Thread +class SW_DLLPUBLIC MailDispatcher : public salhelper::SimpleReferenceObject, private ::osl::Thread { public: // bringing operator new/delete into scope @@ -60,7 +58,7 @@ public: @throws css::uno::RuntimeException on errors during construction of an instance of this class. */ - MailDispatcher(css::uno::Reference< css::mail::XSmtpService> const & xMailService); + MailDispatcher(css::uno::Reference<css::mail::XSmtpService> const& xMailService); /** Shutdown the mail dispatcher. Every mail messages @@ -76,12 +74,12 @@ public: @param xMailMessage [in] a mail message that should be send. */ - void enqueueMailMessage(css::uno::Reference< css::mail::XMailMessage> const & xMailMessage); + void enqueueMailMessage(css::uno::Reference<css::mail::XMailMessage> const& xMailMessage); /** Dequeues a mail message. This enables the caller to remove attachments when sending mails is to be cancelled. */ - css::uno::Reference< css::mail::XMailMessage> dequeueMailMessage(); + css::uno::Reference<css::mail::XMailMessage> dequeueMailMessage(); /** Start sending mail messages asynchronously. A client may register @@ -130,20 +128,20 @@ public: /** * Register a listener for mail dispatcher events */ - void addListener(::rtl::Reference<IMailDispatcherListener> const & listener); + void addListener(::rtl::Reference<IMailDispatcherListener> const& listener); protected: virtual void SAL_CALL run() override; virtual void SAL_CALL onTerminated() override; private: - std::vector< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); - void sendMailMessageNotifyListener(css::uno::Reference< css::mail::XMailMessage> const & message); + std::vector<::rtl::Reference<IMailDispatcherListener>> cloneListener(); + void sendMailMessageNotifyListener(css::uno::Reference<css::mail::XMailMessage> const& message); private: - css::uno::Reference< css::mail::XSmtpService> m_xMailserver; - std::list< css::uno::Reference< css::mail::XMailMessage > > m_aXMessageList; - std::vector< ::rtl::Reference<IMailDispatcherListener> > m_aListenerVector; + css::uno::Reference<css::mail::XSmtpService> m_xMailserver; + std::list<css::uno::Reference<css::mail::XMailMessage>> m_aXMessageList; + std::vector<::rtl::Reference<IMailDispatcherListener>> m_aListenerVector; ::osl::Mutex m_aMessageContainerMutex; ::osl::Mutex m_aListenerContainerMutex; ::osl::Mutex m_aThreadStatusMutex; diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx index b67f903f01ee..cd2204f82fb7 100644 --- a/sw/source/uibase/inc/mediash.hxx +++ b/sw/source/uibase/inc/mediash.hxx @@ -25,7 +25,7 @@ #include "basesh.hxx" #include <shellid.hxx> -class SwMediaShell: public SwBaseShell +class SwMediaShell : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_MEDIASHELL) @@ -35,10 +35,10 @@ private: static void InitInterface_Impl(); public: - void ExecMedia(SfxRequest const &); - void GetMediaState(SfxItemSet &); + void ExecMedia(SfxRequest const&); + void GetMediaState(SfxItemSet&); - SwMediaShell(SwView &rView); + SwMediaShell(SwView& rView); }; #endif diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 11ca8c726455..765c3d603947 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -26,11 +26,12 @@ class SwMergeTableDlg : public weld::GenericDialogController bool& m_rMergePrev; std::unique_ptr<weld::RadioButton> m_xMergePrevRB; + private: void Apply(); public: - SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev); + SwMergeTableDlg(weld::Window* pParent, bool& rWithPrev); virtual short run() override; }; diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 6edca05cebc2..5027e216e5e8 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -28,14 +28,14 @@ class SwTOXMgr; class SwMultiTOXMarkDlg : public weld::GenericDialogController { DECL_LINK(SelectHdl, weld::TreeView&, void); - SwTOXMgr& m_rMgr; - sal_uInt16 m_nPos; + SwTOXMgr& m_rMgr; + sal_uInt16 m_nPos; std::unique_ptr<weld::Label> m_xTextFT; std::unique_ptr<weld::TreeView> m_xTOXLB; public: - SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr); + SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr); virtual ~SwMultiTOXMarkDlg() override; virtual short run() override; }; diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx index 4bc26ecb17de..f6c86a41b400 100644 --- a/sw/source/uibase/inc/navsh.hxx +++ b/sw/source/uibase/inc/navsh.hxx @@ -15,7 +15,7 @@ #include "basesh.hxx" #include <shellid.hxx> -class SwNavigationShell: public SwBaseShell +class SwNavigationShell : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL) @@ -25,10 +25,10 @@ private: static void InitInterface_Impl(); public: - SwNavigationShell(SwView &rView); + SwNavigationShell(SwView& rView); - void GetState(SfxItemSet &); - void Execute(SfxRequest const &); + void GetState(SfxItemSet&); + void Execute(SfxRequest const&); }; #endif diff --git a/sw/source/uibase/inc/olesh.hxx b/sw/source/uibase/inc/olesh.hxx index 30979029ed16..4f21b2a0396a 100644 --- a/sw/source/uibase/inc/olesh.hxx +++ b/sw/source/uibase/inc/olesh.hxx @@ -21,7 +21,7 @@ #include "frmsh.hxx" -class SwOleShell: public SwFrameShell +class SwOleShell : public SwFrameShell { public: SFX_DECL_INTERFACE(SW_OLESHELL) @@ -31,7 +31,7 @@ private: static void InitInterface_Impl(); public: - SwOleShell(SwView &rView); + SwOleShell(SwView& rView); }; #endif diff --git a/sw/source/uibase/inc/pardlg.hxx b/sw/source/uibase/inc/pardlg.hxx index c417c7223906..ac8d0da9d784 100644 --- a/sw/source/uibase/inc/pardlg.hxx +++ b/sw/source/uibase/inc/pardlg.hxx @@ -20,8 +20,8 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_PARDLG_HXX //DialogModes: -#define DLG_STD 0 -#define DLG_ENVELOP 2 +#define DLG_STD 0 +#define DLG_ENVELOP 2 #endif diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index 58439eb89d38..f1d66dbab63f 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -25,7 +25,7 @@ class SwWrtShell; class SwTableHeightDlg : public weld::GenericDialogController { - SwWrtShell &m_rSh; + SwWrtShell& m_rSh; std::unique_ptr<weld::MetricSpinButton> m_xHeightEdit; std::unique_ptr<weld::CheckButton> m_xAutoHeightCB; @@ -34,7 +34,7 @@ private: void Apply(); public: - SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS); + SwTableHeightDlg(weld::Window* pParent, SwWrtShell& rS); virtual short run() override; }; diff --git a/sw/source/uibase/inc/sharedconnection.hxx b/sw/source/uibase/inc/sharedconnection.hxx index 138cbf51e107..58d5dfcfc3cb 100644 --- a/sw/source/uibase/inc/sharedconnection.hxx +++ b/sw/source/uibase/inc/sharedconnection.hxx @@ -23,7 +23,7 @@ #include <unotools/sharedunocomponent.hxx> #include <com/sun/star/sdbc/XConnection.hpp> -typedef ::utl::SharedUNOComponent< css::sdbc::XConnection > SharedConnection; +typedef ::utl::SharedUNOComponent<css::sdbc::XConnection> SharedConnection; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index ac75e72c691c..4fc49e572e87 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -33,13 +33,13 @@ private: std::unique_ptr<weld::RadioButton> m_xBoxAttrCopyNoParaRB; std::unique_ptr<weld::RadioButton> m_xBorderCopyRB; - SwWrtShell &rShell; + SwWrtShell& rShell; SplitTable_HeadlineOption m_nSplit; void Apply(); public: - SwSplitTableDlg(weld::Window *pParent, SwWrtShell &rSh); + SwSplitTableDlg(weld::Window* pParent, SwWrtShell& rSh); virtual short run() override { diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index b4828dcf5e0a..e47a974e40ee 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -64,23 +64,23 @@ class SwSortDlg : public weld::GenericDialogController OUString aRowText; OUString aNumericText; - SwWrtShell &rSh; + SwWrtShell& rSh; std::unique_ptr<CollatorResource> m_xColRes; sal_uInt16 nX; sal_uInt16 nY; void Apply(); - sal_Unicode GetDelimChar() const; + sal_Unicode GetDelimChar() const; DECL_LINK(CheckHdl, weld::ToggleButton&, void); - DECL_LINK(DelimHdl, weld::ToggleButton&, void ); + DECL_LINK(DelimHdl, weld::ToggleButton&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(weld::ComboBox const*); - DECL_LINK(DelimCharHdl, weld::Button&,void); + DECL_LINK(DelimCharHdl, weld::Button&, void); public: - SwSortDlg(weld::Window * pParent, SwWrtShell &rSh); + SwSortDlg(weld::Window* pParent, SwWrtShell& rSh); virtual short run() override; }; diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 3d4af57d89d1..1b0dd0917b18 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -30,6 +30,7 @@ class SwTableTabDlg : public SfxTabDialogController SwWrtShell* pShell; virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; + public: SwTableTabDlg(weld::Window* pParent, const SfxItemSet* pItemSet, SwWrtShell* pSh); }; diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx index 300688b92994..3d0eee08c6ea 100644 --- a/sw/source/uibase/inc/tblnumfm.hxx +++ b/sw/source/uibase/inc/tblnumfm.hxx @@ -21,13 +21,16 @@ #include <sfx2/basedlgs.hxx> -namespace weld { class Window; } +namespace weld +{ +class Window; +} class SfxItemSet; class SwNumFormatDlg : public SfxSingleTabDialogController { public: - SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet); + SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index 2679c00176ec..d3e655eae426 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -14,20 +14,23 @@ #include <fmtpdsc.hxx> -namespace vcl { class Window; } +namespace vcl +{ +class Window; +} class SwWrtShell; class SwPageDesc; class SwTitlePageDlg : public SfxDialogController { private: - SwWrtShell *mpSh; + SwWrtShell* mpSh; std::unique_ptr<const SwFormatPageDesc> mpPageFormatDesc; - SwPageDesc *mpTitleDesc; - const SwPageDesc *mpIndexDesc; - const SwPageDesc *mpNormalDesc; + SwPageDesc* mpTitleDesc; + const SwPageDesc* mpIndexDesc; + const SwPageDesc* mpNormalDesc; std::unique_ptr<weld::RadioButton> m_xUseExistingPagesRB; std::unique_ptr<weld::SpinButton> m_xPageCountNF; @@ -52,8 +55,9 @@ private: DECL_LINK(SetPageNumberHdl, weld::ToggleButton&, void); DECL_LINK(ValueChangeHdl, weld::SpinButton&, void); DECL_LINK(StartPageHdl, weld::ToggleButton&, void); + public: - SwTitlePageDlg(weld::Window *pParent); + SwTitlePageDlg(weld::Window* pParent); virtual ~SwTitlePageDlg() override; }; diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx index 80fa0fa61ce5..cf089fae618d 100644 --- a/sw/source/uibase/inc/tmplctrl.hxx +++ b/sw/source/uibase/inc/tmplctrl.hxx @@ -24,19 +24,20 @@ class SwTemplateControl : public SfxStatusBarControl { protected: - virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Command(const CommandEvent& rCEvt) override; + public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); - SwTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SwTemplateControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SwTemplateControl() override; private: - OUString sTemplate; + OUString sTemplate; }; #endif diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx index f3764ad9fb2e..8820a769b5c9 100644 --- a/sw/source/uibase/inc/uiborder.hxx +++ b/sw/source/uibase/inc/uiborder.hxx @@ -25,11 +25,10 @@ class SwBorderDlg : public SfxSingleTabDialogController { public: - - // nType may be: - // SW_BORDER_MODE_PARA - // SW_BORDER_MODE_TABLE - // SW_BORDER_MODE_FRAME + // nType may be: + // SW_BORDER_MODE_PARA + // SW_BORDER_MODE_TABLE + // SW_BORDER_MODE_FRAME SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes nType); virtual ~SwBorderDlg() override; diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx index dfce5359f1e3..2d73b1232e55 100644 --- a/sw/source/uibase/inc/wformsh.hxx +++ b/sw/source/uibase/inc/wformsh.hxx @@ -24,7 +24,7 @@ class SwWebDrawFormShell : public SwDrawFormShell { public: - SwWebDrawFormShell(SwView &rShell); + SwWebDrawFormShell(SwView& rShell); virtual ~SwWebDrawFormShell() override; SFX_DECL_INTERFACE(SW_WEBDRAWFORMSHELL) diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx index 15cd8a8b7a63..e03a49a635e8 100644 --- a/sw/source/uibase/inc/wfrmsh.hxx +++ b/sw/source/uibase/inc/wfrmsh.hxx @@ -22,7 +22,7 @@ #include "frmsh.hxx" -class SwWebFrameShell: public SwFrameShell +class SwWebFrameShell : public SwFrameShell { public: SFX_DECL_INTERFACE(SW_WEBFRAMESHELL) @@ -32,7 +32,7 @@ private: static void InitInterface_Impl(); public: - SwWebFrameShell(SwView &rView); + SwWebFrameShell(SwView& rView); virtual ~SwWebFrameShell() override; }; diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx index 65987a423958..645694628eec 100644 --- a/sw/source/uibase/inc/wgrfsh.hxx +++ b/sw/source/uibase/inc/wgrfsh.hxx @@ -21,11 +21,11 @@ #include "grfsh.hxx" -class SwWebGrfShell: public SwGrfShell +class SwWebGrfShell : public SwGrfShell { public: - SwWebGrfShell(SwView &rShell); - virtual ~SwWebGrfShell() override; + SwWebGrfShell(SwView& rShell); + virtual ~SwWebGrfShell() override; SFX_DECL_INTERFACE(SW_WEBGRFSHELL) diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx index f3a1179a6f60..be6ca6310996 100644 --- a/sw/source/uibase/inc/wlistsh.hxx +++ b/sw/source/uibase/inc/wlistsh.hxx @@ -21,7 +21,7 @@ #include "listsh.hxx" -class SwWebListShell: public SwListShell +class SwWebListShell : public SwListShell { public: SFX_DECL_INTERFACE(SW_WEBLISTSHELL) @@ -31,8 +31,7 @@ private: static void InitInterface_Impl(); public: - - SwWebListShell(SwView &rView); + SwWebListShell(SwView& rView); virtual ~SwWebListShell() override; }; diff --git a/sw/source/uibase/inc/wolesh.hxx b/sw/source/uibase/inc/wolesh.hxx index 017768aace59..90c51257a206 100644 --- a/sw/source/uibase/inc/wolesh.hxx +++ b/sw/source/uibase/inc/wolesh.hxx @@ -21,7 +21,7 @@ #include "olesh.hxx" -class SwWebOleShell: public SwOleShell +class SwWebOleShell : public SwOleShell { public: SFX_DECL_INTERFACE(SW_WEBOLESHELL) @@ -31,7 +31,7 @@ private: static void InitInterface_Impl(); public: - SwWebOleShell(SwView &rView); + SwWebOleShell(SwView& rView); virtual ~SwWebOleShell() override; }; diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx index 7b6f8620453e..d8ecc4a5963d 100644 --- a/sw/source/uibase/inc/wordcountctrl.hxx +++ b/sw/source/uibase/inc/wordcountctrl.hxx @@ -27,9 +27,8 @@ public: SwWordCountStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SwWordCountStatusBarControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; #endif diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx index 0411750194a5..1ded54d1d552 100644 --- a/sw/source/uibase/inc/wtabsh.hxx +++ b/sw/source/uibase/inc/wtabsh.hxx @@ -21,7 +21,7 @@ #include "tabsh.hxx" -class SwWebTableShell: public SwTableShell +class SwWebTableShell : public SwTableShell { public: SFX_DECL_INTERFACE(SW_WEBTABSHELL) @@ -31,7 +31,7 @@ private: static void InitInterface_Impl(); public: - SwWebTableShell(SwView &rView); + SwWebTableShell(SwView& rView); virtual ~SwWebTableShell() override; }; diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx index 7924fdf903d9..264500046677 100644 --- a/sw/source/uibase/inc/wtextsh.hxx +++ b/sw/source/uibase/inc/wtextsh.hxx @@ -22,7 +22,7 @@ #include "textsh.hxx" -class SwWebTextShell: public SwTextShell +class SwWebTextShell : public SwTextShell { public: SFX_DECL_INTERFACE(SW_WEBTEXTSHELL) @@ -32,7 +32,7 @@ private: static void InitInterface_Impl(); public: - SwWebTextShell(SwView &rView); + SwWebTextShell(SwView& rView); virtual ~SwWebTextShell() override; }; diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx index cfd63881dd7a..9ac5f79499c7 100644 --- a/sw/source/uibase/inc/wview.hxx +++ b/sw/source/uibase/inc/wview.hxx @@ -22,10 +22,10 @@ #include <swdllapi.h> #include <view.hxx> -class SW_DLLPUBLIC SwWebView: public SwView +class SW_DLLPUBLIC SwWebView : public SwView { protected: - virtual void SelectShell() override; + virtual void SelectShell() override; public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx index d0802989a5a1..e05ad40e76a9 100644 --- a/sw/source/uibase/inc/zoomctrl.hxx +++ b/sw/source/uibase/inc/zoomctrl.hxx @@ -24,18 +24,18 @@ class SwZoomControl : public SvxZoomStatusBarControl { private: - OUString sPreviewZoom; + OUString sPreviewZoom; + public: - virtual void Command( const CommandEvent& rCEvt ) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual void Command(const CommandEvent& rCEvt) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); - SwZoomControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SwZoomControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SwZoomControl() override; - }; #endif diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index f5df02d1b307..5136bed3d4c1 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -38,14 +38,13 @@ SwNumberingTypeListBox::SwNumberingTypeListBox(std::unique_ptr<weld::ComboBox> p : m_xWidget(std::move(pWidget)) , m_xImpl(new SwNumberingTypeListBox_Impl) { - uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); - uno::Reference<text::XDefaultNumberingProvider> xDefNum = text::DefaultNumberingProvider::create(xContext); + uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); + uno::Reference<text::XDefaultNumberingProvider> xDefNum + = text::DefaultNumberingProvider::create(xContext); m_xImpl->xInfo.set(xDefNum, uno::UNO_QUERY); } -SwNumberingTypeListBox::~SwNumberingTypeListBox() -{ -} +SwNumberingTypeListBox::~SwNumberingTypeListBox() {} void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) { @@ -57,36 +56,36 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) aTypes = m_xImpl->xInfo->getSupportedNumberingTypes(); } - for(size_t i = 0; i < SvxNumberingTypeTable::Count(); i++) + for (size_t i = 0; i < SvxNumberingTypeTable::Count(); i++) { sal_IntPtr nValue = SvxNumberingTypeTable::GetValue(i); bool bInsert = true; int nPos = -1; - switch(nValue) + switch (nValue) { - case style::NumberingType::NUMBER_NONE: + case style::NumberingType::NUMBER_NONE: bInsert = bool(nTypeFlags & SwInsertNumTypes::NoNumbering); nPos = 0; break; - case style::NumberingType::CHAR_SPECIAL: + case style::NumberingType::CHAR_SPECIAL: bInsert = false; break; - case style::NumberingType::PAGE_DESCRIPTOR: + case style::NumberingType::PAGE_DESCRIPTOR: bInsert = false; break; - case style::NumberingType::BITMAP: + case style::NumberingType::BITMAP: bInsert = false; break; - case style::NumberingType::BITMAP | LINK_TOKEN: + case style::NumberingType::BITMAP | LINK_TOKEN: bInsert = false; break; default: - if (nValue > style::NumberingType::CHARS_LOWER_LETTER_N) + if (nValue > style::NumberingType::CHARS_LOWER_LETTER_N) { // Insert only if offered by i18n framework per configuration. bInsert = std::find(aTypes.begin(), aTypes.end(), nValue) != aTypes.end(); @@ -107,7 +106,8 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) { if (m_xWidget->find_id(OUString::number(nCurrent)) == -1) { - m_xWidget->append(OUString::number(nCurrent), m_xImpl->xInfo->getNumberingIdentifier(nCurrent)); + m_xWidget->append(OUString::number(nCurrent), + m_xImpl->xInfo->getNumberingIdentifier(nCurrent)); } } } diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx index 16625a4df026..03af3b70c05f 100644 --- a/sw/source/uibase/ribbar/conarc.cxx +++ b/sw/source/uibase/ribbar/conarc.cxx @@ -28,11 +28,12 @@ #include <conarc.hxx> ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) - : SwDrawBase(pWrtShell, pEditWin, pSwView), m_nButtonUpCount(0) + : SwDrawBase(pWrtShell, pEditWin, pSwView) + , m_nButtonUpCount(0) { } -bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt ) +bool ConstArc::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = SwDrawBase::MouseButtonDown(rMEvt); if (bReturn && !m_nButtonUpCount) @@ -40,7 +41,7 @@ bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt ) return bReturn; } -bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) +bool ConstArc::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = false; @@ -53,9 +54,10 @@ bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt ) bReturn = true; } else - { m_nButtonUpCount++; + { + m_nButtonUpCount++; - if (m_nButtonUpCount == 3) // Generating of circular arc finished + if (m_nButtonUpCount == 3) // Generating of circular arc finished { SwDrawBase::MouseButtonUp(rMEvt); m_nButtonUpCount = 0; diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx index a70583fda5dc..4758934a34e9 100644 --- a/sw/source/uibase/ribbar/dselect.cxx +++ b/sw/source/uibase/ribbar/dselect.cxx @@ -26,8 +26,8 @@ #include <drawbase.hxx> #include <dselect.hxx> -DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) : - SwDrawBase(pWrtShell, pEditWin, pSwView) +DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) + : SwDrawBase(pWrtShell, pEditWin, pSwView) { m_bCreateObj = false; } @@ -35,7 +35,7 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* void DrawSelection::Activate(const sal_uInt16 nSlotId) { m_pWin->SetSdrDrawMode(OBJ_NONE); - m_pWin->SetObjectSelect( true ); + m_pWin->SetObjectSelect(true); SwDrawBase::Activate(nSlotId); m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW); diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index b5b9021cc1ac..5b5d071bee8d 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -21,27 +21,25 @@ SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell) -void SwNavigationShell::InitInterface_Impl() -{ -} +void SwNavigationShell::InitInterface_Impl() {} -SwNavigationShell::SwNavigationShell(SwView &_rView) - : SwBaseShell( _rView ) +SwNavigationShell::SwNavigationShell(SwView& _rView) + : SwBaseShell(_rView) { SetName("Navigation"); } -void SwNavigationShell::Execute(SfxRequest const &rReq) +void SwNavigationShell::Execute(SfxRequest const& rReq) { - SwWrtShell *pSh = &GetShell(); + SwWrtShell* pSh = &GetShell(); SdrView* pSdrView = pSh->GetDrawView(); - const SfxItemSet *pArgs = rReq.GetArgs(); + const SfxItemSet* pArgs = rReq.GetArgs(); const sal_uInt16 nSlotId = rReq.GetSlot(); bool bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(false); SwNavigationMgr& aSwNavigationMgr = pSh->GetNavigationMgr(); const SfxPoolItem* pItem; - if(pArgs) + if (pArgs) pArgs->GetItemState(nSlotId, false, &pItem); switch (nSlotId) { @@ -63,15 +61,15 @@ void SwNavigationShell::Execute(SfxRequest const &rReq) // determine if the buttons should be enabled/disabled -void SwNavigationShell::GetState(SfxItemSet &rSet) +void SwNavigationShell::GetState(SfxItemSet& rSet) { - SwWrtShell *pSh = &GetShell(); - SfxWhichIter aIter( rSet ); + SwWrtShell* pSh = &GetShell(); + SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); SwNavigationMgr& aNavigationMgr = pSh->GetNavigationMgr(); - while( nWhich ) + while (nWhich) { - switch( nWhich ) + switch (nWhich) { case FN_NAVIGATION_BACK: if (!aNavigationMgr.backEnabled()) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index 140c948721dc..f4e35291b7cc 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -24,8 +24,8 @@ class PageColumnPopup; -namespace sw::sidebar { - +namespace sw::sidebar +{ class PageColumnControl final : public WeldToolbarPopup { public: @@ -43,10 +43,10 @@ private: rtl::Reference<PageColumnPopup> m_xControl; - static void ExecuteColumnChange( const sal_uInt16 nColumnType ); + static void ExecuteColumnChange(const sal_uInt16 nColumnType); - DECL_LINK( ColumnButtonClickHdl_Impl, weld::Button&, void ); - DECL_LINK( MoreButtonClickHdl_Impl, weld::Button&, void ); + DECL_LINK(ColumnButtonClickHdl_Impl, weld::Button&, void); + DECL_LINK(MoreButtonClickHdl_Impl, weld::Button&, void); }; } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index be43d0900b8a..bbeaa1b198d2 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -26,12 +26,15 @@ #include <vector> -namespace svx::sidebar { class ValueSetWithTextControl; } +namespace svx::sidebar +{ +class ValueSetWithTextControl; +} class PageSizePopup; class ValueSet; -namespace sw::sidebar { - +namespace sw::sidebar +{ class PageSizeControl final : public WeldToolbarPopup { public: @@ -47,9 +50,9 @@ private: std::unique_ptr<weld::CustomWeld> mxSizeValueSetWin; rtl::Reference<PageSizePopup> mxControl; - std::vector< Paper > maPaperList; + std::vector<Paper> maPaperList; - static void ExecuteSizeChange( const Paper ePaper ); + static void ExecuteSizeChange(const Paper ePaper); DECL_LINK(ImplSizeHdl, ValueSet*, void); DECL_LINK(MoreButtonClickHdl_Impl, weld::Button&, void); diff --git a/sw/source/uibase/uno/unodefaults.cxx b/sw/source/uibase/uno/unodefaults.cxx index 135bf88e80ec..01e10aaaae5e 100644 --- a/sw/source/uibase/uno/unodefaults.cxx +++ b/sw/source/uibase/uno/unodefaults.cxx @@ -24,16 +24,15 @@ #include <IDocumentDrawModelAccess.hxx> SwSvxUnoDrawPool::SwSvxUnoDrawPool(SwDoc& rDoc) - : SvxUnoDrawPool(rDoc.getIDocumentDrawModelAccess().GetDrawModel(), SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER) + : SvxUnoDrawPool(rDoc.getIDocumentDrawModelAccess().GetDrawModel(), + SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER) , m_rDoc(rDoc) { } -SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw() -{ -} +SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw() {} -SfxItemPool* SwSvxUnoDrawPool::getModelPool( bool /*bReadOnly*/ ) throw() +SfxItemPool* SwSvxUnoDrawPool::getModelPool(bool /*bReadOnly*/) throw() { // DVO, OD 01.10.2003 #i18732# - return item pool of writer document; // it contains draw model item pool as secondary pool. diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx index ba218940b6d0..14b892f94d22 100644 --- a/sw/source/uibase/uno/unodefaults.hxx +++ b/sw/source/uibase/uno/unodefaults.hxx @@ -26,11 +26,12 @@ class SwDoc; class SwSvxUnoDrawPool : public SvxUnoDrawPool { SwDoc& m_rDoc; + public: SwSvxUnoDrawPool(SwDoc& rDoc); virtual ~SwSvxUnoDrawPool() throw() override; - virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() override; + virtual SfxItemPool* getModelPool(bool bReadOnly) throw() override; }; #endif diff --git a/sw/source/uibase/utlui/gotodlg.cxx b/sw/source/uibase/utlui/gotodlg.cxx index 63e7c424ca39..0c8387ab267d 100644 --- a/sw/source/uibase/utlui/gotodlg.cxx +++ b/sw/source/uibase/utlui/gotodlg.cxx @@ -36,7 +36,7 @@ SwGotoPageDlg::SwGotoPageDlg(weld::Window* pParent, SfxBindings* _pBindings) { sal_uInt16 nTotalPage = GetPageInfo(); - if(nTotalPage) + if (nTotalPage) { OUString sStr = mxPageNumberLbl->get_label(); mxPageNumberLbl->set_label(sStr.replaceFirst("$1", OUString::number(nTotalPage))); @@ -55,21 +55,21 @@ IMPL_LINK_NOARG(SwGotoPageDlg, PageModifiedHdl, weld::Entry&, void) if (page_value <= 0) mxMtrPageCtrl->set_text(OUString::number(1)); - else if(page_value > mnMaxPageCnt) + else if (page_value > mnMaxPageCnt) mxMtrPageCtrl->set_text(OUString::number(mnMaxPageCnt)); mxMtrPageCtrl->set_position(-1); } } -SwView* SwGotoPageDlg::GetCreateView() const +SwView* SwGotoPageDlg::GetCreateView() const { - if(!m_pCreateView) + if (!m_pCreateView) { SwView* pView = SwModule::GetFirstView(); - while(pView) + while (pView) { - if(&pView->GetViewFrame()->GetBindings() == m_rBindings) + if (&pView->GetViewFrame()->GetBindings() == m_rBindings) { const_cast<SwGotoPageDlg*>(this)->m_pCreateView = pView; break; @@ -85,8 +85,8 @@ SwView* SwGotoPageDlg::GetCreateView() const sal_uInt16 SwGotoPageDlg::GetPageInfo() { - SwView *pView = GetCreateView(); - SwWrtShell *pSh = pView ? &pView->GetWrtShell() : nullptr; + SwView* pView = GetCreateView(); + SwWrtShell* pSh = pView ? &pView->GetWrtShell() : nullptr; mxMtrPageCtrl->set_text(OUString::number(1)); if (pSh) { diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index 2cefdc4ff7bc..9c704f9cb029 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -48,8 +48,8 @@ void SwPercentField::SetRefValue(int nValue) void SwPercentField::ShowPercent(bool bPercent) { - if ((bPercent && m_pField->get_unit() == FieldUnit::PERCENT) || - (!bPercent && m_pField->get_unit() != FieldUnit::PERCENT)) + if ((bPercent && m_pField->get_unit() == FieldUnit::PERCENT) + || (!bPercent && m_pField->get_unit() != FieldUnit::PERCENT)) return; int nOldValue; @@ -112,9 +112,10 @@ void SwPercentField::set_value(int nNewValue, FieldUnit eInUnit) { // Overwrite output value, do not restore later int nPercent, nCurrentWidth; - if(eInUnit == FieldUnit::TWIP) + if (eInUnit == FieldUnit::TWIP) { - nCurrentWidth = vcl::ConvertValue(nNewValue, 0, nOldDigits, FieldUnit::TWIP, FieldUnit::TWIP); + nCurrentWidth + = vcl::ConvertValue(nNewValue, 0, nOldDigits, FieldUnit::TWIP, FieldUnit::TWIP); } else { @@ -168,7 +169,7 @@ int SwPercentField::DenormalizePercent(int nValue) else { int nFactor = ImpPower10(nOldDigits); - nValue = ((nValue+(nFactor/2)) / nFactor); + nValue = ((nValue + (nFactor / 2)) / nFactor); } return nValue; } @@ -177,7 +178,7 @@ int SwPercentField::ImpPower10(sal_uInt16 n) { int nValue = 1; - for (sal_uInt16 i=0; i < n; ++i) + for (sal_uInt16 i = 0; i < n; ++i) nValue *= 10; return nValue; @@ -193,9 +194,8 @@ int SwPercentField::GetRealValue(FieldUnit eOutUnit) int SwPercentField::Convert(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit) { - if (eInUnit == eOutUnit || - (eInUnit == FieldUnit::NONE && eOutUnit == m_pField->get_unit()) || - (eOutUnit == FieldUnit::NONE && eInUnit == m_pField->get_unit())) + if (eInUnit == eOutUnit || (eInUnit == FieldUnit::NONE && eOutUnit == m_pField->get_unit()) + || (eOutUnit == FieldUnit::NONE && eInUnit == m_pField->get_unit())) return nValue; if (eInUnit == FieldUnit::PERCENT) @@ -206,7 +206,8 @@ int SwPercentField::Convert(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit) if (eOutUnit == FieldUnit::TWIP) // Only convert if necessary return NormalizePercent(nTwipValue); else - return vcl::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FieldUnit::TWIP, eOutUnit); + return vcl::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FieldUnit::TWIP, + eOutUnit); } if (eOutUnit == FieldUnit::PERCENT) @@ -215,7 +216,7 @@ int SwPercentField::Convert(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit) int nCurrentWidth; nValue = DenormalizePercent(nValue); - if (eInUnit == FieldUnit::TWIP) // Only convert if necessary + if (eInUnit == FieldUnit::TWIP) // Only convert if necessary nCurrentWidth = nValue; else nCurrentWidth = vcl::ConvertValue(nValue, 0, nOldDigits, eInUnit, FieldUnit::TWIP); |