Bin comments that claim to say why some header is included

They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c

42 files changed, 158 insertions, 158 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index cd34d60adfb3..4d6cbdfd4213 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "EnhancedCustomShapeFontWork.hxx"
-#include <tools/solar.h>               // UINTXX
+#include <tools/solar.h>
 #include <svx/svddef.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a8c9cadc06a4..89a5b682c410 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -40,7 +40,7 @@
 #include <algorithm>
 #include <stack>
 
-#include <math.h> // fabs, sqrt, sin, cos, tan, atan, atan2
+#include <math.h>
 using namespace EnhancedCustomShape;
 using namespace com::sun::star;
 using namespace com::sun::star::drawing;
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index fa38393787ad..2d83858177cd 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -27,7 +27,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdoedge.hxx>
-#include <svx/svdpage.hxx> // SdrObjList
+#include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sxelditm.hxx>
 #include <svx/sxmkitm.hxx>
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index fc0e096048be..13105c54918a 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <sfx2/dialoghelper.hxx>
-#include <sfx2/viewsh.hxx>      // SfxViewShell
-#include <sfx2/printer.hxx>     // Printer
+#include <sfx2/viewsh.hxx>
+#include <sfx2/printer.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
@@ -43,31 +43,31 @@
 // Item set includes
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <svl/stritem.hxx>                  // SfxStringItem
+#include <svl/stritem.hxx>
 #include <svl/languageoptions.hxx>
 
 #include <editeng/colritem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/editids.hrc>      // #define SID_ATTR_*
-#include <editeng/fontitem.hxx>     // SvxFontItem
-#include <editeng/postitem.hxx>     // SvxPostureItem
-#include <editeng/udlnitem.hxx>     // SvxUnderlineItem
-#include <editeng/crossedoutitem.hxx>     // SvxCrossedOutItem
-#include <editeng/contouritem.hxx>     // SvxContourItem
-#include <editeng/wghtitem.hxx>     // SvxWeightItem
-#include <editeng/fhgtitem.hxx>     // SvxFontHeightItem
-#include <editeng/shdditem.hxx>     // SvxShadowedItem
-#include <editeng/escapementitem.hxx>     // SvxEscapementItem
-#include <editeng/wrlmitem.hxx>     // SvxWordLineModeItem
-#include <editeng/cmapitem.hxx>     // SvxWordLineModeItem
-#include <editeng/kernitem.hxx>     // SvxKerningItem
-#include <editeng/brushitem.hxx>     // SvxBrushItem
-#include <editeng/colritem.hxx>     // SvxColorItem
-#include <editeng/emphasismarkitem.hxx>     // SvxEmphasisMarkItem
-#include <editeng/charreliefitem.hxx>       // SvxCharReliefItem
-#include <editeng/twolinesitem.hxx>         // SvxTwoLinesItem
-#include <editeng/charscaleitem.hxx>        // SvxCharScaleWidthItem
-#include <editeng/langitem.hxx>     // SvxLanguageItem
+#include <editeng/editids.hrc>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/contouritem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escapementitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/emphasismarkitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/langitem.hxx>
 
 // define ----------------------------------------------------------------
 
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index f583be678e1e..a5881ed2b2e0 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -20,7 +20,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>     // SID_ATTR_MACROITEM
+#include <sfx2/sfxsids.hrc>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index b38b45de9310..bfa69a5f6352 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -19,7 +19,7 @@
 
 #include <tools/shl.hxx>
 
-#include <svx/dialogs.hrc> // -> RID_SVXSTR_LANGUAGE_TABLE
+#include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
 
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index f2bc3a880a59..8a36e72eccc1 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE
+#include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 7d9bc2b73775..486a1cf8809c 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -41,7 +41,7 @@
 #include <svx/dlgutil.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <svx/viewpt3d.hxx> // Projection Type
+#include <svx/viewpt3d.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index b9cf4c6a4877..a5384b3d8377 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svx/fntszctl.hxx>     //
+#include <svx/fntszctl.hxx>
 #include <svx/dialogs.hrc>
 #include <editeng/fhgtitem.hxx>
 #include "editeng/fontitem.hxx"
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 68251fcd7e8c..0e0360f05a2f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -44,13 +44,13 @@
 #include <unotools/intlwrapper.hxx>
 #include <vcl/svapp.hxx>
 
-#include "svx/svdglob.hxx"  // string cache
+#include "svx/svdglob.hxx"
 #include "svx/svdstr.hrc"
 
 #include <svx/sdgcpitm.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdmodel.hxx>  // for DEGREE_CHAR
+#include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svx3ditems.hxx>
@@ -99,7 +99,7 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/xtable.hxx>    // for RGB_Color()
+#include <svx/xtable.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 05b13f59482a..1068cf55d5af 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdcrtv.hxx>
 #include "svx/xattr.hxx"
 #include <svx/svdundo.hxx>
-#include <svx/svdocapt.hxx> // special case: transparent filling after Create
+#include <svx/svdocapt.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index a2c4e79abd86..73d13ea33781 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -30,8 +30,8 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svddrgv.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index d8ea1f46a452..99db00d20a6d 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -20,7 +20,7 @@
 #include <vcl/metaact.hxx>
 #include <svx/svdedtv.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdograf.hxx>  // for Possibilities
+#include <svx/svdograf.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdopage.hxx>
@@ -28,9 +28,9 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdpoev.hxx>  // for the PolyPossiblities
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdpoev.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/e3dsceneupdater.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index edd1eec4be36..746ea47f13dd 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,9 +28,9 @@
 #include <tools/bigint.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdglob.hxx"
 #include "svx/svditer.hxx"
-#include "svx/svdstr.hrc"   // names taken from the resource
+#include "svx/svdstr.hrc"
 
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
@@ -38,16 +38,16 @@
 #include <svx/rectenum.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
-#include <svx/svdattr.hxx>  // for Get/SetGeoAttr
+#include <svx/svdattr.hxx>
 #include <svx/svdedtv.hxx>
-#include <svx/svdetc.hxx>   // for SearchOutlinerItems
-#include <svx/svdlayer.hxx> // for MergeNotPersistAttr
-#include <svx/svdopath.hxx>  // for Crook
+#include <svx/svdetc.hxx>
+#include <svx/svdlayer.hxx>
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svxids.hrc>   // for SID_ATTR_TRANSFORM_...
+#include <svx/svxids.hrc>
 #include <svx/sxallitm.hxx>
 #include <svx/sxmovitm.hxx>
 #include <svx/sxreaitm.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b54e96162535..490a69847e9e 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -20,16 +20,16 @@
 #include <svx/svdedtv.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdogrp.hxx>   // for grouping objects
-#include <svx/svdovirt.hxx>  // for VirtualObject bundling (Writer)
-#include <svx/svdopath.hxx>  // for CombineObjects
+#include <svx/svdogrp.hxx>
+#include <svx/svdovirt.hxx>
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include "svx/svditer.hxx"
-#include <svx/svdograf.hxx>  // for Possibilities
-#include <svx/svdoole2.hxx>  // and Mtf-Import
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdograf.hxx>
+#include <svx/svdoole2.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 83db1668d397..0260e6954c26 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -22,8 +22,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index fad91e91fe74..350c15b60568 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -20,9 +20,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <svx/svdlayer.hxx>
-#include <svx/svdmodel.hxx> // for Broadcasting
-#include "svx/svdglob.hxx"  // StringCache
-#include "svx/svdstr.hrc"   // names taken from the resource
+#include <svx/svdmodel.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 sal_Bool SetOfByte::IsEmpty() const
 {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 13f8c74fcd03..33f93082dfbd 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -26,11 +26,11 @@
 #include <svx/svdpage.hxx>
 #include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
-#include <svx/svdopath.hxx> // To turn off
-#include <svx/svdogrp.hxx>  // the cache at
-#include <svx/svdorect.hxx> // GetMarkDescription.
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdopath.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdorect.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index d874644df991..1693d49c583c 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -42,7 +42,7 @@
 #include <svx/xlnstit.hxx>
 
 #include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>   // for EditEngine::CreatePool()
+#include <editeng/editeng.hxx>
 
 #include <svx/xtable.hxx>
 
@@ -53,12 +53,12 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdotext.hxx>  // for ReformatAllTextObjects and CalcFieldValue
+#include <svx/svdotext.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/svdglob.hxx"  // StringCache
-#include "svx/svdstr.hrc"   // object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include "svdoutlinercache.hxx"
 
 #include "svx/xflclit.hxx"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index cdfd07048ab5..91207cb1655c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -43,9 +43,9 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdoedge.hxx>  // for broadcasting connectors to Move
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include <svx/svdoedge.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 37b93ca6359c..bfd1d4b81f98 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -46,12 +46,12 @@
 #include <tools/line.hxx>
 #include <vcl/cvtsvm.hxx>
 #include <vcl/graphictools.hxx>
-#include <vcl/metaact.hxx>   // for TakeContour
+#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vector>
 
 #include "svx/shapepropertynotifier.hxx"
-#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdglob.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/xlinjoit.hxx"
 
@@ -71,26 +71,26 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdocapt.hxx>  // Factory
-#include <svx/svdocirc.hxx>  // Factory
-#include <svx/svdoedge.hxx>  // Factory
-#include <svx/svdograf.hxx>  // Factory
-#include <svx/svdogrp.hxx>   // Factory
-#include <svx/svdomeas.hxx>  // Factory
+#include <svx/svdocapt.hxx>
+#include <svx/svdocirc.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdograf.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdomeas.hxx>
 #include <svx/svdomedia.hxx>
-#include <svx/svdoole2.hxx>  // Factory
-#include <svx/svdopage.hxx>  // Factory
-#include <svx/svdopath.hxx>  // Factory
-#include <svx/svdorect.hxx>  // Factory
-#include <svx/svdotext.hxx>  // Factory
-#include <svx/svdouno.hxx>   // Factory
-#include <svx/svdovirt.hxx>  // for Add/Del Ref
+#include <svx/svdoole2.hxx>
+#include <svx/svdopage.hxx>
+#include <svx/svdopath.hxx>
+#include <svx/svdorect.hxx>
+#include <svx/svdotext.hxx>
+#include <svx/svdouno.hxx>
+#include <svx/svdovirt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/svdstr.hrc>    // the object's name
+#include <svx/svdstr.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdview.hxx>   // for Dragging (check Ortho)
+#include <svx/svdview.hxx>
 #include <svx/sxlayitm.hxx>
 #include <svx/sxlogitm.hxx>
 #include <svx/sxmovitm.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index a41833ccf520..8e56d5b624af 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -28,8 +28,8 @@
 #include <tools/helpers.hxx>
 
 #include "svdconv.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx>
 #include <svx/sdr/properties/captionproperties.hxx>
@@ -43,7 +43,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svdview.hxx>   // for RectSnap
+#include <svx/svdview.hxx>
 #include <svx/sxcaitm.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svx/sxcgitm.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index e7b1dd8981e8..7414c9d0aa06 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -26,8 +26,8 @@
 #include <math.h>
 #include <svl/style.hxx>
 
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <svx/sdr/properties/circleproperties.hxx>
@@ -36,11 +36,11 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdocirc.hxx>
-#include <svx/svdopath.hxx> // for the object conversion
+#include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svdview.hxx>  // for dragging (Ortho)
+#include <svx/svdview.hxx>
 #include <svx/sxciaitm.hxx>
 #include <svx/sxcikitm.hxx>
 #include <svx/xlnedit.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index ebeea351cf5b..9e0b0ccf71a7 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svddrgm1.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 826d7f174da9..610f4d14a0df 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -36,9 +36,9 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdoedge.hxx>  // broadcast connectors to Move
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include <svx/svdoedge.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 0a69261a1a0b..4ba62076774e 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svdconv.hxx"
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a4cf0c1d9a5d..0c30e7ac9039 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -66,8 +66,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index c80bdf6e055f..8157b2d2a21c 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -19,8 +19,8 @@
 
 
 #include <svx/svdopage.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a9a6fe5e9568..11e551b8a5cd 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -30,9 +30,9 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
-#include <svx/svdview.hxx>  // for MovCreate when using curves
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdview.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnclit.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 1fb7b322fbe7..0d83e8c15db4 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -29,13 +29,13 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdocapt.hxx> // for Import of SdrFileVersion 2
-#include <svx/svdpagv.hxx> // for
-#include <svx/svdview.hxx> // the
-#include <svx/svdundo.hxx> // macro example
+#include <svx/svdocapt.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index feefd80e7ecb..35dd1cb2571e 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -20,14 +20,14 @@
 
 #include <comphelper/string.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdpagv.hxx>  // for the request in Paint to see whether
-#include <svx/svdview.hxx>  // the object is currently being edited
-#include <svx/svdpage.hxx>  // and for AnimationHandler (ticker text)
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svx/svdpage.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdmodel.hxx>  // OutlinerDefaults
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdmodel.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 912340fd2d3e..e4dc26966cd5 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -20,10 +20,10 @@
 #include <comphelper/string.hxx>
 #include <svl/style.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdmodel.hxx> // for GetMaxObjSize and GetStyleSheetPool
+#include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdorect.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight
-#include <svx/svdocapt.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight
+#include <svx/svdorect.hxx>
+#include <svx/svdocapt.hxx>
 #include <svx/svdetc.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/editdata.hxx>
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 22a220825360..1feda4eb3ee7 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -22,9 +22,9 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdorect.hxx> // for SetXPolyDirty in MovCreate at SolidDragging
-#include "svx/svdglob.hxx"  // Stringcache
-#include "svx/svdstr.hrc"   // the object's name
+#include <svx/svdorect.hxx>
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index f135b8707f7f..5d742461d0e0 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svx/svdotext.hxx>
-#include <svx/svdmodel.hxx> // for GetMaxObjSize
+#include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 3269efa00883..1fc5466ba64d 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -23,8 +23,8 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdpage.hxx>   // for Convert
-#include <svx/svdmodel.hxx>  // for Convert
+#include <svx/svdpage.hxx>
+#include <svx/svdmodel.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 3cb7d905c49b..1d15439dea13 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -37,8 +37,8 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/svdglob.hxx"  // string cache
-#include "svx/svdstr.hrc"   // the object's name
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 58943d2e30b7..addf15824787 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -34,9 +34,9 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdogrp.hxx>
-#include <svx/svdograf.hxx> // for SwapInAll()
-#include <svx/svdoedge.hxx> // for copying the connectors
-#include <svx/svdoole2.hxx> // special case OLE at SdrExchangeFormat
+#include <svx/svdograf.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdoole2.hxx>
 #include "svx/svditer.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 8ff5f021bdfd..8dc10a78695e 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -24,8 +24,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 5ec3adaebef9..bc78d6b6727b 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -27,8 +27,8 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/scene3d.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 45505090e8b9..c2b303230909 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -19,16 +19,16 @@
 
 #include <editeng/eeitem.hxx>
 
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdopath.hxx> // for GetContext
-#include <svx/svdograf.hxx> // for GetContext
-#include <svx/svdomedia.hxx> // for GetContext
-#include <svx/svdetc.hxx>   // for SdrEngineDefaults
+#include <svx/svdopath.hxx>
+#include <svx/svdograf.hxx>
+#include <svx/svdomedia.hxx>
+#include <svx/svdetc.hxx>
 
 #ifdef DBG_UTIL
 #include <svdibrow.hxx>
@@ -36,8 +36,8 @@
 
 #include "svx/svdoutl.hxx"
 #include "svx/svdview.hxx"
-#include "editeng/editview.hxx" // for GetField
-#include "editeng/flditem.hxx"  // for URLField
+#include "editeng/editview.hxx"
+#include "editeng/flditem.hxx"
 #include "svx/obj3d.hxx"
 #include "svx/svddrgmt.hxx"
 #include "svx/svdotable.hxx"
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f756f6057445..147637da393d 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -28,15 +28,15 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx> // to not have OLE in SdrClipboardFormat
+#include <svx/svdoole2.hxx>
 #include <svx/svdorect.hxx>
-#include <svx/svdoedge.hxx> // for connectors via the clipboard
-#include <svx/svdopage.hxx> // for connectors via the clipboard
+#include <svx/svdoedge.hxx>
+#include <svx/svdopage.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svdtrans.hxx> // for GetMapFactor, to rescale at PasteModel
-#include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
+#include <svx/svdtrans.hxx>
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 50330d4778f2..f5f14a43e0f0 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -56,16 +56,16 @@
 #include "svx/unoshtxt.hxx"
 #include "svx/svdpage.hxx"
 #include "svx/unoshprp.hxx"
-#include "svx/sxciaitm.hxx" // todo: remove
+#include "svx/sxciaitm.hxx"
 #include "svx/svdograf.hxx"
 #include "svx/unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
 #include <tools/gen.hxx>
-#include <tools/shl.hxx>    //
-#include "svx/dialmgr.hxx"      // not nice, we need our own resources some day
-#include "svx/dialogs.hrc"      //
+#include <tools/shl.hxx>
+#include "svx/dialmgr.hxx"
+#include "svx/dialogs.hrc"
 #include "svx/svdocapt.hxx"
 #include <svx/obj3d.hxx>
 #include <tools/diagnose_ex.h>