summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--automation/source/app/testbasi.cxx14
-rw-r--r--automation/source/server/server.cxx3
-rw-r--r--automation/source/server/statemnt.hxx3
-rw-r--r--automation/source/testtool/objtest.cxx6
-rw-r--r--automation/source/testtool/registry_win.cxx1
-rw-r--r--basctl/source/basicide/baside2.cxx4
-rw-r--r--basctl/source/basicide/baside2b.cxx3
-rw-r--r--basctl/source/basicide/objdlg.cxx4
-rw-r--r--basctl/source/dlged/managelang.cxx3
-rw-r--r--basctl/source/inc/baside3.hxx4
-rw-r--r--basctl/util/hidother.src1
-rw-r--r--cui/source/customize/cfg.cxx6
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/tabpages/tabarea.cxx2
-rw-r--r--cui/source/tabpages/tabline.cxx2
-rw-r--r--cui/source/tabpages/tparea.cxx1
-rw-r--r--cui/source/tabpages/tpbitmap.cxx7
-rw-r--r--cui/source/tabpages/tpcolor.cxx1
-rw-r--r--cui/source/tabpages/tpgradnt.cxx6
-rw-r--r--cui/source/tabpages/tphatch.cxx6
-rw-r--r--cui/source/tabpages/tpline.cxx3
-rw-r--r--cui/source/tabpages/tplnedef.cxx6
-rwxr-xr-xembedserv/source/embed/ed_idataobj.cxx2
-rw-r--r--extensions/source/bibliography/general.hxx3
-rw-r--r--extensions/source/ole/jscriptclasses.hxx1
-rw-r--r--extensions/source/ole/unotypewrapper.hxx1
-rwxr-xr-xextensions/source/update/check/updatecheck.cxx2
-rw-r--r--extensions/test/ole/AxTestComponents/AxTestComponents.cpp4
-rw-r--r--extensions/test/ole/AxTestComponents/Basic.cpp3
-rw-r--r--extensions/test/ole/AxTestComponents/Basic.h3
-rw-r--r--extensions/test/ole/AxTestComponents/Foo.cpp3
-rw-r--r--extensions/test/ole/AxTestComponents/Foo.h3
-rw-r--r--extensions/test/ole/AxTestComponents/StdAfx.cpp3
-rw-r--r--extensions/test/ole/OleClient/axhost.hxx1
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx1
-rw-r--r--extensions/test/ole/cpnt/cpnt.cxx1
-rw-r--r--extensions/test/sax/testsax.cxx2
-rw-r--r--extensions/test/sax/testwriter.cxx2
-rw-r--r--extensions/workben/testcomponent.cxx1
-rw-r--r--extensions/workben/testframecontrol.cxx1
-rwxr-xr-xlingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx1
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx3
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx2
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.cxx3
-rw-r--r--setup_native/source/win32/customactions/javafilter/jfregca.cxx1
-rwxr-xr-xsetup_native/source/win32/customactions/reg64/reg64.cxx9
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx19
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx1
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx6
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx2
-rw-r--r--xmlsecurity/tools/demo/performance.cxx8
52 files changed, 14 insertions, 170 deletions
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
index 292cd70b34a4..a4cbb5c0c4db 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -34,24 +34,10 @@
#endif
#include <basic/testtool.hxx>
#include "testbasi.hxx"
-//#include "app.hxx"
-//#include "basic.hrc"
-//#include "appbased.hxx"
#define P_FEHLERLISTE TestToolObj::pFehlerListe
-//#include "status.hxx"
-//#include "basic.hrc"
-
-//#include "object.hxx"
-
#include <testapp.hxx>
#include <testtool.hxx>
-#ifndef _SB_INTERN_HXX
-//#include "sbintern.hxx"
-#endif
-
-//#include "comm_bas.hxx"
-//#include "processw.hxx"
TYPEINIT1(TTBasic,MyBasic)
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index e4e59251dd63..48bf1a2c3066 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -59,9 +59,6 @@
#include <vcl/bitmap.hxx>
// Hat keinen Includeschutz
#include <svtools/svtdata.hxx>
-//#ifndef _DTRANS_HXX //autogen
-//#include <so2/dtrans.hxx>
-//#endif
#endif // 1
#include <rtl/textenc.h>
#include <rtl/uri.h>
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index 4e580a09749c..9f7b43137fbf 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -44,9 +44,6 @@
#include <tools/string.hxx>
#include <tools/debug.hxx>
#include <tools/time.hxx>
-#ifndef _SV_DRAG_HXX //autogen
-//#include <vcl/drag.hxx>
-#endif
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <tools/fsys.hxx>
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 2361361f277f..cf50f27a9164 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -28,13 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-/*#include <com/sun/star/devtools/XIServerProxy.hpp>
-#include <com/sun/star/devtools/XInformationClient.hpp>
-using namespace com::sun::star::devtools;
-*/
#ifdef OS2
#define INCL_DOS
-//#include <vcl/sysdep.hxx>
#ifndef _SVPM_H
#include <svpm.h>
#endif
@@ -90,7 +85,6 @@ using namespace rtl;
#include <basic/sbuno.hxx>
-//#include <basic/basrid.hxx>
#include <basic/basicrt.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index d0b1c0a0aa1b..dc57e5f1ce0b 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -43,7 +43,6 @@
// #undef IS_ERROR
#endif
-//#include <tchar.h>
#include "registry_win.hxx"
#include <osl/thread.h>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index a8d5b37c6a4a..b17d8b81d02c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -65,10 +65,6 @@
#include <vcl/sound.hxx>
-//#ifndef _TXTCMP_HXX //autogen
-//#include <svtools/txtcmp.hxx>
-//#endif
-
#include <unotools/textsearch.hxx>
#include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b6b4accb7dd6..3d6f8486a716 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -56,9 +56,6 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/help.hxx>
-//#ifndef _SFX_HELP_HXX //autogen
-//#include <sfx2/sfxhelp.hxx>
-//#endif
#include <unotools/sourceviewconfig.hxx>
#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index ac7a2c28531d..4fd19927d089 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -46,10 +46,6 @@
#include <iderdll2.hxx>
#include <sbxitem.hxx>
-//#ifndef _SFX_HELP_HXX //autogen
-//#include <sfx2/sfxhelp.hxx>
-//#endif
-
ObjectTreeListBox::ObjectTreeListBox( Window* pParent, const ResId& rRes )
: BasicTreeListBox( pParent, rRes )
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 41c86699203b..55f51dcea90b 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -47,9 +47,6 @@
#include <com/sun/star/resource/XStringResourceManager.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/unohelp.hxx>
-#ifndef _VCL_I18NHELP_HXX
-//#include <vcl/i18nhelp.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index c55e5bd721d5..bb1705178a80 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -28,10 +28,6 @@
#ifndef _BASIDE3_HXX
#define _BASIDE3_HXX
-#ifndef _SVHEADER_HXX
-//#include <svheader.hxx>
-#endif
-
#include <bastypes.hxx>
#include <svl/undo.hxx>
#include <vcl/dialog.hxx>
diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src
index cd8fe7b26bf5..ce2607b3296d 100644
--- a/basctl/util/hidother.src
+++ b/basctl/util/hidother.src
@@ -25,7 +25,6 @@
*
************************************************************************/
#include "../inc/helpid.hrc" // HID_XXX
-//#include "hidother.hrc"
hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; };
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 022cc1cfb72c..ec4d0ed58ac8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -41,12 +41,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/scrbar.hxx>
-//added for issue73355
-//#ifndef _SV_SVDATA_HXX
-//#include <vcl/svdata.hxx>
-//#endif
-//issue73355 ends
-
#include <sfx2/app.hxx>
#include <sfx2/sfxdlg.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4b104c6739ff..8a385f3c89e7 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -28,8 +28,6 @@
#ifndef _ACCCFG_HXX
#define _ACCCFG_HXX
-// #include *****************************************************************
-
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index dcc0424bb275..a1d07b5f3c1a 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
-
#include <tools/ref.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 02280cb587a8..a7683cf01416 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/pathoptions.hxx>
@@ -39,7 +38,6 @@
#define _SVX_TABLINE_CXX
#include <cuires.hrc>
#include "tabline.hrc"
-//#include "dlgname.hrc"
#include "cuitabarea.hxx"
#include "cuitabline.hxx"
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index d124a68deb2b..f6b61d054044 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 9060b6fb013e..a9b60a717e1c 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
-
//svdraw.hxx
#define _SVDRAW_HXX
#define _SDR_NOITEMS
@@ -66,9 +64,8 @@
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
-#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-//#include "dlgname.hrc"
-#include <svx/svxdlg.hxx> //CHINA001
+#include "defdlgname.hxx"
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "sfx2/opengrf.hxx"
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 5bea868e115a..fee45f9e9602 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 1de256416b9d..15e68f494521 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <vcl/wrkwin.hxx>
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
@@ -48,9 +47,8 @@
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
-#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-//#include "dlgname.hrc"
-#include <svx/svxdlg.hxx> //CHINA001
+#include "defdlgname.hxx"
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 4fa65d95221a..01deb9fdbc57 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
@@ -42,15 +41,14 @@
#include <cuires.hrc>
#include "tabarea.hrc"
-//#include "dlgname.hrc"
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
-#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include "defdlgname.hxx"
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 38472fa74110..30911a236e15 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -28,10 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
-
#ifndef _SVX_SIZEITEM_HXX //autogen
-
#include <editeng/sizeitem.hxx>
#endif
#include <tools/shl.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 5f1b385e8137..b8880ccf467a 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
@@ -42,7 +41,6 @@
#include <cuires.hrc>
#include "tabline.hrc"
-//#include "dlgname.hrc"
#include "helpid.hrc"
#include "svx/xattr.hxx"
@@ -51,8 +49,8 @@
#include "svx/drawitem.hxx"
#include "cuitabline.hxx"
-#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include "defdlgname.hxx"
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 22dbfca88ee4..3757f63dac0c 100755
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -34,9 +34,7 @@
//#define UINT32 USE_WIN_UINT32
//#define INT32 USE_WIN_INT32
-//#include <tools/presys.h>
#include "embeddoc.hxx"
-//#include <tools/postsys.h>
//#undef UINT64
//#undef INT64
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index fdcb97c9e177..213ef9755ed8 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -30,9 +30,6 @@
#include <com/sun/star/awt/XFocusListener.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
-//#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
-//#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-//#endif
#include <com/sun/star/form/XBoundComponent.hpp>
#include <com/sun/star/sdbc/XRowSetListener.hpp>
#include <svtools/stdctrl.hxx>
diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx
index f583a7962e03..2f496b93de59 100644
--- a/extensions/source/ole/jscriptclasses.hxx
+++ b/extensions/source/ole/jscriptclasses.hxx
@@ -32,7 +32,6 @@
#pragma warning (disable:4548)
#include <tools/presys.h>
-//#include "stdafx.h"
#define STRICT
#define _WIN32_WINNT 0x0400
#define _WIN32_DCOM
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 32346bc27900..732f945a96e7 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -31,7 +31,6 @@
#pragma warning (disable:4548)
#include <tools/presys.h>
-//#include "stdafx.h"
#define STRICT
#define _WIN32_WINNT 0x0400
#define _WIN32_DCOM
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 8419569bd949..2530c301d662 100755
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -42,8 +42,6 @@
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
-// #include <comphelper/processfactory.hxx>
-
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
index 343b206d0085..faca5ff84fad 100644
--- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
+++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
@@ -33,9 +33,7 @@
#include "stdafx.h"
#include "resource.h"
#include <initguid.h>
-//#include "AxTestComponents.h"
-//#include "AxTestComponents_i.c"
#include "Basic.h"
#include "Foo.h"
@@ -97,4 +95,4 @@ STDAPI DllUnregisterServer(void)
}
-//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED \ No newline at end of file
+//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED
diff --git a/extensions/test/ole/AxTestComponents/Basic.cpp b/extensions/test/ole/AxTestComponents/Basic.cpp
index d48bc5fe59ca..7a5c8fa6c495 100644
--- a/extensions/test/ole/AxTestComponents/Basic.cpp
+++ b/extensions/test/ole/AxTestComponents/Basic.cpp
@@ -24,12 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#include "stdafx.h"
-//#include "AxTestComponents.h"
#include "Basic.h"
-
/////////////////////////////////////////////////////////////////////////////
// CBasic
CBasic::CBasic(): m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0),
diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h
index 0a12b709e33e..aaa7f3be8aa9 100644
--- a/extensions/test/ole/AxTestComponents/Basic.h
+++ b/extensions/test/ole/AxTestComponents/Basic.h
@@ -30,9 +30,8 @@
#define __BASIC_H_
#include "resource.h" // main symbols
-//#include "AxTestComponents.h"
#import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
-//#include "AxTestComponents.h"
+
/////////////////////////////////////////////////////////////////////////////
// CBasic
class ATL_NO_VTABLE CBasic :
diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp
index 256b900945a2..a8f310ca26af 100644
--- a/extensions/test/ole/AxTestComponents/Foo.cpp
+++ b/extensions/test/ole/AxTestComponents/Foo.cpp
@@ -24,12 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#include "stdafx.h"
-//#include "AxTestComponents.h"
#include "Foo.h"
-
/////////////////////////////////////////////////////////////////////////////
// CBasic
CFoo::CFoo()
diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h
index 6c6625c43a30..9cfc4c15afb8 100644
--- a/extensions/test/ole/AxTestComponents/Foo.h
+++ b/extensions/test/ole/AxTestComponents/Foo.h
@@ -30,9 +30,8 @@
#define __Foo_H_
#include "resource.h" // main symbols
-//#include "AxTestComponents.h"
#import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
-//#include "AxTestComponents.h"
+
/////////////////////////////////////////////////////////////////////////////
// CBasic
class ATL_NO_VTABLE CFoo :
diff --git a/extensions/test/ole/AxTestComponents/StdAfx.cpp b/extensions/test/ole/AxTestComponents/StdAfx.cpp
index 97fda64fc540..0e0446bfb105 100644
--- a/extensions/test/ole/AxTestComponents/StdAfx.cpp
+++ b/extensions/test/ole/AxTestComponents/StdAfx.cpp
@@ -29,7 +29,4 @@
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
-//#include <statreg.cpp>
#endif
-
-//#include <atlimpl.cpp>
diff --git a/extensions/test/ole/OleClient/axhost.hxx b/extensions/test/ole/OleClient/axhost.hxx
index 78a04a9c7a89..4c7973a051fc 100644
--- a/extensions/test/ole/OleClient/axhost.hxx
+++ b/extensions/test/ole/OleClient/axhost.hxx
@@ -30,7 +30,6 @@
#include <atlbase.h>
extern CComModule _Module;
-//#include <atlwin.h>
#include <atlcom.h>
#include <atlhost.h>
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 894e0ca87aa2..96d64b92d6fa 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -46,7 +46,6 @@ CComModule _Module;
#include <com/sun/star/bridge/oleautomation/PropertyPutArgument.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/script/XInvocation.hpp>
-//#include <oletest/XCallback.hpp>
#include <com/sun/star/uno/Reference.h>
#include <cppuhelper/servicefactory.hxx>
#include <rtl/string.h>
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 2a72552d2024..505725cdc52d 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -56,7 +56,6 @@
#include <oletest/XSimple2.hpp>
#include <oletest/XSimple3.hpp>
#include <oletest/XTestInParameters.hpp>
-//#include <oletest/XTestOutParameters.hpp>
#include <oletest/XIdentity.hpp>
#include <com/sun/star/beans/Property.hpp>
using namespace cppu;
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index e7f52fbb0902..4cd6efbf6d8a 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -34,8 +34,6 @@
#include <rtl/wstring.hxx>
#include <osl/time.h>
-//#include <vos/dynload.hxx>
-//#include <vos/diagnose.hxx>
#include <usr/weak.hxx>
#include <tools/string.hxx>
#include <vos/conditn.hxx>
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index de606006ef90..7687248ff454 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
-//#include <tools/presys.h>
#include <vector>
-//#include <tools/postsys.h>
#include <smart/com/sun/star/test/XSimpleTest.hxx>
#include <smart/com/sun/star/lang/XMultiServiceFactory.hxx> // for the multiservice-factories
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 3ac3c634f2c3..1d1bc1579e5b 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -39,7 +39,6 @@
#include <stdio.h>
#include <smart/com/sun/star/registry/XImplementationRegistration.hxx>
#include <smart/com/sun/star/lang/XComponent.hxx>
-//#include <com/sun/star/registry/ stardiv/uno/repos/simplreg.hxx>
#include <vos/dynload.hxx>
#include <vos/diagnose.hxx>
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx
index 16144f170f97..7c6a74171a2f 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
-//#include <vos/mutex.hxx>
#include <vos/dynload.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 3b0871cc36b6..39648039e160 100755
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
-//#include <com/sun/star/linguistic2/SpellFailure.hpp>
#include <cppuhelper/factory.hxx> // helper for factories
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <i18npool/mslangid.hxx>
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index c8486c1bc471..ef149646d884 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -41,9 +41,6 @@
#include <simpleguesser.hxx>
#include <guess.hxx>
-//#include <cppuhelper/queryinterface.hxx> // helper for queryInterface() impl
-
-//#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 70996793c186..b5bafe888507 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -37,11 +37,9 @@
#include <unotools/processfactory.hxx>
#include <osl/mutex.hxx>
-//#include <hunspell.hxx>
#include <dictmgr.hxx>
#include <macspellimp.hxx>
-//#include <linguistic/lngprops.hxx>
#include <linguistic/spelldta.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/useroptions.hxx>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 0c071a4eeb1f..23f03d712641 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -35,9 +35,6 @@
#include "nthesdta.hxx"
#include <linguistic/misc.hxx>
-// #include "lngsvcmgr.hxx"
-
-
using namespace utl;
using namespace osl;
using namespace rtl;
diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.cxx b/setup_native/source/win32/customactions/javafilter/jfregca.cxx
index 80a8937cbe3a..920b105d9c39 100644
--- a/setup_native/source/win32/customactions/javafilter/jfregca.cxx
+++ b/setup_native/source/win32/customactions/javafilter/jfregca.cxx
@@ -24,7 +24,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-//#include <stdio.h>
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index 53eb16a99583..ae3ebaccfd1f 100755
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -25,11 +25,6 @@
*
************************************************************************/
-/*
-
-*/
-
-
#define UNICODE
#ifdef _MSC_VER
@@ -43,8 +38,6 @@
#endif
#include <malloc.h>
-//#include <string>
-//#include <map>
#include <strsafe.h>
// 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExW if WINVER < 0x0502.
@@ -474,4 +467,4 @@ extern "C" UINT __stdcall DeinstallReg64(MSIHANDLE hMSI)
OutputDebugStringFormat(L"DeinstallReg64\n" );
Reg64(hMSI, REMOVE);
return ERROR_SUCCESS;
-} \ No newline at end of file
+}
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index cc18373f04d8..750568861f2e 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmlsecurity.hxx"
-// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#ifndef _STATUS_HXX //autogen
#include <vcl/status.hxx>
@@ -37,9 +36,6 @@
#include <vcl/menu.hxx>
#endif
#include <vcl/image.hxx>
-//#ifndef _SFXITEMPOOL_HXX
-//#include <svl/itempool.hxx>
-//#endif
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/dispatch.hxx>
@@ -52,21 +48,6 @@
#define PAINT_OFFSET 5
-//#include "sizeitem.hxx"
-//#include "dialmgr.hxx"
-//#include "dlgutil.hxx"
-//#include "stbctrls.h"
-
-//#include "dialogs.hrc"
-
-/*#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
-#endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
-#include <comphelper/processfactory.hxx>
-#endif*/
-
-
SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxBoolItem );
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index dd3ae00f69c1..6b59a9358216 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -49,10 +49,6 @@
#include <tools/date.hxx>
#include <tools/time.hxx>
-//MM : search for the default profile
-//#include <unotools/streamhelper.hxx>
-//MM : end
-
/* SEInitializer component */
#define SEINITIALIZER_COMPONENT "com.sun.star.xml.crypto.SEInitializer"
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index b6ad409ad4be..489f265a8d2c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -47,7 +47,6 @@
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-//#include "xmlsec/xmlsec.h"
class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 341f66b9ef1f..91fbfd671ae1 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -34,16 +34,10 @@
#include <xmloff/attrlist.hxx>
#include "xmlelementwrapper_xmlsecimpl.hxx"
-//#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-/*
- * Deleted by AF
-#include <memory.h>
- */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index d2051fcf1406..e46621ae0902 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -35,8 +35,6 @@
#include <cppuhelper/implbase4.hxx>
#include "saxhelper.hxx"
-//#include "libxml/parserInternals.h"
-//#include "libxslt/xslt.h"
#define NODEPOSITION_NORMAL 1
#define NODEPOSITION_STARTELEMENT 2
diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx
index 061091611de7..e8085e9ef44e 100644
--- a/xmlsecurity/tools/demo/performance.cxx
+++ b/xmlsecurity/tools/demo/performance.cxx
@@ -79,23 +79,15 @@
#include <xmloff/attrlist.hxx>
-//#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-/*
- * Can not build under solaris.
- * Delete the memory.h including by AF
-#include <memory.h>
-*/
-
#include <sys/types.h>
#include <sys/stat.h>
#include <osl/time.h>
-
#ifndef INCLUDED_VECTOR
#include <vector>
#define INCLUDED_VECTOR