Another patch to remove commented out #includes and related comments.
Graeme
From a8b9b071e9a04fc5a5b046bc4971feac32185af8 Mon Sep 17 00:00:00 2001
From: J. Graeme Lingard <jgraeme+git@gmail.com>
Date: Tue, 5 Oct 2010 22:17:11 +0100
Subject: [PATCH] Remove redundant #include directives & comments
---
basic/inc/basic/testtool.hxx | 1 -
basic/source/app/appwin.hxx | 1 -
basic/source/app/processw.cxx | 1 -
basic/source/app/textedit.hxx | 1 -
basic/source/classes/eventatt.cxx | 1 -
basic/source/classes/sbunoobj.cxx | 1 -
basic/source/classes/sbxmod.cxx | 2 -
basic/source/inc/runtime.hxx | 5 --
basic/workben/mgrtest.cxx | 4 -
connectivity/inc/connectivity/sdbcx/VGroup.hxx | 3 -
connectivity/inc/connectivity/sdbcx/VIndex.hxx | 3 -
.../source/commontools/formattedcolumnvalue.cxx | 1 -
connectivity/source/drivers/calc/CTable.cxx | 4 -
connectivity/source/drivers/dbase/DTable.cxx | 2 -
connectivity/source/drivers/evoab/LTable.cxx | 3 -
connectivity/source/drivers/evoab2/NDriver.cxx | 3 -
connectivity/source/drivers/file/FTables.cxx | 3 -
connectivity/source/drivers/jdbc/Blob.cxx | 3 -
connectivity/source/drivers/jdbc/Reader.cxx | 4 +-
connectivity/source/inc/adabas/BDriver.hxx | 1 -
.../source/inc/ado/ADatabaseMetaDataResultSet.hxx | 3 -
connectivity/source/inc/ado/AResultSet.hxx | 3 -
connectivity/source/inc/dbase/DIndexPage.hxx | 11 +---
connectivity/source/inc/java/sql/SQLWarning.hxx | 3 -
.../deployment/manager/dp_commandenvironments.hxx | 1 -
desktop/source/deployment/misc/dp_misc.cxx | 2 -
desktop/source/migration/services/cexports.cxx | 2 +-
editeng/inc/editeng/AccessibleContextBase.hxx | 1 -
.../source/accessibility/AccessibleContextBase.cxx | 1 -
editeng/source/editeng/editattr.cxx | 1 -
formula/inc/formula/token.hxx | 2 -
formula/source/core/api/token.cxx | 7 --
fpicker/source/unx/kde4/KDE4FilePicker.hxx | 1 -
.../filepicker/VistaFilePickerEventHandler.cxx | 6 --
fpicker/source/win32/filepicker/platform_vista.h | 25 --------
framework/inc/threadhelp/readguard.hxx | 26 --------
framework/inc/threadhelp/resetableguard.hxx | 26 --------
framework/inc/threadhelp/writeguard.hxx | 27 --------
.../inc/uielement/comboboxtoolbarcontroller.hxx | 6 --
framework/source/dispatch/popupmenudispatcher.cxx | 1 -
framework/source/register/registerservices.cxx | 66 +-------------------
.../source/uielement/headermenucontroller.cxx | 1 -
framework/source/uielement/popupmenucontroller.cxx | 1 -
.../source/uielement/recentfilesmenucontroller.cxx | 1 -
idl/inc/object.hxx | 1 -
linguistic/source/lngsvcmgr.hxx | 2 -
46 files changed, 4 insertions(+), 270 deletions(-)
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 9a299d3..19c3dcd 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -42,7 +42,6 @@
// this routine became necessary
BOOL IsTTSignatureForUnicodeTextfile( String aLine );
-//#include "testapp.hxx"
#define ADD_ERROR_QUIET(nNr, aStr)
\
{
\
ErrorEntry *pErr;
\
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index c9550d1..cf17069 100644
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -28,7 +28,6 @@
#ifndef _APPWIN_HXX
#define _APPWIN_HXX
-//#include <sb.hxx>
#include <vcl/dockwin.hxx>
#include <tools/fsys.hxx>
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index c25f3e8..7fccbee 100644
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -34,7 +34,6 @@
#include <basic/sbx.hxx>
#include <basic/sbxvar.hxx>
-//#include <osl/thread.h>
#include <basic/ttstrhlp.hxx>
#include "processw.hxx"
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 78ca701..4472ea9 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -42,7 +42,6 @@ class BreakpointWindow;
#include "dataedit.hxx"
-//#include <xtextedt.hxx>
class TextEditImp : public Window, public SfxListener
{
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 4b1efef..38328ee 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-//#include <stl_queue.h>
#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 1744590..6f53cbf 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -27,7 +27,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-//#include <stl_queue.h>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/errcode.hxx>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 834d731..e26c907 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -47,8 +47,6 @@
#include "sbunoobj.hxx"
#include "sbtrace.hxx"
-
-//#include <basic/hilight.hxx>
#include <svtools/syntaxhighlight.hxx>
#include <basic/basrdll.hxx>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 9327dc5..f549659 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -57,11 +57,6 @@ using namespace com::sun::star::container;
// #define _OLD_FILE_IMPL
-//#include <sal/types.h>
-//#include <rtl/byteseq.hxx>
-//#include <rtl/ustring>
-
-
namespace basicEncoder
{
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index e312674..e6f2eda 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -37,10 +37,6 @@
#include <basic/sbmod.hxx>
#include <basic/basrdll.hxx>
-//#include <sv.hxx>
-//#include <basic.hxx>
-//#include <sostor.hxx>
-
// Defines for ToolBox-Id's
#define TB_NEW 1
#define TB_OPENSTORAGE 2
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 3fca7c9..a08f0a6 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -36,9 +36,6 @@
#include <com/sun/star/container/XNamed.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase4.hxx>
-//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-//#include "connectivity/CommonTools.hxx"
-//#endif
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/sdbcx/VCollection.hxx"
#include <comphelper/propertycontainer.hxx>
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 40ac1df..4a8d9e1 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -28,9 +28,6 @@
#ifndef _CONNECTIVITY_SDBCX_INDEX_HXX_
#define _CONNECTIVITY_SDBCX_INDEX_HXX_
-//#ifndef _OSL_DIAGNOSE_H_
-//#include <osl/diagnose.h>
-//#endif
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/container/XNamed.hpp>
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx
b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 90bb97a..7e84031 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/sdbc/DataType.hpp>
/** === end UNO includes === **/
-//#include <unotools/syslocale.hxx>
#include <tools/diagnose_ex.h>
#include <i18npool/mslangid.hxx>
#include <comphelper/numbers.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx
b/connectivity/source/drivers/calc/CTable.cxx
index f240660..0b9f280 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -30,9 +30,6 @@
#include "calc/CTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-//#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_
-//#include <com/sun/star/ucb/XContentAccess.hpp>
-//#endif
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -79,7 +76,6 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::util;
-// -------------------------------------------------------------------------
void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32&
rEndRow )
{
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 778c591..d0c5705 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -39,7 +39,6 @@
#include <tools/config.hxx>
#include "dbase/DIndex.hxx"
#include "dbase/DIndexes.hxx"
-//#include "file/FDriver.hxx"
#include <comphelper/sequence.hxx>
#include <svl/zforlist.hxx>
#include <unotools/syslocale.hxx>
@@ -51,7 +50,6 @@
#include <connectivity/dbconversion.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/property.hxx>
-//#include <unotools/calendarwrapper.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbhelper.hxx>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/evoab/LTable.cxx
b/connectivity/source/drivers/evoab/LTable.cxx
index e815474..72e8963 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -33,9 +33,6 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
-//#include <com/sun/star/sdbc/XRow.hpp>
-#endif
#include <svl/converter.hxx>
#include "LConnection.hxx"
#include "LColumns.hxx"
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx
b/connectivity/source/drivers/evoab2/NDriver.cxx
index d27af4e..f549619 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -31,9 +31,6 @@
#include "NConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "connectivity/dbexception.hxx"
-//#ifndef _CONNECTIVITY_EVOAB_CONFIGACCESS_HXX_
-//#include "LConfigAccess.hxx"
-//#endif
#include <osl/file.hxx>
#include "osl/security.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/file/FTables.cxx
b/connectivity/source/drivers/file/FTables.cxx
index 6bdd19a..1df809a 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -36,9 +36,6 @@
#include <com/sun/star/sdbcx/KeyType.hpp>
#include "file/FCatalog.hxx"
#include "file/FConnection.hxx"
-//#ifndef _CONNECTIVITY_FILE_OEMPTYCOLLECTION_HXX_
-//#include "file/FEmptyCollection.hxx"
-//#endif
using namespace connectivity;
using namespace connectivity::file;
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 276943b..defac86 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -30,9 +30,6 @@
#include "java/sql/Blob.hxx"
#include "java/tools.hxx"
#include "java/io/InputStream.hxx"
-#ifndef _INC_MEMORY
-//#include <memory.h>
-#endif
#include <connectivity/dbexception.hxx>
#include <string.h>
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx
b/connectivity/source/drivers/jdbc/Reader.cxx
index 51803f1..207dd04 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -28,11 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
#include "java/io/Reader.hxx"
-#ifndef _INC_MEMORY
-//#include <memory.h>
-#endif
#include <string.h>
using namespace connectivity;
+
//**************************************************************
//************ Class: java.io.Reader
//**************************************************************
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 34f6f43..92876f7 100644
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
@@ -36,7 +36,6 @@
#include <com/sun/star/lang/XEventListener.hpp>
-//#include <unotools/tempfile.hxx>
#include <cppuhelper/implbase4.hxx>
#include "odbc/OFunctiondefs.hxx"
#include "odbc/ODriver.hxx"
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 8bf0192..29ec29b 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -40,9 +40,6 @@
#include <cppuhelper/compbase7.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
-//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-//#include "connectivity/CommonTools.hxx"
-//#endif
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/StdTypeDefs.hxx"
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index a44abe4..cb8165a 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -42,9 +42,6 @@
#include <cppuhelper/compbase12.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
-//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-//#include "connectivity/CommonTools.hxx"
-//#endif
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx
b/connectivity/source/inc/dbase/DIndexPage.hxx
index 561d779..a4dc680 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -28,20 +28,11 @@
#ifndef _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
#define _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
-//#ifndef _REF_HXX
-//#include <tools/ref.hxx>
-//#endif
-#include <vos/ref.hxx>
+#include <vos/ref.hxx>
#include <tools/stream.hxx>
#ifndef _VECTOR_
#include <vector>
#endif
-//#ifndef _CONNECTIVITY_FILE_FCODE_HXX_
-//#include "file/fcode.hxx"
-//#endif
-//#ifndef _CONNECTIVITY_DBASE_INDEXNODE_HXX_
-//#include "dbase/dindexnode.hxx"
-//#endif
#if 0
namespace connectivity
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx
b/connectivity/source/inc/java/sql/SQLWarning.hxx
index a5591b5..1dda841 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -29,9 +29,6 @@
#define _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_
#include "java/sql/SQLException.hxx"
-//#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_
-//#include <com/sun/star/sdbc/SQLWarning.hpp>
-//#endif
namespace connectivity
{
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx
b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 702b1b3..b7d9f6a 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -30,7 +30,6 @@
#include "cppuhelper/compbase3.hxx"
-//#include "cppuhelper/implbase2.hxx"
#include "ucbhelper/content.hxx"
#include "com/sun/star/uno/Type.hxx"
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index c988e64..0b6a096 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -53,12 +53,10 @@
#include <comphelper/processfactory.hxx>
#ifdef WNT
-//#include "tools/prewin.h"
#define UNICODE
#define _UNICODE
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
-//#include "tools/postwin.h"
#endif
using namespace ::com::sun::star;
diff --git a/desktop/source/migration/services/cexports.cxx
b/desktop/source/migration/services/cexports.cxx
index a5b9bc8..4c331d0 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -31,7 +31,7 @@
#include "cppuhelper/implementationentry.hxx"
#include "basicmigration.hxx"
#include "wordbookmigration.hxx"
-//#include "extensionmigration.hxx"
+
extern "C"
{
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx
b/editeng/inc/editeng/AccessibleContextBase.hxx
index e5fdd01..0693b90 100644
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -28,7 +28,6 @@
#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
#define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
-//#include <editeng/ChildrenManager.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index b9d5a66..bcd175f 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -42,7 +42,6 @@
#include <comphelper/accessibleeventnotifier.hxx>
#include <rtl/uuid.h>
#include <vos/mutex.hxx>
-//#include <vcl/svapp.hxx>
#include <utility>
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 0e6ae86..8ebb5a5 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_editeng.hxx"
-//#include <eeng_pch.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index be1b2f6..831fb97 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -32,8 +32,6 @@
#include <string.h>
#include <vector>
#include "formula/opcode.hxx"
-//#include "refdata.hxx"
-//#include "scmatrix.hxx"
#include "formula/intruref.hxx"
#include <tools/mempool.hxx>
#include "formula/IFunctionDescription.hxx"
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index ccc7406..3ecf424 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -28,10 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_formula.hxx"
-
-
-// INCLUDE ---------------------------------------------------------------
-
#if STLPORT_VERSION<321
#include <stddef.h>
#else
@@ -47,9 +43,6 @@
#include "formula/tokenarray.hxx"
#include "formula/FormulaCompiler.hxx"
#include <formula/compiler.hrc>
-//#include "rechead.hxx"
-//#include "parclass.hxx"
-//#include "jumpmatrix.hxx"
#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
namespace formula
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index 3a59634..7bc37a6 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-//#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <osl/conditn.hxx>
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 5be3abd..463be59 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -28,10 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_fpicker.hxx"
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
#include "VistaFilePickerEventHandler.hxx"
#include "asyncrequests.hxx"
@@ -44,8 +40,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
-//#include <tools/urlobj.hxx>
-//#include <unotools/ucbhelper.hxx>
#include <osl/file.hxx>
diff --git a/fpicker/source/win32/filepicker/platform_vista.h
b/fpicker/source/win32/filepicker/platform_vista.h
index 3cb073e..9388710 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -47,31 +47,6 @@
#pragma warning(pop)
#endif
-// ATL/WTL
-//#include <atlbase.h>
-//#include <atlstr.h>
-//#include <atlapp.h>
-//extern CAppModule _Module;
-//#include <atlcom.h>
-//#include <atlwin.h>
-//#include <atlframe.h>
-//#include <atlcrack.h>
-//#include <atlctrls.h>
-//#include <atlctrlx.h>
-//#include <atldlgs.h>
-//#include <atlmisc.h>
-
-/*
-// STL
-#include <vector>
-
-// Global functions
-LPCTSTR PrepFilterString ( CString& sFilters );
-bool PathFromShellItem ( IShellItem* pItem, CString& sPath );
-bool BuildFilterSpecList ( _U_STRINGorID szFilterList,
- std::vector<CString>& vecsFilterParts,
- std::vector<COMDLG_FILTERSPEC>& vecFilters );
-*/
#if defined _M_IX86
#pragma comment(linker, "/manifestdependency:\"type='win32'
name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86'
publicKeyToken='6595b64144ccf1df' language='*'\"")
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index dc680f4..295dece 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -28,40 +28,14 @@
#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
#define __FRAMEWORK_THREADHELP_READGUARD_HXX_
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
#include <threadhelp/inoncopyable.h>
#include <threadhelp/irwlock.h>
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
#include <sal/types.h>
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
namespace framework{
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// declarations
-//_________________________________________________________________________________________________________________
-
/*-************************************************************************************************************//**
@short implement a guard to set read locks
@descr This guard should be used to set a lock for reading object internal
member.
diff --git a/framework/inc/threadhelp/resetableguard.hxx
b/framework/inc/threadhelp/resetableguard.hxx
index b929e70..2480c24 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -28,40 +28,14 @@
#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
#define __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
#include <threadhelp/inoncopyable.h>
#include <threadhelp/imutex.h>
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
#include <sal/types.h>
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
namespace framework{
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// declarations
-//_________________________________________________________________________________________________________________
-
/*-************************************************************************************************************//**
@short implement a guard for implementing save thread access
@descr These guard has an additional feature to well known one
::osl::Guard.
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index f882118..c86c939 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -28,39 +28,12 @@
#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
#define __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
#include <threadhelp/inoncopyable.h>
#include <threadhelp/irwlock.h>
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
namespace framework{
-//_________________________________________________________________________________________________________________
-// const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// declarations
-//_________________________________________________________________________________________________________________
-
/*-************************************************************************************************************//**
@short implement a guard to set write locks
@descr This guard should be used to set a lock for reading AND writing
object internal member.
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 33df553..96acc7a 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -32,12 +32,6 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/ControlCommand.hpp>
-//_________________________________________________________________________________________________________________
-// includes of other projects
-//_________________________________________________________________________________________________________________
-
-//#include <vcl/toolbox.hxx>
-//#include <vcl/combobox.hxx>
#include <uielement/complextoolbarcontroller.hxx>
namespace framework
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx
b/framework/source/dispatch/popupmenudispatcher.cxx
index d9ef9ed..1829687 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -26,7 +26,6 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-//#include "precompiled_framework.hxx"
//_________________________________________________________________________________________________________________
// my own includes
diff --git a/framework/source/register/registerservices.cxx
b/framework/source/register/registerservices.cxx
index 297431d..01827bf 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
-//_________________________________________________________________________________________________________________
-// includes of my own project
-//_________________________________________________________________________________________________________________
+
#include <macros/registration.hxx>
/*=================================================================================================================
@@ -58,29 +56,16 @@
=================================================================================================================*/
#include <services/urltransformer.hxx>
#include <services/desktop.hxx>
-//#include <services/tabwindowservice.hxx>
#include <services/frame.hxx>
#include <services/modulemanager.hxx>
-//#include <dispatch/oxt_handler.hxx>
#include <jobs/jobexecutor.hxx>
-//#include <recording/dispatchrecordersupplier.hxx>
-//#include <recording/dispatchrecorder.hxx>
-//#include <dispatch/mailtodispatcher.hxx>
-//#include <dispatch/servicehandler.hxx>
#include <jobs/jobdispatch.hxx>
#include <services/backingcomp.hxx>
-//#include <services/dispatchhelper.hxx>
#include <services/layoutmanager.hxx>
-//#include <services/license.hxx>
#include <uifactory/uielementfactorymanager.hxx>
#include <uifactory/popupmenucontrollerfactory.hxx>
-//#include <uielement/fontmenucontroller.hxx>
-//#include <uielement/fontsizemenucontroller.hxx>
#include <uielement/objectmenucontroller.hxx>
-//#include <uielement/headermenucontroller.hxx>
-//#include <uielement/footermenucontroller.hxx>
#include <uielement/controlmenucontroller.hxx>
-//#include <uielement/macrosmenucontroller.hxx>
#include <uielement/uicommanddescription.hxx>
#include <uiconfiguration/uiconfigurationmanager.hxx>
#include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -92,7 +77,6 @@
#include <uifactory/toolboxfactory.hxx>
#include <uifactory/addonstoolboxfactory.hxx>
#include "uiconfiguration/windowstateconfiguration.hxx"
-//#include <uielement/toolbarsmenucontroller.hxx>
#include "uifactory/toolbarcontrollerfactory.hxx"
#include "uifactory/statusbarcontrollerfactory.hxx"
#include <services/autorecovery.hxx>
@@ -101,15 +85,9 @@
#include <uifactory/statusbarfactory.hxx>
#include <uiconfiguration/uicategorydescription.hxx>
#include <services/sessionlistener.hxx>
-//#include <uielement/logoimagestatusbarcontroller.hxx>
-//#include <uielement/logotextstatusbarcontroller.hxx>
-//#include <uielement/newmenucontroller.hxx>
#include <services/taskcreatorsrv.hxx>
-//#include <uielement/simpletextstatusbarcontroller.hxx>
-//#include <services/uriabbreviation.hxx>
#include <uielement/langselectionstatusbarcontroller.hxx>
-//#include <uielement/langselectionmenucontroller.hxx>
#include <uiconfiguration/imagemanager.hxx>
#include <uifactory/windowcontentfactorymanager.hxx>
#include <services/substitutepathvars.hxx>
@@ -120,26 +98,14 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT
COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer )
COMPONENTINFO( ::framework::Desktop
)
COMPONENTINFO( ::framework::Frame )
- //COMPONENTINFO( ::framework::Oxt_Handler )
COMPONENTINFO( ::framework::JobExecutor )
- //COMPONENTINFO( ::framework::DispatchRecorderSupplier )
- //COMPONENTINFO( ::framework::DispatchRecorder )
- //COMPONENTINFO( ::framework::MailToDispatcher )
- //COMPONENTINFO( ::framework::ServiceHandler )
COMPONENTINFO( ::framework::JobDispatch )
COMPONENTINFO( ::framework::BackingComp )
- //COMPONENTINFO( ::framework::DispatchHelper )
COMPONENTINFO( ::framework::LayoutManager )
- //COMPONENTINFO( ::framework::License )
COMPONENTINFO( ::framework::UIElementFactoryManager )
COMPONENTINFO( ::framework::PopupMenuControllerFactory )
- //COMPONENTINFO( ::framework::FontMenuController )
- //COMPONENTINFO( ::framework::FontSizeMenuController )
COMPONENTINFO( ::framework::ObjectMenuController )
- //COMPONENTINFO( ::framework::HeaderMenuController )
- //COMPONENTINFO( ::framework::FooterMenuController )
COMPONENTINFO( ::framework::ControlMenuController )
- //COMPONENTINFO( ::framework::MacrosMenuController )
COMPONENTINFO( ::framework::UICommandDescription )
COMPONENTINFO( ::framework::ModuleManager )
COMPONENTINFO( ::framework::UIConfigurationManager )
@@ -153,7 +119,6 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer
COMPONENTINFO( ::framework::AddonsToolBoxFactory )
COMPONENTINFO( ::framework::WindowStateConfiguration )
COMPONENTINFO( ::framework::ToolbarControllerFactory )
- //COMPONENTINFO( ::framework::ToolbarsMenuController )
COMPONENTINFO( ::framework::AutoRecovery )
COMPONENTINFO( ::framework::StatusIndicatorFactory )
COMPONENTINFO( ::framework::RecentFilesMenuController )
@@ -161,17 +126,9 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer
COMPONENTINFO( ::framework::UICategoryDescription )
COMPONENTINFO( ::framework::StatusbarControllerFactory )
COMPONENTINFO( ::framework::SessionListener )
- //COMPONENTINFO( ::framework::LogoImageStatusbarController )
- //COMPONENTINFO( ::framework::LogoTextStatusbarController )
- //COMPONENTINFO( ::framework::NewMenuController )
COMPONENTINFO( ::framework::TaskCreatorService )
- //COMPONENTINFO( ::framework::SimpleTextStatusbarController )
- //COMPONENTINFO( ::framework::UriAbbreviation )
- //COMPONENTINFO( ::framework::PopupMenuDispatcher )
COMPONENTINFO( ::framework::ImageManager )
COMPONENTINFO( ::framework::LangSelectionStatusbarController )
- //COMPONENTINFO( ::framework::LanguageSelectionMenuController )
- //COMPONENTINFO( ::framework::TabWindowService )
COMPONENTINFO( ::framework::WindowContentFactoryManager )
COMPONENTINFO( ::framework::SubstitutePathVariables )
COMPONENTINFO( ::framework::PathSettings )
@@ -180,26 +137,14 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer
COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
) else
IFFACTORY( ::framework::Desktop
) else
IFFACTORY( ::framework::Frame ) else
- //IFFACTORY( ::framework::Oxt_Handler ) else
IFFACTORY( ::framework::JobExecutor ) else
- //IFFACTORY( ::framework::DispatchRecorderSupplier ) else
- //IFFACTORY( ::framework::DispatchRecorder ) else
- //IFFACTORY( ::framework::MailToDispatcher ) else
- //IFFACTORY( ::framework::ServiceHandler ) else
IFFACTORY( ::framework::JobDispatch ) else
IFFACTORY( ::framework::BackingComp ) else
- //IFFACTORY( ::framework::DispatchHelper ) else
IFFACTORY( ::framework::LayoutManager ) else
- //IFFACTORY( ::framework::License ) else
IFFACTORY( ::framework::UIElementFactoryManager ) else
IFFACTORY( ::framework::PopupMenuControllerFactory ) else
- //IFFACTORY( ::framework::FontMenuController ) else
- //IFFACTORY( ::framework::FontSizeMenuController ) else
IFFACTORY( ::framework::ObjectMenuController ) else
- //IFFACTORY( ::framework::HeaderMenuController ) else
- //IFFACTORY( ::framework::FooterMenuController ) else
IFFACTORY( ::framework::ControlMenuController ) else
- //IFFACTORY( ::framework::MacrosMenuController ) else
IFFACTORY( ::framework::UICommandDescription ) else
IFFACTORY( ::framework::ModuleManager ) else
IFFACTORY( ::framework::UIConfigurationManager ) else
@@ -213,7 +158,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
) else
IFFACTORY( ::framework::AddonsToolBoxFactory ) else
IFFACTORY( ::framework::WindowStateConfiguration ) else
IFFACTORY( ::framework::ToolbarControllerFactory ) else
- //IFFACTORY( ::framework::ToolbarsMenuController ) else
IFFACTORY( ::framework::AutoRecovery ) else
IFFACTORY( ::framework::StatusIndicatorFactory ) else
IFFACTORY( ::framework::RecentFilesMenuController ) else
@@ -222,18 +166,10 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
) else
IFFACTORY( ::framework::SessionListener ) else
IFFACTORY( ::framework::StatusbarControllerFactory ) else
IFFACTORY( ::framework::SessionListener ) else
- //IFFACTORY( ::framework::LogoImageStatusbarController ) else
- //IFFACTORY( ::framework::LogoTextStatusbarController ) else
IFFACTORY( ::framework::TaskCreatorService ) else
- //IFFACTORY( ::framework::NewMenuController ) else
- //IFFACTORY( ::framework::SimpleTextStatusbarController ) else
- //IFFACTORY( ::framework::UriAbbreviation ) else
- //IFFACTORY( ::framework::PopupMenuDispatcher ) else
IFFACTORY( ::framework::ImageManager ) else
IFFACTORY( ::framework::LangSelectionStatusbarController ) else
- //IFFACTORY( ::framework::LanguageSelectionMenuController ) else
IFFACTORY( ::framework::WindowContentFactoryManager ) else
- //IFFACTORY( ::framework::TabWindowService ) else
IFFACTORY( ::framework::SubstitutePathVariables
) else
IFFACTORY( ::framework::PathSettings
)
)
diff --git a/framework/source/uielement/headermenucontroller.cxx
b/framework/source/uielement/headermenucontroller.cxx
index f2aaa47..3a063db 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -58,7 +58,6 @@
#include <vcl/i18nhelp.hxx>
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
-//#include <tools/solar.hrc>
#include <dispatch/uieventloghelper.hxx>
#include <vos/mutex.hxx>
diff --git a/framework/source/uielement/popupmenucontroller.cxx
b/framework/source/uielement/popupmenucontroller.cxx
index 5f6e21c..275090b 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <toolkit/helper/vclunohelper.hxx>
-//#include <toolkit/unohlp.hxx>
#include <rtl/ref.hxx>
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index f376c17..7f4c756 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -62,7 +62,6 @@
#include <tools/postwin.h>
#include <odma_lib.hxx>
#endif
-//#include <tools/solar.hrc>
#include <dispatch/uieventloghelper.hxx>
#include <vos/mutex.hxx>
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 8b112fb..dbe84bb 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -29,7 +29,6 @@
#define _OBJECT_HXX
#define _SVSTDARR_ULONGS
-//#include <svtools/svstdarr.hxx>
#include <types.hxx>
#include <slot.hxx>
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 5ffb9de..75b25f5 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -40,8 +40,6 @@
#include <com/sun/star/linguistic2/XAvailableLocales.hpp>
#include <unotools/configitem.hxx>
-//#include <vcl/timer.hxx>
-
#include "misc.hxx"
#include "defs.hxx"
--
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.