summaryrefslogtreecommitdiffstats
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/apphdl.cxx8
-rw-r--r--sw/source/ui/app/appopt.cxx10
-rw-r--r--sw/source/ui/app/docsh.cxx10
-rw-r--r--sw/source/ui/app/docsh2.cxx4
-rw-r--r--sw/source/ui/app/docst.cxx2
-rw-r--r--sw/source/ui/app/error.src2
-rw-r--r--sw/source/ui/app/swmodul1.cxx4
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx2
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--sw/source/ui/config/uinums.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dialog/regionsw.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx4
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx6
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx6
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx2
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx6
-rw-r--r--sw/source/ui/fldui/xfldui.cxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx20
-rw-r--r--sw/source/ui/inc/bookmark.hxx2
-rw-r--r--sw/source/ui/inc/content.hxx2
-rw-r--r--sw/source/ui/inc/outline.hxx2
-rw-r--r--sw/source/ui/inc/uivwimp.hxx2
-rw-r--r--sw/source/ui/inc/unoatxt.hxx6
-rw-r--r--sw/source/ui/inc/unomailmerge.hxx6
-rw-r--r--sw/source/ui/inc/unomod.hxx4
-rw-r--r--sw/source/ui/inc/unotxvw.hxx2
-rw-r--r--sw/source/ui/index/idxmrk.cxx2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx2
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx4
-rw-r--r--sw/source/ui/lingu/olmenu.cxx2
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx8
-rw-r--r--sw/source/ui/misc/bookmark.cxx4
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/misc/glshell.cxx2
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx2
-rw-r--r--sw/source/ui/shells/basesh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx2
-rw-r--r--sw/source/ui/shells/textidx.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx2
-rw-r--r--sw/source/ui/shells/textsh1.cxx2
-rw-r--r--sw/source/ui/uiview/srcview.cxx2
-rw-r--r--sw/source/ui/uiview/view0.cxx2
-rw-r--r--sw/source/ui/uiview/viewling.cxx18
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx2
-rw-r--r--sw/source/ui/uiview/viewtab.cxx4
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx2
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx12
-rw-r--r--sw/source/ui/utlui/navicfg.cxx2
-rw-r--r--sw/source/ui/utlui/navipi.cxx2
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/web/wtextsh.cxx2
-rw-r--r--sw/source/ui/wrtsh/delete.cxx2
-rw-r--r--sw/source/ui/wrtsh/select.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx12
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx2
63 files changed, 121 insertions, 121 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index cf21d0f3fb06..d73fcfb8edaf 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -55,21 +55,21 @@
#include <srcview.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
-#include <cmdid.h> // Function-Ids
+#include <cmdid.h>
#include <initui.hxx>
#include <uitool.hxx>
#include <swmodule.hxx>
#include <wdocsh.hxx>
#include <wview.hxx>
#include <usrpref.hxx>
-#include <gloslst.hxx> // SwGlossaryList
-#include <glosdoc.hxx> // SwGlossaryList
+#include <gloslst.hxx>
+#include <glosdoc.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <cfgitems.hxx>
#include <prtopt.hxx>
#include <modcfg.hxx>
-#include <globals.h> // e.g. global Constants
+#include <globals.h>
#include <app.hrc>
#include <fontcfg.hxx>
#include <barcfg.hxx>
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 238229ee05e5..4c1c2415afe2 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cmdid.h> // Function-Ids
+#include <cmdid.h>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <hintids.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h>
#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <sfx2/request.hxx>
@@ -48,8 +48,8 @@
#include <wrtsh.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <uitool.hxx>
-#include <initui.hxx> // for ::GetGlossaries()
-#include <fldbas.hxx> //for UpdateFields
+#include <initui.hxx>
+#include <fldbas.hxx>
#include <wview.hxx>
#include <cfgitems.hxx>
#include <prtopt.hxx>
@@ -62,7 +62,7 @@
#include <unotools/lingucfg.hxx>
#include <editeng/unolingu.hxx>
#include <globals.hrc>
-#include <globals.h> // e.g. global Constants
+#include <globals.h>
#include <svl/slstitm.hxx>
#include "swabstdlg.hxx"
#include <swwrtshitem.hxx>
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index cec89922bc82..0a601cad2d80 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -55,18 +55,18 @@
#include <swwait.hxx>
#include <printdata.hxx>
#include <frmatr.hxx>
-#include <view.hxx> // for the current view
+#include <view.hxx>
#include <edtwin.hxx>
#include <PostItMgr.hxx>
-#include <wrtsh.hxx> // connection to Core
-#include <docsh.hxx> // document creation
+#include <wrtsh.hxx>
+#include <docsh.hxx>
#include <basesh.hxx>
#include <viewopt.hxx>
#include <wdocsh.hxx>
#include <swmodule.hxx>
#include <globdoc.hxx>
#include <usrpref.hxx>
-#include <shellio.hxx> // I/O
+#include <shellio.hxx>
#include <docstyle.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
@@ -83,7 +83,7 @@
#include <ftnidx.hxx>
#include <fldbas.hxx>
#include <docary.hxx>
-#include <swerror.h> // Error messages
+#include <swerror.h>
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index d2f9b7cbf052..d520ea76fca3 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -62,8 +62,8 @@
#include <comphelper/classids.hxx>
#include <fmtcol.hxx>
#include <swevent.hxx>
-#include <view.hxx> // for the current view
-#include <docsh.hxx> // creation of documents
+#include <view.hxx>
+#include <docsh.hxx>
#include <docary.hxx>
#include <wrtsh.hxx>
#include <fldbas.hxx>
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index d24c85aac1c7..b070e8bee8f2 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -64,7 +64,7 @@
#include "docstyle.hxx"
#include "uiitems.hxx"
#include "fmtcol.hxx"
-#include "frmmgr.hxx" //SwFrmValid
+#include "frmmgr.hxx"
#include "swevent.hxx"
#include "edtwin.hxx"
#include "unochart.hxx"
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 9cfda2491094..49836ac4d553 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -22,7 +22,7 @@
#include "globals.hrc"
#include "app.hrc"
#include "swerror.h"
-#include "comcore.hrc" // MS: Why are there resources at the Core-Side now
+#include "comcore.hrc"
String STR_COMCORE_READERROR
{
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 7b59769508f1..6fd4075676b0 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -28,7 +28,7 @@
#include <cppuhelper/weak.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
@@ -50,7 +50,7 @@
#include <docsh.hxx>
#include <dbmgr.hxx>
#include <uinums.hxx>
-#include <prtopt.hxx> // for PrintOptions
+#include <prtopt.hxx>
#include <navicfg.hxx>
#include <doc.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index cab58197017d..b0f44e7e4bf8 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -31,7 +31,7 @@
#include <svx/insctrl.hxx>
#include <svx/selctrl.hxx>
#include <svx/linectrl.hxx>
-#include <svx/tbxctl.hxx> // at the moment wrong include-protection!
+#include <svx/tbxctl.hxx>
#include <svx/fillctrl.hxx>
#include <svx/tbcontrl.hxx>
#include <svx/verttexttbxctrl.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 5df7743faef2..58c19adb778c 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -35,7 +35,7 @@
#include <uitool.hxx>
#include <fmtinfmt.hxx>
#include <macassgn.hxx>
-#include <chrdlg.hxx> // the dialog
+#include <chrdlg.hxx>
#include <swmodule.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7cdca6a5c1a9..d7efd5391f70 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -30,7 +30,7 @@
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <uitool.hxx>
-#include <cfgitems.hxx> //Items for Sw-pages
+#include <cfgitems.hxx>
#include <poolfmt.hxx>
#include <uiitems.hxx>
#include <initui.hxx>
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index cf1ffd580d48..f708f9e300b3 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -29,7 +29,7 @@
#include <tools/resid.hxx>
#include <fmtornt.hxx>
-#include <swtypes.hxx> // empty string
+#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <uinums.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 527dee034415..575ae3832f2c 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -33,7 +33,7 @@
#include <dbmgr.hxx>
#include <sfx2/viewfrm.hxx>
#include <wrtsh.hxx>
-#include "vcl/msgbox.hxx" // RET_CANCEL
+#include "vcl/msgbox.hxx"
#include <helpid.h>
#include <mailmergewizard.hrc>
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index dd7b1ab47cc5..0985ea99c0f3 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -41,7 +41,7 @@
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <column.hxx>
#include <fmtfsize.hxx>
#include <shellio.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 673f0189b8fb..9961006afa69 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -41,13 +41,13 @@
#include <IMark.hxx>
#include <section.hxx>
#include <docary.hxx>
-#include <doc.hxx> // for the SwSectionFmt-Array
+#include <doc.hxx>
#include <basesh.hxx>
#include <wdocsh.hxx>
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <column.hxx>
#include <fmtfsize.hxx>
#include <shellio.hxx>
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 257be043a101..fc584fc37e11 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -33,15 +33,15 @@
#include <fmtcol.hxx>
#include <docary.hxx>
#include <wrtsh.hxx>
-#include <uitool.hxx> // error messages
+#include <uitool.hxx>
#include <view.hxx>
#include <swevent.hxx>
#include <gloshdl.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <expfld.hxx>
-#include <initui.hxx> // for ::GetGlossaries()
+#include <initui.hxx>
#include <gloslst.hxx>
#include <swdtflvr.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index d3344b2ad09a..dbf5f29fedf1 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -90,8 +90,8 @@
#include <view.hxx>
#include <docsh.hxx>
#include <wdocsh.hxx>
-#include <fldbas.hxx> //DDE
-#include <swundo.hxx> // for Undo-Ids
+#include <fldbas.hxx>
+#include <swundo.hxx>
#include <pam.hxx>
#include <ndole.hxx>
#include <swwait.hxx>
@@ -100,7 +100,7 @@
#include <SwCapObjType.hxx>
#include <cmdid.h>
#include <dochdl.hrc>
-#include <comcore.hrc> // #111827#
+#include <comcore.hrc>
#include <sot/stg.hxx>
#include <svx/svditer.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index d08226efa105..2b471485c8f5 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -42,7 +42,7 @@
#include <editeng/editeng.hxx>
#include <editeng/editobj.hxx>
-#include <docufld.hxx> // SwPostItField
+#include <docufld.hxx>
#include <txtfld.hxx>
#include <ndtxt.hxx>
#include <view.hxx>
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 9ced231648c3..62c5bb1d8444 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -133,7 +133,7 @@
#include <IMark.hxx>
#include <doc.hxx>
-#include <txatbase.hxx> // FIXME this sucks
+#include <txatbase.hxx>
#include <xmloff/odffields.hxx>
#include <PostItMgr.hxx>
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index edc3bd0cb45e..b6874c3be867 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -31,7 +31,7 @@
#include "modcfg.hxx"
#include "swtable.hxx"
#include "docsh.hxx"
-#include "pagedesc.hxx" // Aktuelles Seitenformat
+#include "pagedesc.hxx"
#include <frmatr.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index f349fefaa68a..6897d9608fc1 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -51,9 +51,9 @@
#include <svl/zformat.hxx>
#include <vcl/mnemonic.hxx>
#include <view.hxx>
-#include <wrtsh.hxx> // active window
-#include <doc.hxx> // active window
-#include <docsh.hxx> // active window
+#include <wrtsh.hxx>
+#include <doc.hxx>
+#include <docsh.hxx>
#include <swmodule.hxx>
#include <charatr.hxx>
#include <fmtinfmt.hxx>
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index de49dd77bfab..5510639a0880 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -29,7 +29,7 @@
#include <comphelper/processfactory.hxx>
#include <fldmgr.hxx>
#include <dbmgr.hxx>
-#include <wrtsh.hxx> // active window
+#include <wrtsh.hxx>
#include <view.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 9ed8c830c5d7..9d05aa567f95 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -36,17 +36,17 @@
#include <viewopt.hxx>
#include <pgfnote.hxx>
#include <pggrid.hxx>
-#include <tmpdlg.hxx> // the dialog
-#include <column.hxx> // columns
-#include <drpcps.hxx> // initials
-#include <frmpage.hxx> // frames
-#include <wrap.hxx> // frames
-#include <frmmgr.hxx> // frames
-#include <ccoll.hxx> // CondColl
+#include <tmpdlg.hxx>
+#include <column.hxx>
+#include <drpcps.hxx>
+#include <frmpage.hxx>
+#include <wrap.hxx>
+#include <frmmgr.hxx>
+#include <ccoll.hxx>
#include <swuiccoll.hxx>
-#include <docstyle.hxx> //
-#include <fmtcol.hxx> //
-#include <macassgn.hxx> //
+#include <docstyle.hxx>
+#include <fmtcol.hxx>
+#include <macassgn.hxx>
#include <poolfmt.hxx>
#include <uitool.hxx>
#include <shellres.hxx>
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 372df26ee9e4..1b0c10bbd706 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -24,7 +24,7 @@
#include <vcl/button.hxx>
-#include "swlbox.hxx" // SwComboBox
+#include "swlbox.hxx"
class SwWrtShell;
class SfxRequest;
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 9d8d4ddcbf64..3ae614e92609 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -18,7 +18,7 @@
*/
#ifndef _CONTENT_HXX
#define _CONTENT_HXX
-#include <limits.h> // USHRT_MAX
+#include <limits.h>
#include "swcont.hxx"
#include <vcl/menu.hxx>
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index bdd3351ebf6c..c1577367e84a 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -35,7 +35,7 @@
#include <vcl/field.hxx>
-#include "swtypes.hxx" //for MAXLEVEL
+#include "swtypes.hxx"
#include <numprevw.hxx>
#include <numberingtypelistbox.hxx>
#include "rtl/ustring.hxx"
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index 1466a809668c..02ac96489243 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -25,7 +25,7 @@
#include <sfx2/objsh.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/weakref.hxx>
class SwXTextView;
diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx
index 9237315ecec3..614878ee50ba 100644
--- a/sw/source/ui/inc/unoatxt.hxx
+++ b/sw/source/ui/inc/unoatxt.hxx
@@ -31,9 +31,9 @@
#include <com/sun/star/text/XText.hpp>
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase6.hxx>
#include <svtools/unoevent.hxx>
class SwTextBlocks;
class SwGlossaries;
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx
index 6ac450e9a164..706e2b6a5c6c 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -21,9 +21,9 @@
#define _UNOMAILMERGE_HXX_
#include <functional>
-#include <cppuhelper/implbase5.hxx> // WeakImplHelper4
-#include <cppuhelper/interfacecontainer.hxx> // OMultiTypeInterfaceContainerHelperVar
-#include <unotools/configitem.hxx> // !! needed for OMultiTypeInterfaceContainerHelperVar !!
+#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <unotools/configitem.hxx>
#include <com/sun/star/task/XJob.hpp>
diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx
index ef7c511c4370..1ad40b363eb5 100644
--- a/sw/source/ui/inc/unomod.hxx
+++ b/sw/source/ui/inc/unomod.hxx
@@ -24,8 +24,8 @@
#include <com/sun/star/view/XViewSettingsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <comphelper/ChainablePropertySet.hxx>
#include <comphelper/SettingsHelper.hxx>
#include <usrpref.hxx>
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 30c5fb17c4a4..1ab5918adbbb 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
-#include <cppuhelper/implbase8.hxx> // helper for implementations
+#include <cppuhelper/implbase8.hxx>
#include <svl/itemprop.hxx>
#include "calbck.hxx"
#include "TextCursorHelper.hxx"
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 19fae85694b9..7a717fd42939 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -40,7 +40,7 @@
#include <wrtsh.hxx>
#include <view.hxx>
#include <multmrk.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <cmdid.h>
#include <index.hrc>
#include <idxmrk.hrc>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index e3d9c951ea04..5741b629b3bf 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -45,7 +45,7 @@
#include <wrtsh.hxx>
#include <view.hxx>
#include <multmrk.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <cmdid.h>
#include <app.hrc>
#include <index.hrc>
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 3472ba542c58..4f5de524200a 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -20,7 +20,7 @@
#include <hintids.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <globals.hrc>
#include <splargs.hxx>
@@ -34,7 +34,7 @@
#include <sdrhhcwrap.hxx>
#include <doc.hxx>
#include <docsh.hxx>
-#include <mdiexp.hxx> // Progress
+#include <mdiexp.hxx>
#include <edtwin.hxx>
#include <crsskip.hxx>
#include <index.hxx>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 4e8cfd5da4de..474179be91c9 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -23,7 +23,7 @@
#include "comcore.hrc"
#include "crsskip.hxx"
#include "doc.hxx"
-#include "docsh.hxx" //CheckSpellChanges
+#include "docsh.hxx"
#include "edtwin.hxx"
#include "helpid.h"
#include "hintids.hxx"
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index 703cef2a4853..f8ffa1a1c75c 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -34,11 +34,11 @@
#include <unotools/localedatawrapper.hxx>
#include <sdrhhcwrap.hxx>
#include <frmfmt.hxx>
-#include <docsh.hxx> // " " "
-#include <wrtsh.hxx> // MakeVisible
+#include <docsh.hxx>
+#include <wrtsh.hxx>
#include <view.hxx>
-#include <dcontact.hxx> // Spelling von DrawObj
-#include <doc.hxx> // " " "
+#include <dcontact.hxx>
+#include <doc.hxx>
#include <docary.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d84684739dce..93e74980dd3e 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -25,9 +25,9 @@
#include "view.hxx"
#include "basesh.hxx"
-#include "wrtsh.hxx" //
+#include "wrtsh.hxx"
#include "cmdid.h"
-#include "bookmark.hxx" // SwInsertBookmarkDlg
+#include "bookmark.hxx"
#include "IMark.hxx"
#include "globals.hrc"
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index b939e4ad409b..629a3190e808 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -52,7 +52,7 @@
#include <glossary.hxx>
#include <gloshdl.hxx>
#include <glosbib.hxx>
-#include <initui.hxx> // for ::GetGlossaries()
+#include <initui.hxx>
#include <glosdoc.hxx>
#include <macassgn.hxx>
#include <swevent.hxx>
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index c7d43825ddb1..d2617851130f 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -41,7 +41,7 @@
#include <IDocumentUndoRedo.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
-#include <initui.hxx> // for ::GetGlossaries()
+#include <initui.hxx>
#include <cmdid.h>
#include <swerror.h>
#include <misc.hrc>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6947ff451a10..dab46835c456 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -42,7 +42,7 @@
#include <viewopt.hxx>
#include <svtools/ctrlbox.hxx>
#include <helpid.h>
-#include <globals.hrc> // for template name 'none'
+#include <globals.hrc>
#include <misc.hrc>
#include <paratr.hxx>
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 51da82c94dab..16888cdcc2f7 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -21,7 +21,7 @@
#include <hintids.hxx>
#include <svx/dialogs.hrc>
#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx> // XColorList
+#include <svx/xtable.hxx>
#include <sal/macros.h>
#include <vcl/field.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 2926d96353cf..5480849c1de2 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -101,7 +101,7 @@
#include "table.hrc"
#include <modcfg.hxx>
#include <instable.hxx>
-#include <svx/fmshell.hxx> // for FN_XFORMS_DESIGN_MODE
+#include <svx/fmshell.hxx>
#include <SwRewriter.hxx>
#include <comcore.hrc>
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index eb8ed5e6de0f..1d2a9828b984 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -82,7 +82,7 @@
#include <edtwin.hxx>
#include <globals.hrc>
#include <hintids.hxx>
-#include <initui.hxx> // for SpellPointer
+#include <initui.hxx>
#include <langhelper.hxx>
#include <chrdlgmodes.hxx>
#include <pardlg.hxx>
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index eb960c506fb4..acba5599fa90 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -50,7 +50,7 @@
#include <view.hxx>
#include <wrtsh.hxx>
#include <viewopt.hxx>
-#include <initui.hxx> // for SpellPointer
+#include <initui.hxx>
#include <drwtxtsh.hxx>
#include <swundo.hxx>
#include <breakit.hxx>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 0637abce40dc..66b1f20a60d4 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -19,7 +19,7 @@
#include <crsskip.hxx>
-#include <hintids.hxx> //_always_ before the solar-items
+#include <hintids.hxx>
#include <sfx2/lnkbase.hxx>
#include <fmtfld.hxx>
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index 4ceb302e907f..054bbcfe61b4 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -32,7 +32,7 @@
#include "cmdid.h"
#include "view.hxx"
#include "wrtsh.hxx"
-#include "swundo.hxx" // for Undo-Ids
+#include "swundo.hxx"
#include "textsh.hxx"
#include "idxmrk.hxx"
#include "cnttab.hxx"
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 49f248e056f7..bbbb1b713f25 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -74,7 +74,7 @@
#include <textsh.hxx>
#include <frmfmt.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // for Undo-IDs
+#include <swundo.hxx>
#include <shellio.hxx>
#include <frmdlg.hxx>
#include <usrpref.hxx>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 5f7e8ae93fe7..75c263fd8b8d 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -68,7 +68,7 @@
#include <docstat.hxx>
#include <outline.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // for Undo-IDs
+#include <swundo.hxx>
#include <reffld.hxx>
#include <docsh.hxx>
#include <mdiexp.hxx>
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 52e87e203391..dc4b6528c962 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -70,7 +70,7 @@
#include <sfx2/msg.hxx>
#include <shellio.hxx>
-#include <cmdid.h> // FN_ ...
+#include <cmdid.h>
#include <helpid.h>
#include <globals.hrc>
#include <shells.hrc>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index bcb06f67b3c2..721b200d864a 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -51,7 +51,7 @@
#include "docsh.hxx"
#include "doc.hxx"
#include "globals.hrc"
-#include "cmdid.h" // FN_ ...
+#include "cmdid.h"
#include "globdoc.hxx"
#include "wview.hxx"
#include "shells.hrc"
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 64fb3968a8af..05fa81f48fb0 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -40,24 +40,24 @@
#include <editeng/SpellPortions.hxx>
#include <swmodule.hxx>
#include <swwait.hxx>
-#include <initui.hxx> // for SpellPointer
+#include <initui.hxx>
#include <uitool.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
#include <basesh.hxx>
-#include <docsh.hxx> // CheckSpellChanges
-#include <viewopt.hxx> // Viewoptions
-#include <swundo.hxx> // for Undo-Ids
-#include <hyp.hxx> // hyphenation
-#include <olmenu.hxx> // PopupMenu for OnlineSpelling
-#include <pam.hxx> // Spelling: Multiselection
+#include <docsh.hxx>
+#include <viewopt.hxx>
+#include <swundo.hxx>
+#include <hyp.hxx>
+#include <olmenu.hxx>
+#include <pam.hxx>
#include <edtwin.hxx>
#include <crsskip.hxx>
#include <ndtxt.hxx>
#include <vcl/lstbox.hxx>
#include <cmdid.h>
#include <globals.hrc>
-#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN
+#include <comcore.hrc>
#include <view.hrc>
#include <hhcwrp.hxx>
#include <com/sun/star/frame/XStorable.hpp>
@@ -76,7 +76,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include "stmenu.hxx" // PopupMenu for smarttags
+#include "stmenu.hxx"
#include <svx/dialogs.hrc>
#include <svtools/langtab.hxx>
#include <unomid.h>
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index c92d90a78d50..58f02b262ee7 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -48,7 +48,7 @@
#include <workctrl.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <uitool.hxx>
#include <cmdid.h>
#include <docsh.hxx>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index e5c4f30a23e6..513cc515ea63 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -45,8 +45,8 @@
#include "cmdid.h"
#include "viewopt.hxx"
#include "tabcol.hxx"
-#include "frmfmt.hxx" // Current format
-#include "pagedesc.hxx" // Current page format
+#include "frmfmt.hxx"
+#include "pagedesc.hxx"
#include "wview.hxx"
#include "fmtcol.hxx"
#include "section.hxx"
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index c68b141dc80f..f1a75fe0bf73 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -22,7 +22,7 @@
#include <svl/itemprop.hxx>
#include <svl/urihelper.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <tools/shl.hxx> // GetAppData
+#include <tools/shl.hxx>
#include <unotools/tempfile.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index a051c7014f3a..1242e3e8abdc 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -50,7 +50,7 @@
#include <unosrch.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/objsh.hxx> // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell)
+#include <sfx2/objsh.hxx>
#include <unoprnms.hxx>
#include <unostyle.hxx>
#include <unodraw.hxx>
@@ -107,14 +107,14 @@
#include <numrule.hxx>
#include <editeng/langitem.hxx>
-#include <docary.hxx> //SwCharFmts
+#include <docary.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <format.hxx>
-#include <charfmt.hxx> //SwCharFmt
-#include <fmtcol.hxx> //SwTxtFmtColl
-#include <unostyle.hxx> //SwAutoStyleFamily
-#include <istyleaccess.hxx> // handling of automatic styles
+#include <charfmt.hxx>
+#include <fmtcol.hxx>
+#include <unostyle.hxx>
+#include <istyleaccess.hxx>
#include <svl/stylepool.hxx>
#include <swatrset.hxx>
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index 54065a3f29fe..b4e545fa6f77 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <swtypes.hxx> // for pathfinder
+#include <swtypes.hxx>
#include <navicfg.hxx>
#include <swcont.hxx>
#include <osl/diagnose.h>
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 8b6534cca4eb..3ff736cfa376 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -30,7 +30,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/dockwin.hxx>
#include <vcl/toolbox.hxx>
-#include <swtypes.hxx> // for pathfinder
+#include <swtypes.hxx>
#include <swmodule.hxx>
#include <view.hxx>
#include <navicfg.hxx>
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 30549452c6d1..87bd107c4e59 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -24,7 +24,7 @@
#include <svl/eitem.hxx>
#include <svx/viewlayoutitem.hxx>
#include <utlui.hrc>
-#include <swtypes.hxx> // for pathfinder
+#include <swtypes.hxx>
SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem );
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index 00ce8a75a814..80958cb8740e 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -20,7 +20,7 @@
#include "hintids.hxx"
#include <sfx2/objface.hxx>
#include <sfx2/app.hxx>
-#include <svl/srchitem.hxx> //***
+#include <svl/srchitem.hxx>
#include <basic/sbxvar.hxx>
#include <svx/svxids.hrc>
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index f19455e0d681..79a948480c74 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -20,7 +20,7 @@
#include <wrtsh.hxx>
#include <crsskip.hxx>
#include <swcrsr.hxx>
-#include <editeng/lrspitem.hxx> // #i23725#
+#include <editeng/lrspitem.hxx>
// #134369#
#include <view.hxx>
#include <drawbase.hxx>
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index c55c1e59d30a..8eb0d6a53392 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -33,7 +33,7 @@
#include <mdiexp.hxx>
#include <fmtcol.hxx>
#include <frmfmt.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <swevent.hxx>
#include <swdtflvr.hxx>
#include <crsskip.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 8b974bda7715..03b8ad2b663b 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -70,7 +70,7 @@
#include <frmmgr.hxx>
#include <shellio.hxx>
#include <uinums.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <swcli.hxx>
#include <poolfmt.hxx>
#include <wview.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 264806c63f2d..69cc78be3460 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -18,7 +18,7 @@
*/
-#include <hintids.hxx> // define ITEMIDs
+#include <hintids.hxx>
#include <svl/macitem.hxx>
#include <sfx2/frame.hxx>
#include <vcl/msgbox.hxx>
@@ -31,10 +31,10 @@
#include <sfx2/linkmgr.hxx>
#include <fmtinfmt.hxx>
#include <frmatr.hxx>
-#include <swtypes.hxx> // SET_CURR_SHELL
+#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
-#include <fldbas.hxx> // Fields
+#include <fldbas.hxx>
#include <expfld.hxx>
#include <ddefld.hxx>
#include <docufld.hxx>
@@ -42,9 +42,9 @@
#include <swundo.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
-#include <viewopt.hxx> // SwViewOptions
-#include <frmfmt.hxx> // for UpdateTable
-#include <swtable.hxx> // for UpdateTable
+#include <viewopt.hxx>
+#include <frmfmt.hxx>
+#include <swtable.hxx>
#include <mdiexp.hxx>
#include <view.hxx>
#include <swevent.hxx>
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index 734de3b051f9..511d11deeca1 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -21,7 +21,7 @@
#include <sfx2/app.hxx>
#include <svl/slstitm.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // for Undo-Ids
+#include <swundo.hxx>
#include <IDocumentUndoRedo.hxx>
#include <swdtflvr.hxx>
#include <svtools/svtresid.hxx>