remove more commented out #includes and related comments

15 files changed, 3 insertions, 76 deletions

diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index aa77bba25d26..078a56060e41 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -40,9 +40,7 @@
 #include <svtools/transfer.hxx>
 #include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
-//#include <svx/galobj.hxx>
 #include <svx/galmisc.hxx>
-//#include <svx/gallery1.hxx>
 
 // -----------------
 // - GalleryObject -
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 7b58456a8889..f1eacafaae74 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -33,7 +33,6 @@
 #include <tools/urlobj.hxx>
 #include <svl/brdcst.hxx>
 #include "svx/svxdllapi.h"
-//#include "gallery.hrc"
 
 #include <cstdio>
 #include <list>
diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx
index 20035f7743e7..a359d2fe6239 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/xattr.hxx
@@ -27,21 +27,6 @@
 #ifndef _XATTR_HXX
 #define _XATTR_HXX
 
-// include ---------------------------------------------------------------
-
-#ifndef _XDEF_HXX
-//#include <svx/xdef.hxx>
-#endif
-#ifndef _XENUM_HXX
-//#include <svx/xenum.hxx>
-#endif
-#ifndef _XPOLY_HXX
-//#include <svx/xpoly.hxx>
-#endif
-#ifndef _SVX_RECTENUM_HXX
-//#include <svx/rectenum.hxx>
-#endif
-
 class XColorTable;
 class XDashTable;
 class XLineEndTable;
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index c151a7b2706a..2fceb8e3b29c 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -31,20 +31,15 @@
 // === includes (declaration) ============================================
 #include "databaseregistrationui.hxx"
 
-// === includes (UNO) ====================================================
-// === /includes (UNO) ===================================================
-
 // === includes (project) ================================================
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-//#include "connpooloptions.hxx"
-// === /includes (project) ===============================================
 
 // === includes (global) =================================================
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/msgbox.hxx>
-// === /includes (global) ================================================
+
 
 namespace svx
 {
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 8b9177a4a128..f1ac5b9ea96e 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -46,10 +46,8 @@
 
 #include <toolkit/unohlp.hxx>
 
-//#include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-//#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 1d60c5b4652a..cbae2e806334 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -31,16 +31,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#ifndef _SVX_CHARDLG_HXX
-//#include "chardlg.hxx"
-#endif
-#ifndef _SVX_PARAGRPH_HXX
-//#include "paragrph.hxx"
-#endif
 #include <editeng/eeitem.hxx>
-#ifndef _SVX_TABSTPGE_HXX
-//#include "tabstpge.hxx"
-#endif
 
 #include "flagsdef.hxx"
 #include <svl/intitem.hxx>
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 3014b42d4721..630bea9966fd 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -30,17 +30,8 @@
 
 #include <vcl/mapmod.hxx>
 
-//#include <svl/lstner.hxx>
-//#include <vcl/timer.hxx>
-//#include <svx/svdsob.hxx>
-//#include <svx/svdtypes.hxx> // fuer SdrLayerID
-//#include <svx/svdglue.hxx> // Klebepunkte
-//#include <svx/xdash.hxx>
-//#include <svx/xpoly.hxx>
-//#include <svx/xenum.hxx>
-//#include <basegfx/vector/b2dvector.hxx>
 #include <svx/rectenum.hxx>
-//#include <basegfx/polygon/b2dpolypolygon.hxx>
+
 
 class Bitmap;
 
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index be1265cb0c98..a50ccca56b7a 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -47,9 +47,6 @@
 #include <vos/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase6.hxx>
-//#ifndef _CPPUHELPER_COMPBASE7_HXX_
-//#include <cppuhelper/compbase7.hxx>
-//#endif
 #include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/implbase6.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 0962f2146e46..a32be64e66e2 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -28,17 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-// include ---------------------------------------------------------------
-
 #include <svx/SmartTagItem.hxx>
 
 #include <com/sun/star/container/XStringKeyMap.hpp>
 
 
-//#include <svl/memberid.hrc>
-//#include "svxids.hrc"
-//#include "svxitems.hrc"
-
 using namespace ::com::sun::star;
 
 TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 4ca809593607..1db4881454e5 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -28,14 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-// include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 #include <vcl/status.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/image.hxx>
-//#ifndef _SFXITEMPOOL_HXX
-//#include <svl/itempool.hxx>
-//#endif
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
@@ -54,16 +50,6 @@
 
 #define PAINT_OFFSET    5
 
-//#include <editeng/sizeitem.hxx>
-//#include <svx/dialmgr.hxx>
-//#include "dlgutil.hxx"
-//#include "stbctrls.h"
-
-//#include <svx/dialogs.hrc>
-
-//#include <unotools/localedatawrapper.hxx>
-//#include <comphelper/processfactory.hxx>
-
 
 SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item );
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b4f7422d78b4..7142cbe3725d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdedxv.hxx>
 #include <svl/solar.hrc>
 
-//#include <tools/string.h>
 #include <svl/itemiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/hatch.hxx>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 81c1ca029ede..cea3df88ad2c 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -61,7 +61,6 @@
 #include "editeng/fontitem.hxx"
 #include <editeng/fhgtitem.hxx>
 
-//#include <editeng/charscaleitem.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svl/style.hxx>
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index d155e084fff8..8494ffa61b42 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -50,7 +50,6 @@
 #include "editeng/editeng.hxx"
 #include "editeng/outlobj.hxx"
 
-//#include <tablertfexporter.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
index 023c271c5455..909ce34ea607 100644
--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.src
@@ -24,8 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- // include ---------------------------------------------------------------
- //#include "colrctrl.hrc"
+
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
  // pragma ----------------------------------------------------------------
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index f98fd57a0480..006c81d51525 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-// include ---------------------------------------------------------------
-
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 
 #include <com/sun/star/util/XURLTransformer.hpp>
@@ -55,7 +53,6 @@
 #include <svx/dialmgr.hxx>
 #include "svx/extrusioncolorcontrol.hxx"
 
-//#include "chrtitem.hxx"
 #include "helpid.hrc"
 #include "extrusioncontrols.hxx"
 #include "extrusioncontrols.hrc"