A patch to remove more commented out #includes and related comments.
Graeme
From 01abcdc768774235a4e18277b9c90e2236c0e043 Mon Sep 17 00:00:00 2001
From: J. Graeme Lingard <jgraeme+git@gmail.com>
Date: Wed, 6 Oct 2010 01:18:58 +0100
Subject: [PATCH] Remove redundant #include directives & comments
---
connectivity/source/drivers/mozab/MCatalog.hxx | 3 --
embeddedobj/source/general/docholder.cxx | 3 --
embeddedobj/source/msole/xdialogcreator.cxx | 2 -
formula/inc/formula/formula.hxx | 1 -
formula/inc/formula/funcutl.hxx | 1 -
fpicker/source/aqua/FPentry.cxx | 16 -----------
fpicker/source/aqua/FilterHelper.cxx | 3 --
fpicker/source/aqua/FilterHelper.hxx | 20 --------------
fpicker/source/aqua/NSString_OOoAdditions.hxx | 1 -
framework/source/layoutmanager/layoutmanager.cxx | 2 -
sfx2/inc/sfx2/minarray.hxx | 1 -
sfx2/inc/sfx2/prnmon.hxx | 2 +-
sfx2/source/appl/appcfg.cxx | 2 -
sfx2/source/appl/appuno.cxx | 1 -
sfx2/source/appl/linksrc.cxx | 1 -
sfx2/source/appl/shutdownicon.cxx | 1 -
sfx2/source/config/config.src | 2 -
sfx2/source/dialog/dinfdlg.cxx | 1 -
sfx2/source/dialog/filedlghelper.src | 5 ---
sfx2/source/doc/doc.src | 2 +-
sfx2/source/doc/docfile.cxx | 2 -
sfx2/source/doc/objitem.cxx | 1 -
sfx2/source/doc/objserv.cxx | 1 -
sfx2/source/inc/objshimp.hxx | 2 -
sfx2/source/inc/versdlg.hxx | 2 -
.../source/win32/shlxthandler/ooofilt/ooofilt.cxx | 1 -
shell/source/win32/simplemail/senddoc.cxx | 3 --
svx/inc/galtheme.hxx | 2 -
svx/inc/svx/gallery1.hxx | 1 -
svx/inc/xattr.hxx | 15 ----------
svx/source/dialog/databaseregistrationui.cxx | 7 +----
svx/source/dialog/docrecovery.cxx | 2 -
svx/source/form/fmtextcontroldialogs.cxx | 9 ------
svx/source/inc/svdoimp.hxx | 11 +-------
svx/source/inc/svxrectctaccessiblecontext.hxx | 3 --
svx/source/items/SmartTagItem.cxx | 6 ----
svx/source/stbctrls/xmlsecctrl.cxx | 14 ----------
svx/source/svdraw/svdedxv.cxx | 1 -
svx/source/svdraw/svdoattr.cxx | 1 -
svx/source/table/tablertfexporter.cxx | 1 -
svx/source/tbxctrls/colrctrl.src | 3 +-
svx/source/tbxctrls/extrusioncontrols.cxx | 3 --
ucb/source/ucp/ftp/ftpcontent.cxx | 1 -
ucb/source/ucp/ftp/test.cxx | 28 --------------------
ucb/source/ucp/odma/odma_lib.cxx | 3 --
vbahelper/source/msforms/vbamultipage.hxx | 1 -
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 -
xmloff/inc/xmloff/styleexp.hxx | 3 --
xmloff/source/chart/SchXMLTableContext.hxx | 1 -
xmloff/source/style/styleexp.cxx | 3 --
xmloff/source/text/txtstyle.cxx | 12 --------
51 files changed, 5 insertions(+), 210 deletions(-)
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx
b/connectivity/source/drivers/mozab/MCatalog.hxx
index b4dd3f8..58f48e8 100644
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
@@ -28,9 +28,6 @@
#define _CONNECTIVITY_MOZAB_CATALOG_HXX_
#include "connectivity/sdbcx/VCatalog.hxx"
-// #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-// #include "odbc/OFunctiondefs.hxx"
-// #endif
namespace connectivity
{
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index e38d964..b8638f8 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -83,9 +83,6 @@
#include "intercept.hxx"
-// #include <toolkit/helper/vclunohelper.hxx>
-// #include <vcl/window.hxx>
-
#define HATCH_BORDER_WIDTH
(((m_pEmbedObj->getStatus(embed::Aspects::MSOLE_CONTENT)&embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE)
&& \
m_pEmbedObj->getCurrentState()!=embed::EmbedStates::UI_ACTIVE) ? 0 :
4 )
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx
b/embeddedobj/source/msole/xdialogcreator.cxx
index 312b7ed..aec50d4 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -45,8 +45,6 @@
#include "xdialogcreator.hxx"
#include "oleembobj.hxx"
-// LLA: tip from FS
-// #include <confighelper.hxx>
#include <xdialogcreator.hxx>
#include <oleembobj.hxx>
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 812c663..6af6a07 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -29,7 +29,6 @@
#define FORMULA_FORMULA_HXX
#include <sfx2/basedlgs.hxx>
-// #include "formula/funcutl.hxx"
#include <memory>
#include "formula/formuladllapi.h"
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index a659609..4482e71 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -28,7 +28,6 @@
#ifndef FORMULA_FUNCUTL_HXX
#define FORMULA_FUNCUTL_HXX
-// #include <vcl/scrbar.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index d38c0a0..4f93f90 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -25,27 +25,14 @@
*
************************************************************************/
-//----------------------------------------------
-// includes of other projects
-//----------------------------------------------
-
#include <cppuhelper/factory.hxx>
#include <com/sun/star/container/XSet.hpp>
-// #ifndef _OSL_DIAGNOSE_H_
-// #include <osl/diagnose.h>
-// #endif
#include "SalAquaFilePicker.hxx"
#include "SalAquaFolderPicker.hxx"
-// #ifndef _SV_SVAPP_HXX
-// #include <vcl/svapp.hxx>
-// #endif
#include "FPServiceInfo.hxx"
-//-----------------------------------------------
-// namespace directives
-//-----------------------------------------------
using namespace ::rtl;
using namespace ::com::sun::star::uno;
@@ -56,9 +43,6 @@ using namespace ::cppu;
using ::com::sun::star::ui::dialogs::XFilePicker;
using ::com::sun::star::ui::dialogs::XFolderPicker;
-//------------------------------------------------
-//
-//------------------------------------------------
static Reference< XInterface > SAL_CALL createFileInstance(
const Reference< XMultiServiceFactory >& rServiceManager )
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index 4b31168..180cbb5 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -30,9 +30,6 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-// #ifndef _OSL_DIAGNOSE_H_
-// #include <osl/diagnose.h>
-// #endif
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
#include "NSURL_OOoAdditions.hxx"
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index e760518..e3da37b 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -28,22 +28,6 @@
#ifndef _FILTERHELPER_HXX_
#define _FILTERHELPER_HXX_
-// #ifndef _COM_SUN_STAR_UNO_TYPE_HXX_
-// #include <com/sun/star/uno/Type.hxx>
-// #endif
-
-// #ifndef INCLUDED_CPPU_UNOTYPE_HXX
-// #include <cppu/unotype.hxx>
-// #endif
-
-// #ifndef _TYPELIB_TYPECLASS_H_
-// #include "typelib/typeclass.h"
-// #endif
-
-// #ifndef _TYPELIB_TYPEDESCRIPTION_H_
-// #include "typelib/typedescription.h"
-// #endif
-
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -51,10 +35,6 @@
#include <com/sun/star/uno/RuntimeException.hpp>
-// #ifndef _RTL_USTRING_H_
-// #include <rtl/ustring.hxx>
-// #endif
-
#include <list>
#include <vector>
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx
b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index 5c7a9b3..6ad81b1 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -32,7 +32,6 @@
#import <Cocoa/Cocoa.h>
#include <postmac.h>
#include <rtl/ustring.hxx>
-// #include <sal/types.h>
//for Cocoa types
@interface NSString (OOoAdditions)
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index cb6614e..6a8a5ac 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -32,8 +32,6 @@
// my own includes
//_________________________________________________________________________________________________________________
-// #include <math.h>
-
#include <services/layoutmanager.hxx>
#include <threadhelp/resetableguard.hxx>
#include <services.h>
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index e7bb535..9a792eb 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -34,7 +34,6 @@
#include <string.h>
#include <tools/solar.h>
#include <tools/debug.hxx>
-//#include "typecast.hxx"
#if defined (ALPHA) && defined (UNX)
#define DEL_ARRAY( X )
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 038f9d1..e9a698d 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -33,7 +33,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <sfx2/printer.hxx>
-//#include <sfx2/progress.hxx>
+
class SfxViewShell;
//class SfxProgress;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 344a874..74c79c1 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -54,8 +54,6 @@
#include <sfx2/sfxsids.hrc>
#include <sot/exchange.hxx>
-//#include <svtools/agprop.hxx>
-//#include <sj2/sjapplet.hxx>
#include <svl/isethint.hxx>
#include <unotools/configmgr.hxx>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index f487d07..dd63f16 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -132,7 +132,6 @@ using namespace ::com::sun::star::io;
#include "brokenpackageint.hxx"
#include "eventsupplier.hxx"
#include "xpackcreator.hxx"
-// #include "applet.hxx"
#include "plugin.hxx"
#include "iframe.hxx"
#include <ownsubfilterservice.hxx>
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 16d48e7..ce6a50d 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -30,7 +30,6 @@
#include <sfx2/linksrc.hxx>
#include <sfx2/lnkbase.hxx>
-//#include <sot/exchange.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 5792179..c75f391 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -34,7 +34,6 @@
#include <vos/mutex.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/miscopt.hxx>
-// #include <cmdlineargs.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
diff --git a/sfx2/source/config/config.src b/sfx2/source/config/config.src
index 8aea35b..515dbca 100644
--- a/sfx2/source/config/config.src
+++ b/sfx2/source/config/config.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-//#include "config.hrc"
-//#include "sfxlocal.hrc"
#include <sfx2/sfx.hrc>
String STR_FILTERNAME_CFG
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 24d2950..f843d17 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -67,7 +67,6 @@
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/request.hxx>
-//#include "exptypes.hxx"
#include "helper.hxx"
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src
index 2b071a2..e25fa40 100644
--- a/sfx2/source/dialog/filedlghelper.src
+++ b/sfx2/source/dialog/filedlghelper.src
@@ -25,14 +25,9 @@
*
************************************************************************/
-// includes ******************************************************************
-
#include "sfxlocal.hrc"
#include "filedlghelper.hrc"
-//#include "helpid.hrc"
-
-// strings *******************************************************************
String STR_SFX_FILEDLG_ACTUALVERSION
{
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 8386feb..4df8c77 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -28,7 +28,7 @@
#include "doc.hrc"
#define __RSC
#include <svl/inetdef.hxx>
-//#include <so3/so2defs.hxx>
+
// -----------------------------------------------------------------------
QueryBox MSG_CONFIRM_FILTER
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b461bc5..aee27c0 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -143,8 +143,6 @@ using namespace ::com::sun::star::io;
#include "sfxresid.hxx"
#include <sfx2/appuno.hxx>
-//#include "xmlversion.hxx"
-
#define MAX_REDIRECT 5
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 0b1e6b3..d58dbd9 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -32,7 +32,6 @@
#endif
#include <sfx2/objsh.hxx>
-//#include "objshimp.hxx"
#include <sfx2/objitem.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index d40c5d8..386fdc2 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -84,7 +84,6 @@
#include <sfx2/objsh.hxx>
#include "objshimp.hxx"
#include "sfxtypes.hxx"
-//#include "interno.hxx"
#include <sfx2/module.hxx>
#include <sfx2/viewfrm.hxx>
#include "versdlg.hxx"
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index c7f5d10..243e846 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -27,8 +27,6 @@
#ifndef _SFX_OBJSHIMP_HXX
#define _SFX_OBJSHIMP_HXX
-//#include <hash_map>
-
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index e2a43a1..8273081 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -28,8 +28,6 @@
#ifndef _VERSDLG_HXX
#define _VERSDLG_HXX
-// #include *****************************************************************
-
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <svtools/svtabbx.hxx>
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 89b0cc4..038d971 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -43,7 +43,6 @@
//--------------------------------------------------------------------------
#include "internal/contentreader.hxx"
#include "internal/metainforeader.hxx"
-//#include "internal/utilities.hxx"
#include "internal/registry.hxx"
#include "internal/fileextensions.hxx"
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 42f5b9e..572312c 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -29,9 +29,6 @@
#include "precompiled_shell.hxx"
#include <osl/diagnose.h>
-#ifndef _RTL_STRING_HXX_
-//#include <rtl/string.hxx>
-#endif
#include "simplemapi.hxx"
#define WIN32_LEAN_AND_MEAN
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 6a51190..1463922 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 6cd5ca8..db05464 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 d4f4bd4..0fdf5fb 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 53267a2..4955014 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 09df892..95e898a 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 433f6c0..cfbccad 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 f95cb0c..888fd5d 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 69691dc..205b2d8 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 2f5b7fa..ee8ab67 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 858ed1e..251a139 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 aaeb777..031d4c4 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 79148e5..9b361e1 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 bbdb03a..f34f0f1 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 da7b5eb..151261e 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 86efecf..6f71e46 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"
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index e01a209..96e47f1 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -77,7 +77,6 @@
#include <com/sun/star/ucb/MissingInputStreamException.hpp>
#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
#include <com/sun/star/ucb/NameClashException.hpp>
-//#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/ucb/IOErrorCode.hpp>
diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx
index d15cbf9..d14865d 100644
--- a/ucb/source/ucp/ftp/test.cxx
+++ b/ucb/source/ucp/ftp/test.cxx
@@ -37,34 +37,6 @@
#include "test_ftpurl.hxx"
#include <stdio.h>
#include <unistd.h>
-
-// #include <osl/process.h>
-// #include <osl/thread.hxx>
-
-// #include <ucbhelper/configurationkeys.hxx>
-// #include <cppuhelper/bootstrap.hxx>
-// #include <cppuhelper/servicefactory.hxx>
-// #include <comphelper/processfactory.hxx>
-// #include <comphelper/regpathhelper.hxx>
-// #include <com/sun/star/lang/XComponent.hpp>
-// #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-// #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-// #include <com/sun/star/ucb/XContent.hpp>
-// #include <com/sun/star/ucb/XContentProvider.hpp>
-// #include <com/sun/star/ucb/XCommandProcessor.hpp>
-// #include <com/sun/star/ucb/OpenMode.hpp>
-// #include <com/sun/star/ucb/Command.hpp>
-// #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-// #include <com/sun/star/io/XActiveDataSink.hpp>
-// #include <com/sun/star/beans/Property.hpp>
-
-
-// #include "debughelper.hxx"
-// #include "test_activedatasink.hxx"
-// #include "test_ftpurl.hxx"
-// #include "test_multiservicefac.hxx"
-// #include "ftpcontentprovider.hxx"
-// #include "ftpcontentidentifier.hxx"
// using namespace test_ftp;
diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 3f27bbd..cf7ed3c 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -27,9 +27,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
-//#ifndef _OSL_PROCESS_H_
-//#include <osl/process.h>
-//#endif
#include <osl/module.h>
#include <rtl/ustring.hxx>
#include <tools/prewin.h>
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index 75c0da0..9fd3e66 100644
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
@@ -32,7 +32,6 @@
#include "vbacontrol.hxx"
#include <vbahelper/vbahelper.hxx>
-//#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase1.hxx>
typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 0a86b86..ab1440e 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -548,8 +548,6 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
}
-// #include <stdio.h>
-
void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException )
{
// fprintf(stdout,"url send to xmlhelp:
%s\n",(rtl::OUStringToOString(m_aURL,RTL_TEXTENCODING_UTF8).getStr()));
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index 0599220..9104dbd 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -32,9 +32,6 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
-#ifndef _VCL_MAPUNIT_HXX
-//#include <tools/mapunit.hxx>
-#endif
#include <xmloff/uniref.hxx>
namespace com { namespace sun { namespace star
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index c6ecd06..96a2d0e 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -29,7 +29,6 @@
#include <xmloff/xmlictxt.hxx>
#include "SchXMLImport.hxx"
-// #include "SchXMLChartContext.hxx"
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index d5fabfd..307cb0c 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -35,9 +35,6 @@
#include <xmloff/nmspmap.hxx>
#include "xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
-#ifndef _XMLOFF_XMLITMAP_HXX
-//#include "xmlitmap.hxx"
-#endif
#include <xmloff/xmluconv.hxx>
#include <xmloff/attrlist.hxx>
#include <xmloff/xmlprmap.hxx>
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index c5342a3..87ee2f0 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -28,9 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
-#ifndef _TOOLS_DEBUG_HXX
-//#include <tools/debug.hxx>
-#endif
#include <com/sun/star/style/ParagraphStyleCategory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -40,14 +37,8 @@
#include <xmloff/xmltoken.hxx>
-#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
-//#include <xmloff/xmlprmap.hxx>
-#endif
#include "xmlnmspe.hxx"
#include <xmloff/families.hxx>
-#ifndef _XMLOFF_TXTPRMAP_HXX
-//#include <xmloff/txtprmap.hxx>
-#endif
#include <xmloff/txtparae.hxx>
#include <xmloff/xmlnume.hxx>
#include <xmloff/xmlexp.hxx>
@@ -56,9 +47,6 @@
#include "txtexppr.hxx"
#include <xmloff/txtprmap.hxx>
-#ifndef _XMLOFF_STYLEEXP_HXX
-//#include <xmloff/styleexp.hxx>
-#endif
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
--
1.7.1
Context
- [Libreoffice] [PATCH] Libs-core - Remove redundant #include directives & comments · jgraeme
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.