summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx1
-rw-r--r--sw/source/core/access/accpara.cxx3
-rw-r--r--sw/source/core/crsr/pam.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx1
-rw-r--r--sw/source/core/docnode/ndtbl.cxx1
-rw-r--r--sw/source/core/draw/dview.cxx3
-rw-r--r--sw/source/core/frmedt/fetab.cxx1
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/frmtool.hxx1
-rw-r--r--sw/source/core/inc/layouter.hxx4
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/anchoredobject.cxx2
-rw-r--r--sw/source/core/layout/calcmove.cxx2
-rw-r--r--sw/source/core/layout/flyincnt.cxx1
-rw-r--r--sw/source/core/layout/flylay.cxx2
-rw-r--r--sw/source/core/layout/hffrm.cxx2
-rw-r--r--sw/source/core/layout/layact.cxx1
-rw-r--r--sw/source/core/layout/laycache.cxx1
-rw-r--r--sw/source/core/layout/layouter.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx2
-rw-r--r--sw/source/core/layout/sectfrm.cxx1
-rw-r--r--sw/source/core/layout/virtoutp.cxx1
-rw-r--r--sw/source/core/layout/wsfrm.cxx1
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx1
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx1
-rw-r--r--sw/source/core/text/frmform.cxx2
-rw-r--r--sw/source/core/text/frmpaint.cxx1
-rw-r--r--sw/source/core/text/inftxt.cxx1
-rw-r--r--sw/source/core/text/itrcrsr.cxx1
-rw-r--r--sw/source/core/text/itrpaint.cxx1
-rw-r--r--sw/source/core/text/porfly.cxx1
-rw-r--r--sw/source/core/text/porfly.hxx2
-rw-r--r--sw/source/core/text/txtfly.cxx1
-rw-r--r--sw/source/core/text/txtftn.cxx1
-rw-r--r--sw/source/core/text/txttab.cxx1
-rw-r--r--sw/source/core/uibase/docvw/edtwin2.cxx1
-rw-r--r--sw/source/core/uibase/inc/formatclipboard.hxx3
-rw-r--r--sw/source/core/uibase/shells/frmsh.cxx3
-rw-r--r--sw/source/core/uibase/uiview/formatclipboard.cxx7
-rw-r--r--sw/source/core/uibase/uiview/view1.cxx2
-rw-r--r--sw/source/core/uibase/uno/unotxdoc.cxx1
-rw-r--r--sw/source/core/undo/undobj1.cxx1
-rw-r--r--sw/source/core/unocore/unomap.cxx1
-rw-r--r--sw/source/core/unocore/unoportenum.cxx1
-rw-r--r--sw/source/core/unocore/unotbl.cxx1
-rw-r--r--sw/source/core/view/viewimp.cxx1
-rw-r--r--sw/source/filter/basflt/shellio.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx1
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx1
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx1
-rw-r--r--sw/source/filter/xml/xmlexp.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx1
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
-rw-r--r--sw/source/filter/xml/xmltexti.cxx3
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx1
-rw-r--r--sw/source/ui/fldui/fldref.hxx1
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx1
60 files changed, 3 insertions, 94 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 276c18bf091c..09fae2081264 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -23,7 +23,6 @@
#include <ndtxt.hxx>
#include <pam.hxx>
#include <stdio.h>
-// #i83479#
#include <IDocumentListItems.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 74549d5ed703..1bc29560a54c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -65,7 +65,6 @@
#include <txtfld.hxx>
#include <fmtfld.hxx>
#include <modcfg.hxx>
-//#include "accnote.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include "swmodule.hxx"
#include "redline.hxx"
@@ -79,14 +78,12 @@
#include <unosett.hxx>
#include <paratr.hxx>
#include <com/sun/star/container/XIndexReplace.hpp>
-// --> OD 2006-07-12 #i63870#
#include <unomap.hxx>
#include <unoprnms.hxx>
#include <com/sun/star/text/WritingMode2.hpp>
#include <viewimp.hxx>
#include <boost/scoped_ptr.hpp>
#include <textmarkuphelper.hxx>
-// #i10825#
#include <parachangetrackinginfo.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
#include <comphelper/servicehelper.hxx>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 8da7ed6e8bc6..b23a8ac22570 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -31,8 +31,6 @@
#include <frmatr.hxx>
#include <swtable.hxx>
#include <crsskip.hxx>
-
-// Formular view
#include <flyfrm.hxx>
#include <fmteiro.hxx>
#include <section.hxx>
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 951285925a9a..c3e1eb8131dd 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -50,7 +50,6 @@
#include <doctxm.hxx>
#include <fmtftntx.hxx>
#include <comcore.hrc>
-// #i27138#
#include <viewsh.hxx>
#include <txtfrm.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 713239625e24..4dbd16079149 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -25,7 +25,6 @@
#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <svl/stritem.hxx>
-// #i17174#
#include <editeng/shaditem.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 72342d93e4f3..a1b4eea820ae 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -46,11 +46,10 @@
#include "shellres.hxx"
#include <IDocumentUndoRedo.hxx>
-// #i7672#
#include <com/sun/star/embed/Aspects.hpp>
#include <vector>
-// #i28701#
+
#include <sortedobjs.hxx>
#include <flyfrms.hxx>
#include <UndoManager.hxx>
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index fa3ca95312ed..bd4fcddd9262 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -57,7 +57,6 @@
#include <frmtool.hxx>
#include <node.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index b96e674a7095..7b8b34b9d038 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
#include <swtypes.hxx>
-// #i11860#
#include <frame.hxx>
class SdrObject;
@@ -33,7 +32,6 @@ class SwRect;
class SvxLRSpaceItem;
class SvxULSpaceItem;
class SwFmtHoriOrient;
-// #i26701#
class SwAnchoredObject;
namespace objectpositioning
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 7645ad0fe8cc..e8a3c2bd4d8f 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -24,7 +24,6 @@
#include "layfrm.hxx"
#include "frmatr.hxx"
#include "swcache.hxx"
-// #i96772#
#include <editeng/lrspitem.hxx>
#include <swfont.hxx>
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 1bc4b6b09114..ac55613aaaff 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -28,15 +28,11 @@ class SwFtnFrm;
class SwPageFrm;
class SwLooping;
-// --> #i28701#
class SwMovedFwdFrmsByObjPos;
class SwTxtFrm;
-// --> #i26945#
class SwRowFrm;
-// --> #i35911#
class SwObjsMarkedAsTmpConsiderWrapInfluence;
class SwAnchoredObject;
-// --> #i65250#
#include <boost/unordered_map.hpp>
class SwFlowFrm;
class SwLayoutFrm;
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index e9630a959a3f..80678e8acb3a 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -24,9 +24,7 @@
#include <tolayoutanchoredobjectposition.hxx>
#include <frmtool.hxx>
#include <fmtornt.hxx>
-// --> #i32795#
#include <txtfrm.hxx>
-// --> #i32795#
#include <vector>
#include <svx/svdogrp.hxx>
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index ac602a83f537..b4a0cd8f5bef 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -19,7 +19,6 @@
#include <txtfrm.hxx>
#include <fmtornt.hxx>
-// --> #i28701#
#include <doc.hxx>
#include <fmtsrnd.hxx>
#include <dcontact.hxx>
@@ -27,7 +26,6 @@
#include <editeng/lrspitem.hxx>
#include <sortedobjs.hxx>
#include <pagefrm.hxx>
-// --> #i35911#
#include <layouter.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index ccbd8e89329f..218b70e44cfb 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -37,10 +37,8 @@
#include "sectfrm.hxx"
#include "dbg_lay.hxx"
-// #i28701#
#include <sortedobjs.hxx>
#include <layouter.hxx>
-// #i36347#
#include <flyfrms.hxx>
// Move methods
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 0cafd371a843..57406cc137ac 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -23,7 +23,6 @@
#include <fmtornt.hxx>
#include "txtfrm.hxx"
#include "flyfrms.hxx"
-// OD 2004-01-19 #110582#
#include <dflyobj.hxx>
SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index ba273a8226fc..a878b623d65b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -34,10 +34,8 @@
#include "ndole.hxx"
#include "tabfrm.hxx"
#include "flyfrms.hxx"
-// #i18732#
#include <fmtfollowtextflow.hxx>
#include <environmentofanchoredobject.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <viewimp.hxx>
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 0cc8b43a2282..b99aca0a367a 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -29,9 +29,7 @@
#include "flyfrm.hxx"
#include "frmtool.hxx"
#include "hfspacingitem.hxx"
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-// #i43771#
#include <objectformatter.hxx>
extern bool bObjsDirect; //frmtool.cxx
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 12016e9f3951..6c15b5cdadb0 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -54,7 +54,6 @@
#include "mdiexp.hxx"
#include "sectfrm.hxx"
#include <acmplwrd.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <objectformatter.hxx>
#include <vector>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index aaa544cfa39d..d7aa2e89cd5c 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -38,7 +38,6 @@
#include <dcontact.hxx>
#include "viewopt.hxx"
#include <flyfrm.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
#include <set>
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 62e710ba82da..ff9426a981b1 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -24,9 +24,7 @@
#include "ftnfrm.hxx"
#include "txtfrm.hxx"
-// #i28701#
#include <movedfwdfrmsbyobjpos.hxx>
-// #i35911#
#include <objstmpconsiderwrapinfl.hxx>
#define LOOP_DETECT 250
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 5e70d16ab324..3da4f8795074 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -65,11 +65,9 @@
#include <bodyfrm.hxx>
#include <hffrm.hxx>
#include <colfrm.hxx>
-// --> OD #i76669#
#include <svx/sdr/contact/viewobjectcontactredirector.hxx>
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
-// <--
#include <ndole.hxx>
#include <svx/charthelper.hxx>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 361b66bb59f7..1b0ab34f3375 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -49,7 +49,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/brushitem.hxx>
#include <fmtftntx.hxx>
-// OD 2004-05-24 #i28701#
#include <dflyobj.hxx>
#include <flyfrms.hxx>
#include <sortedobjs.hxx>
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index e821d5766eae..aaae3e523f94 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -24,7 +24,6 @@
#include "virtoutp.hxx"
#include "viewopt.hxx"
#include "rootfrm.hxx"
-// OD 12.11.2002 #96272# - include declaration for <SetMappingForVirtDev>
#include "setmapvirtdev.hxx"
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 84f0740e0e9e..0842b9330b86 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -61,7 +61,6 @@
#include <cellfrm.hxx>
#include <dbg_lay.hxx>
#include <editeng/frmdiritem.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
#include <svx/xdef.hxx>
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index b161f1cc28a1..7067fdf64bea 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -29,7 +29,6 @@
#include <dcontact.hxx>
#include <frmfmt.hxx>
#include <fmtornt.hxx>
-// #i62875#
#include <fmtfollowtextflow.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 0245cb31336a..6b31e7f3e3b7 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -23,7 +23,6 @@
#include <txtfrm.hxx>
#include <pagefrm.hxx>
#include <sectfrm.hxx>
-// #i26945#
#include <tabfrm.hxx>
#include "rootfrm.hxx"
#include "viewopt.hxx"
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 5eb0f4799436..1d45c7af4776 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -43,10 +43,8 @@
#include <porfld.hxx>
#include <sectfrm.hxx>
#include <pormulti.hxx>
-
#include <rootfrm.hxx>
#include <frmfmt.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <portab.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 9a6bf4a3aa99..fb41bab969ed 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -46,7 +46,6 @@
#include <numrule.hxx>
#include <SwGrammarMarkUp.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <IDocumentStylePoolAccess.hxx>
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index bf24d389771e..7ce119cc9441 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -61,7 +61,6 @@
#include <pam.hxx>
#include <SwGrammarMarkUp.hxx>
#include "numrule.hxx"
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <docufld.hxx>
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 450bdfd5aeff..79346409a0e1 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -45,7 +45,6 @@
#include "pordrop.hxx"
#include "crstate.hxx"
#include <pormulti.hxx>
-// #i111284#
#include <numrule.hxx>
// Not reentrant !!!
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1c109751ab22..fff6ea7488c5 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -36,7 +36,6 @@
#include <pagedesc.hxx>
#include <tgrditem.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include "flyfrms.hxx"
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 72643ad8f960..5fb22df3fd39 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -38,7 +38,6 @@
#include "porlay.hxx"
#include "inftxt.hxx"
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
// class SwFlyPortion => we expect a frame-locale SwRect!
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 9c1aac0139a3..3508258f752b 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
-// OD 28.10.2003 #113049#
+
#include <ascharanchoredobjectposition.hxx>
#include "porglue.hxx"
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 6eb433ea9a74..d4cd73486965 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -41,7 +41,6 @@
#include <editeng/txtrange.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
-// #i28701#
#include <editeng/lspcitem.hxx>
#include <fmtsrnd.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 0679d76352ea..fc9325296476 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -36,7 +36,6 @@
#include <breakit.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <tabfrm.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include "swfont.hxx"
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index e1d85ad43fa0..314f16345173 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -32,7 +32,6 @@
#include "itrform2.hxx"
#include "txtfrm.hxx"
#include <numrule.hxx>
-// #i89179#
#include <porfld.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sw/source/core/uibase/docvw/edtwin2.cxx b/sw/source/core/uibase/docvw/edtwin2.cxx
index 859d964ed3d4..df9b70462882 100644
--- a/sw/source/core/uibase/docvw/edtwin2.cxx
+++ b/sw/source/core/uibase/docvw/edtwin2.cxx
@@ -65,7 +65,6 @@
#include <PostItMgr.hxx>
#include <fmtfld.hxx>
-// #i104300#
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/uibase/inc/formatclipboard.hxx b/sw/source/core/uibase/inc/formatclipboard.hxx
index 2d61a9968cac..4c90ed28379e 100644
--- a/sw/source/core/uibase/inc/formatclipboard.hxx
+++ b/sw/source/core/uibase/inc/formatclipboard.hxx
@@ -20,11 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
-// header for class SwWrtShell
#include <wrtsh.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
-// header for class SfxStyleSheetBasePool
#include <svl/style.hxx>
/** This class acts as data container and execution class for the format paintbrush feature in writer.
diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index b565dd9f09ce..b140b44de287 100644
--- a/sw/source/core/uibase/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
@@ -39,7 +39,6 @@
#include <sfx2/objface.hxx>
#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/hlnkitem.hxx>
-// #i73249#
#include <svx/svdview.hxx>
#include <vcl/msgbox.hxx>
#include <tools/diagnose_ex.h>
@@ -75,7 +74,7 @@
#include <shells.hrc>
#include "swabstdlg.hxx"
#include "misc.hrc"
-// #i73249#
+
#include <svx/dialogs.hrc>
#include <wordcountdialog.hxx>
diff --git a/sw/source/core/uibase/uiview/formatclipboard.cxx b/sw/source/core/uibase/uiview/formatclipboard.cxx
index b6dd3f5167c6..ed2144c1072a 100644
--- a/sw/source/core/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/core/uibase/uiview/formatclipboard.cxx
@@ -25,20 +25,13 @@
#include <frmfmt.hxx>
#include <docstyle.hxx>
#include <fchrfmt.hxx>
-// header for class SdrView
#include <svx/svdview.hxx>
-//SvxBrushItem
#include <editeng/brushitem.hxx>
#include <editeng/shaditem.hxx>
-// header for class SvxBoxInfoItem
#include <editeng/boxitem.hxx>
-// header for class SvxFmtBreakItem
#include <editeng/formatbreakitem.hxx>
-// header for class SwFmtLayoutSplit
#include <fmtlsplt.hxx>
-// header for class SvxFmtKeepItem
#include <editeng/keepitem.hxx>
-// header for class SvxFrameDirectionItem
#include <editeng/frmdiritem.hxx>
#include <fmtpdsc.hxx>
#include <fmtrowsplt.hxx>
diff --git a/sw/source/core/uibase/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx
index 975c87966f22..e122d0c3820a 100644
--- a/sw/source/core/uibase/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
@@ -35,9 +35,7 @@
#include <edtwin.hxx>
#include "formatclipboard.hxx"
#include <cmdid.h>
-// header for class SfxRequest
#include <sfx2/request.hxx>
-
#include <sfx2/viewfrm.hxx>
extern int bDocSzUpdated;
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index 4cb01d9bd4d9..c0d90325394e 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -102,7 +102,6 @@
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <numrule.hxx>
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index ca00c4178850..9537429050ec 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -35,7 +35,6 @@
#include <swundo.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-// OD 26.06.2003 #108784#
#include <dcontact.hxx>
#include <ndole.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 660d8effa623..08d237144e38 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -76,7 +76,6 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
-// #i28749#
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <swtypes.hxx>
#include <unomap.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 439b9471dbe0..10db734ba2fe 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -19,7 +19,6 @@
#include <unoport.hxx>
#include <IMark.hxx>
-// #i81002#
#include <crossrefbookmark.hxx>
#include <annotationmark.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index d1980ce4c9d2..57096bc77b94 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// STL includes
#include <list>
#include <vector>
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index beacc1ccd2af..8ed20c645655 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -33,7 +33,6 @@
#include <svx/svdpage.hxx>
#include <accmap.hxx>
-// OD 12.12.2002 #103492#
#include <pagepreviewlayout.hxx>
#include <comcore.hrc>
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index a0db1dd2985f..874abfed8018 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -50,8 +50,6 @@
#include <redline.hxx>
#include <swerror.h>
#include <paratr.hxx>
-
-// #i73788#
#include <pausethreadstarting.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index dfac4b3c1065..505b80cb262b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -49,8 +49,6 @@
#include <svx/fmglob.hxx>
#include <svx/svdouno.hxx>
#include <svx/unoapi.hxx>
-
-// #i71538#
#include <svx/svdview.hxx>
#include <fmtcnct.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 292c6cdd0332..6879a57ec187 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -80,7 +80,6 @@
#include <fmtinfmt.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
-// #i18732#
#include <fmtfollowtextflow.hxx>
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 492568a8aed9..7d23aa54d42c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -96,7 +96,6 @@
#include "ww8par2.hxx"
#include "ww8graf.hxx"
-// #i27767#
#include <fmtwrapinfluenceonobjpos.hxx>
using namespace sw::util;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 089e7c3c8b1d..b756d71d8a13 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -27,8 +27,6 @@
#include "unoredline.hxx"
#include <xmloff/xmltoken.hxx>
#include <com/sun/star/frame/XModel.hpp>
-
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 1073937bb5cb..5464283df2d8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -57,7 +57,6 @@
#include <statstr.hrc>
-// #i44177#
#include <SwStyleNameMapper.hxx>
#include <poolfmt.hxx>
#include <numrule.hxx>
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index bc49caa7c615..3dfebf03b6e0 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -56,8 +56,6 @@
#include <editeng/unolingu.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <comphelper/servicehelper.hxx>
-
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index ad404c837ea5..c4a162d35910 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -56,7 +56,6 @@
#include <tools/diagnose_ex.h>
#include <boost/unordered_set.hpp>
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <unotxdoc.hxx>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 4f06033189af..3bcbd7a3b0a8 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -51,8 +51,6 @@
#include <sfx2/linkmgr.hxx>
#include "xmlimp.hxx"
#include "xmltbli.hxx"
-
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include "ndtxt.hxx"
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 43ce1c975ea4..09d620939d6a 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -53,11 +53,8 @@
#include <docsh.hxx>
#include <sfx2/docfile.hxx>
#include <switerator.hxx>
-
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/embedhlp.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index a600788e0dca..935fcecc7344 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -29,8 +29,6 @@
#include <doc.hxx>
#include <docstdlg.hxx>
#include <modcfg.hxx>
-
-// for statistics fields
#include <fldmgr.hxx>
#include <fldbas.hxx>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 7b18a1c6ade0..f1820e81b558 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -28,7 +28,6 @@
#include <fldui.hrc>
#include <globals.hrc>
-// #i83479#
#include <SwNodeNum.hxx>
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index afdc6c6e4d2e..a8102aa544d0 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -27,7 +27,6 @@
#include <vcl/edit.hxx>
#include "fldpage.hxx"
-// #i83479#
#include <IDocumentOutlineNodes.hxx>
#include <IDocumentListItems.hxx>
#include <FldRefTreeListBox.hxx>
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index bd8364d4eba1..d465fe5823a3 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -27,7 +27,6 @@
#include <editeng/opaqitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
-// #i18732#
#include <fmtfollowtextflow.hxx>
#include <svx/swframevalidation.hxx>