diff options
46 files changed, 3 insertions, 269 deletions
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx index 37e90bb5cd68..05eb70db84a8 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 0e864e69eef9..7df72eed16f0 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 7c1d4a5afb19..71fced98a4cf 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 354c94dc44ab..b3cc40381de6 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 791e9fe5a8c1..463a4c80685c 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 1659d9c8b317..684edbc11bbe 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 8b1069bbeab3..8b28c34f0fdd 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 d61b91284042..cd75be1a1ec2 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 fb21ccb0b9d3..8f702f73b58c 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 b65b4cd2fda4..a134f4dd7f6a 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 b0669fdda540..f04e9e917424 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 3707b7fdb65d..5a67b524296e 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 a4e5f35825f5..16c0685ad95a 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 5efc5860e5e5..569473301168 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 6bb15e860b08..e3fecaafba6c 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 37937f5bb57e..521902227ad1 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 48e08af52e70..f70f20fbbd65 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 cd448754585f..cb8fcca90605 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 4224929332fa..2feaf7aaf804 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 3b73da08cc6f..b435c6d1534f 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 ce422f7ce528..a84a43a07dee 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 01d7796c03d4..277a0a7b3968 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 ad67a7f7ee20..638fcdad51e9 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 <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 60b74c3a0151..01a2152339c8 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 aa21f8281c72..44933c02c416 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 cfdac4068130..8884e35a3709 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 cf9a9ab30b0c..08a1a7a70548 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 2358e8120917..1764be58844e 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 e35626491cf9..b5cda41872c3 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 a1d4a66b8fb1..4716d9ec4217 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 f7c53ec93c19..9312f9fd0005 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 84f09add4a0c..858232331341 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 a7983a72590f..43f8a820070c 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 2fadaa6bfdff..e7053102dd9f 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 e8812909f757..d5eaa8ae74d0 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 997042c9e601..760fdf8b9f87 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 58830189e052..f04fd2e0e4e1 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 07dbdf6fe466..d958f407b7c0 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 bc55ff78cd64..a3e6139a857c 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 834d11017ec8..d9b0f4d12015 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 6e3fa878bbb1..7f093e139e1e 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 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 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 2ee7aad7dd46..5c7fddf5ce97 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 328777db2b79..b694c7cdbc36 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 128d1d896f80..a1d711ed6b73 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 377c5bf0a959..592c122cd798 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 953e531960bf..ff3060172e84 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" |