[Libreoffice-commits] core.git: solenv/clang-format sw/inc sw/qa sw/source
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 19 00:34:33 UTC 2020
solenv/clang-format/excludelist | 202 ----------
sw/inc/HandleAnchorNodeChg.hxx | 10
sw/inc/IDocumentChartDataProviderAccess.hxx | 9
sw/inc/IDocumentDeviceAccess.hxx | 21 -
sw/inc/IDocumentDrawModelAccess.hxx | 10
sw/inc/IDocumentSettingAccess.hxx | 42 +-
sw/inc/IDocumentState.hxx | 4
sw/inc/IDocumentStatistics.hxx | 7
sw/inc/IDocumentStylePoolAccess.hxx | 21 -
sw/inc/IDocumentTimerAccess.hxx | 2
sw/inc/IGrammarContact.hxx | 11
sw/inc/IShellCursorSupplier.hxx | 10
sw/inc/PageColumnPopup.hxx | 5
sw/inc/PageMarginPopup.hxx | 4
sw/inc/PageOrientationPopup.hxx | 4
sw/inc/PageSizePopup.hxx | 5
sw/inc/SidebarWindowsTypes.hxx | 10
sw/inc/SwCapObjType.hxx | 5
sw/inc/SwDocIdle.hxx | 11
sw/inc/SwGetPoolIdFromName.hxx | 13
sw/inc/SwNodeNum.hxx | 30 -
sw/inc/SwNumberTree.hxx | 85 +---
sw/inc/SwNumberTreeTypes.hxx | 4
sw/inc/SwRewriter.hxx | 4
sw/inc/SwSmartTagMgr.hxx | 6
sw/inc/ToxWhitespaceStripper.hxx | 12
sw/inc/UndoParagraphSignature.hxx | 13
sw/inc/checkit.hxx | 7
sw/inc/colwd.hxx | 4
sw/inc/dbgoutsw.hxx | 58 +-
sw/inc/dobjfac.hxx | 2
sw/inc/docfac.hxx | 4
sw/inc/docfunc.hxx | 50 +-
sw/inc/drawdoc.hxx | 4
sw/inc/flddropdown.hxx | 34 -
sw/inc/hintids.hxx | 422 ++++++++++-----------
sw/inc/pausethreadstarting.hxx | 12
sw/inc/prtopt.hxx | 6
sw/inc/sw_primitivetypes2d.hxx | 8
sw/inc/swcli.hxx | 6
sw/inc/swcommands.h | 3
sw/inc/swddetbl.hxx | 12
sw/inc/swdll.hxx | 9
sw/inc/swdllapi.h | 4
sw/inc/toxe.hxx | 2
sw/inc/unoprnms.hxx | 3
sw/qa/core/test_ToxMiscTest.cxx | 7
sw/qa/core/test_ToxWhitespaceStripper.cxx | 28 -
sw/qa/extras/htmlexport/htmlexport.cxx | 113 +++--
sw/qa/extras/ooxmlexport/ooxmlencryption.cxx | 5
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 11
sw/source/core/access/accheaderfooter.hxx | 22 -
sw/source/core/attr/fmtfollowtextflow.cxx | 2
sw/source/core/bastyp/SwSmartTagMgr.cxx | 24 -
sw/source/core/bastyp/checkit.cxx | 2
sw/source/core/bastyp/proofreadingiterator.cxx | 21 -
sw/source/core/bastyp/swtypes.cxx | 14
sw/source/core/crsr/BlockCursor.cxx | 9
sw/source/core/doc/swstylemanager.hxx | 2
sw/source/core/docnode/cancellablejob.hxx | 8
sw/source/core/docnode/ndsect.hxx | 3
sw/source/core/docnode/pausethreadstarting.cxx | 8
sw/source/core/docnode/swthreadjoiner.cxx | 17
sw/source/core/edit/edfldexp.cxx | 15
sw/source/core/inc/DocumentDeviceManager.hxx | 29 -
sw/source/core/inc/DocumentDrawModelManager.hxx | 12
sw/source/core/inc/DocumentExternalDataManager.hxx | 10
sw/source/core/inc/DocumentStatisticsManager.hxx | 22 -
sw/source/core/inc/DocumentTimerManager.hxx | 8
sw/source/core/inc/SwGrammarMarkUp.hxx | 23 -
sw/source/core/inc/SwUndoTOXChange.hxx | 8
sw/source/core/inc/UndoBookmark.hxx | 49 +-
sw/source/core/inc/UndoDraw.hxx | 43 +-
sw/source/core/inc/colfrm.hxx | 6
sw/source/core/inc/docedt.hxx | 4
sw/source/core/inc/docredln.hxx | 2
sw/source/core/inc/environmentofanchoredobject.hxx | 132 +++---
sw/source/core/inc/fefly.hxx | 3
sw/source/core/inc/fieldhint.hxx | 6
sw/source/core/inc/node2lay.hxx | 12
sw/source/core/inc/noteurl.hxx | 2
sw/source/core/inc/paintfrm.hxx | 7
sw/source/core/inc/ptqueue.hxx | 6
sw/source/core/inc/rowfrm.hxx | 41 +-
sw/source/core/inc/swselectionlist.hxx | 10
sw/source/core/inc/swthreadjoiner.hxx | 14
sw/source/core/inc/unoevent.hxx | 22 -
sw/source/core/inc/visiturl.hxx | 5
sw/source/core/layout/flypos.cxx | 15
sw/source/core/text/noteurl.cxx | 2
sw/source/core/text/porref.hxx | 16
sw/source/core/text/portox.hxx | 16
sw/source/core/text/txtcache.hxx | 13
sw/source/core/txtnode/chrfmt.cxx | 1
sw/source/core/undo/SwRewriter.cxx | 14
sw/source/core/view/vprint.hxx | 1
sw/source/filter/ascii/wrtasc.hxx | 4
sw/source/filter/docx/swdocxreader.hxx | 6
sw/source/filter/html/css1atr.hxx | 3
sw/source/filter/html/css1kywd.hxx | 1
sw/source/filter/html/htmlfld.hxx | 1
sw/source/filter/html/htmlform.hxx | 8
sw/source/filter/html/htmlnum.cxx | 9
sw/source/filter/inc/fltini.hxx | 16
sw/source/filter/inc/rtf.hxx | 9
sw/source/filter/ww8/WW8FFData.hxx | 15
sw/source/filter/ww8/WW8FibData.cxx | 10
sw/source/filter/ww8/WW8FibData.hxx | 4
sw/source/filter/ww8/docxhelper.hxx | 2
sw/source/filter/ww8/fields.hxx | 32 -
sw/source/filter/xml/xmlbrshe.hxx | 8
sw/source/filter/xml/xmlscript.cxx | 8
sw/source/ui/dbui/mmdocselectpage.hxx | 8
sw/source/ui/dbui/mmgreetingspage.hxx | 21 -
sw/source/ui/dbui/mmoutputtypepage.hxx | 2
sw/source/ui/dbui/selectdbtabledialog.cxx | 11
sw/source/ui/dialog/abstract.cxx | 4
sw/source/ui/dialog/addrdlg.cxx | 4
sw/source/ui/dialog/swuiexp.cxx | 19
sw/source/ui/envelp/envfmt.hxx | 26 -
sw/source/ui/envelp/envprt.hxx | 22 -
sw/source/ui/envelp/labfmt.hxx | 50 +-
sw/source/ui/envelp/labprt.hxx | 22 -
sw/source/ui/envelp/swuilabimp.hxx | 31 -
sw/source/ui/frmdlg/pattern.cxx | 4
sw/source/ui/frmdlg/uiborder.cxx | 12
sw/source/ui/inc/swuiexp.hxx | 2
sw/source/ui/index/multmrk.cxx | 11
sw/source/ui/misc/bookmark.cxx | 82 ++--
sw/source/ui/table/convert.cxx | 21 -
sw/source/ui/table/mergetbl.cxx | 7
sw/source/ui/table/splittbl.cxx | 2
sw/source/ui/vba/vbaaddin.hxx | 10
sw/source/ui/vba/vbaaddins.hxx | 9
sw/source/ui/vba/vbabookmark.hxx | 15
sw/source/ui/vba/vbaglobals.hxx | 34 -
sw/source/ui/vba/vbaheaderfooterhelper.hxx | 16
sw/source/ui/vba/vbainformationhelper.hxx | 11
sw/source/ui/vba/vbapane.hxx | 13
sw/source/ui/vba/vbatabstop.hxx | 5
sw/source/uibase/app/appenv.hxx | 3
sw/source/uibase/app/swdllimpl.hxx | 11
sw/source/uibase/frmdlg/colmgr.cxx | 31 -
sw/source/uibase/inc/DashedLine.hxx | 6
sw/source/uibase/inc/SidebarWindowsConsts.hxx | 4
sw/source/uibase/inc/abstract.hxx | 4
sw/source/uibase/inc/ascfldlg.hxx | 8
sw/source/uibase/inc/barcfg.hxx | 8
sw/source/uibase/inc/beziersh.hxx | 8
sw/source/uibase/inc/bookctrl.hxx | 12
sw/source/uibase/inc/break.hxx | 14
sw/source/uibase/inc/condedit.hxx | 9
sw/source/uibase/inc/conpoly.hxx | 2
sw/source/uibase/inc/convert.hxx | 7
sw/source/uibase/inc/cption.hxx | 14
sw/source/uibase/inc/dbui.hxx | 18
sw/source/uibase/inc/docfnote.hxx | 6
sw/source/uibase/inc/dselect.hxx | 4
sw/source/uibase/inc/envlop.hxx | 30 -
sw/source/uibase/inc/formatclipboard.hxx | 12
sw/source/uibase/inc/glosbib.hxx | 11
sw/source/uibase/inc/grfsh.hxx | 8
sw/source/uibase/inc/initui.hxx | 4
sw/source/uibase/inc/instable.hxx | 24 -
sw/source/uibase/inc/listsh.hxx | 8
sw/source/uibase/inc/macassgn.hxx | 4
sw/source/uibase/inc/maildispatcher.hxx | 22 -
sw/source/uibase/inc/mediash.hxx | 8
sw/source/uibase/inc/mergetbl.hxx | 3
sw/source/uibase/inc/multmrk.hxx | 6
sw/source/uibase/inc/navsh.hxx | 8
sw/source/uibase/inc/olesh.hxx | 4
sw/source/uibase/inc/pardlg.hxx | 4
sw/source/uibase/inc/rowht.hxx | 4
sw/source/uibase/inc/sharedconnection.hxx | 2
sw/source/uibase/inc/splittbl.hxx | 4
sw/source/uibase/inc/srtdlg.hxx | 10
sw/source/uibase/inc/tabledlg.hxx | 1
sw/source/uibase/inc/tblnumfm.hxx | 7
sw/source/uibase/inc/titlepage.hxx | 16
sw/source/uibase/inc/tmplctrl.hxx | 13
sw/source/uibase/inc/uiborder.hxx | 9
sw/source/uibase/inc/wformsh.hxx | 2
sw/source/uibase/inc/wfrmsh.hxx | 4
sw/source/uibase/inc/wgrfsh.hxx | 6
sw/source/uibase/inc/wlistsh.hxx | 5
sw/source/uibase/inc/wolesh.hxx | 4
sw/source/uibase/inc/wordcountctrl.hxx | 5
sw/source/uibase/inc/wtabsh.hxx | 4
sw/source/uibase/inc/wtextsh.hxx | 4
sw/source/uibase/inc/wview.hxx | 4
sw/source/uibase/inc/zoomctrl.hxx | 14
sw/source/uibase/misc/numberingtypelistbox.cxx | 28 -
sw/source/uibase/ribbar/conarc.cxx | 12
sw/source/uibase/ribbar/dselect.cxx | 6
sw/source/uibase/shells/navsh.cxx | 26 -
sw/source/uibase/sidebar/PageColumnControl.hxx | 10
sw/source/uibase/sidebar/PageSizeControl.hxx | 13
sw/source/uibase/uno/unodefaults.cxx | 9
sw/source/uibase/uno/unodefaults.hxx | 3
sw/source/uibase/utlui/gotodlg.cxx | 16
sw/source/uibase/utlui/prcntfld.cxx | 23 -
202 files changed, 1556 insertions(+), 1718 deletions(-)
New commits:
commit 695280feb90729fde1a7ecf1c409ae16f8281a46
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:21:51 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Nov 19 01:33:36 2020 +0100
tdf#123936 Formatting files in module sw with clang-format
Change-Id: I6243bc95129bf81a124d006ce0fc1aa1b5f618bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105718
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Jenkins
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);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list