[ooo-build-commit] .: automation/source basctl/source basctl/util cui/source embedserv/source extensions/source extensions/test extensions/workben lingucomponent/source setup_native/source xmlsecurity/source xmlsecurity/tools

Kohei Yoshida kohei at kemper.freedesktop.org
Mon Oct 4 20:27:04 PDT 2010


 automation/source/app/testbasi.cxx                                   |   14 -------
 automation/source/server/server.cxx                                  |    3 -
 automation/source/server/statemnt.hxx                                |    3 -
 automation/source/testtool/objtest.cxx                               |    6 ---
 automation/source/testtool/registry_win.cxx                          |    1 
 basctl/source/basicide/baside2.cxx                                   |    4 --
 basctl/source/basicide/baside2b.cxx                                  |    3 -
 basctl/source/basicide/objdlg.cxx                                    |    4 --
 basctl/source/dlged/managelang.cxx                                   |    3 -
 basctl/source/inc/baside3.hxx                                        |    4 --
 basctl/util/hidother.src                                             |    1 
 cui/source/customize/cfg.cxx                                         |    6 ---
 cui/source/inc/acccfg.hxx                                            |    4 --
 cui/source/tabpages/tabarea.cxx                                      |    2 -
 cui/source/tabpages/tabline.cxx                                      |    2 -
 cui/source/tabpages/tparea.cxx                                       |    1 
 cui/source/tabpages/tpbitmap.cxx                                     |    7 +--
 cui/source/tabpages/tpcolor.cxx                                      |    1 
 cui/source/tabpages/tpgradnt.cxx                                     |    6 +--
 cui/source/tabpages/tphatch.cxx                                      |    6 +--
 cui/source/tabpages/tpline.cxx                                       |    3 -
 cui/source/tabpages/tplnedef.cxx                                     |    6 +--
 embedserv/source/embed/ed_idataobj.cxx                               |    2 -
 extensions/source/bibliography/general.hxx                           |    3 -
 extensions/source/ole/jscriptclasses.hxx                             |    1 
 extensions/source/ole/unotypewrapper.hxx                             |    1 
 extensions/source/update/check/updatecheck.cxx                       |    2 -
 extensions/test/ole/AxTestComponents/AxTestComponents.cpp            |    3 -
 extensions/test/ole/AxTestComponents/Basic.cpp                       |    3 -
 extensions/test/ole/AxTestComponents/Basic.h                         |    3 -
 extensions/test/ole/AxTestComponents/Foo.cpp                         |    3 -
 extensions/test/ole/AxTestComponents/Foo.h                           |    3 -
 extensions/test/ole/AxTestComponents/StdAfx.cpp                      |    3 -
 extensions/test/ole/OleClient/axhost.hxx                             |    1 
 extensions/test/ole/OleClient/clientTest.cxx                         |    1 
 extensions/test/ole/cpnt/cpnt.cxx                                    |    1 
 extensions/test/sax/testsax.cxx                                      |    2 -
 extensions/test/sax/testwriter.cxx                                   |    2 -
 extensions/workben/testcomponent.cxx                                 |    1 
 extensions/workben/testframecontrol.cxx                              |    1 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx   |    1 
 lingucomponent/source/languageguessing/guesslang.cxx                 |    3 -
 lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx         |    2 -
 lingucomponent/source/thesaurus/libnth/nthesdta.cxx                  |    3 -
 setup_native/source/win32/customactions/javafilter/jfregca.cxx       |    1 
 setup_native/source/win32/customactions/reg64/reg64.cxx              |    8 ----
 xmlsecurity/source/dialogs/stbcontrl.cxx                             |   19 ----------
 xmlsecurity/source/helper/xmlsignaturehelper.cxx                     |    4 --
 xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx |    1 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx          |    6 ---
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx          |    2 -
 xmlsecurity/tools/demo/performance.cxx                               |    8 ----
 52 files changed, 13 insertions(+), 171 deletions(-)

New commits:
commit f72fa433e33a3673ef9db518016b0ccf5b5a0214
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date:   Mon Oct 4 20:36:05 2010 +0100

    Remove redundant #include directives & comments

diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
index 15a7cd2..e77959a 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 c9ee5c2..f167404 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 1a3efa9..3230ca3 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 e2f8614..bdba92d 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 f531384..6c48793 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 84a8781..b9e823b 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 027ce45..255571f 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 21e5038..d3ed4b7 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 b907e57..b5ac567 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 3f35aa0..027228c 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 ece6f83..bf8e64f 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 d2d1382..e835430 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 c7315e8..5441b7d 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>
@@ -57,7 +55,7 @@
 #include <sfx2/basedlgs.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>		
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/minarray.hxx>
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 8652d93..dcba215 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 9752626..e3e204b 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 578941f..9f191a3 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 3eb168c..33685c4 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 8906ea1..42e8138 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 69c05ff..d78c5bd 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 04c7dc8..e00fdf9 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 f75cb66..e4a3f72 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 f3b7666..2ecaed0 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 521498b..0fa9cee 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 6e48968..986e22b 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 ab80415..3cb8740 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 856d3a6..8da546c 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 73a40c0..47eecc5 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 50ad668..a98d4c3 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 3206315..8ad4614 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 d35b542..004ec2f 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 52245ff..485433f 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 61fb8fe..1a4db8b 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 76cdffb..533a774 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 d678fd4..ad79bab 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 aad8967..9c72fcd 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 9e6ab63..1955a0c 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 1637d7f..ee7f842 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 cd45344..432911a 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 9f70fcd..fdf6519 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 1662547..0f67f48 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 2cdd997..8e8e986 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 8b864b3..d352bd0 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 f198020..798d69d 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 a6b0757..b45dc3e 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 e565638..58b1179 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 72dc208..6007f0c 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 0d1b8d4..eeac36c 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 291c43a..4467dd0 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 2717141..96ffded 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 0f7867c..10ade1c 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 c88e9fa..eba987d 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 15a76e1..a07ea4d 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


More information about the ooo-build-commit mailing list