Patch to remove commented out #includes & related comments.
Graeme
From 0fe345026ff6ab4d0ab1c8f17c146f8e731844d1 Mon Sep 17 00:00:00 2001
From: J. Graeme Lingard <jgraeme+...@gmail.com>
Date: Wed, 6 Oct 2010 23:52:18 +0100
Subject: [PATCH] Remove redundant #include directives & comments
---
starmath/inc/edit.hxx | 4 -
sw/inc/dbui.hrc | 2 -
sw/inc/dialog.hrc | 2 -
sw/inc/envelp.hrc | 2 -
sw/inc/ftninfo.hxx | 3 -
sw/inc/lineinfo.hxx | 3 -
sw/inc/ndhints.hxx | 2 -
sw/inc/pagedesc.hxx | 3 -
sw/inc/swevent.hxx | 2 -
sw/source/core/SwNumberTree/SwNodeNum.cxx | 1 -
sw/source/core/access/accpara.cxx | 1 -
sw/source/core/bastyp/calc.cxx | 1 -
sw/source/core/crsr/viscrs.cxx | 94 +----------------------
sw/source/core/draw/dview.cxx | 4 -
sw/source/core/fields/fldbas.cxx | 2 -
sw/source/core/fields/flddat.cxx | 1 -
sw/source/core/inc/flowfrm.hxx | 2 -
sw/source/core/inc/retrievedinputstreamdata.hxx | 4 +-
sw/source/core/inc/retrieveinputstream.hxx | 3 -
sw/source/core/sw3io/sw3convert.cxx | 20 -----
sw/source/core/text/porglue.hxx | 2 -
sw/source/core/text/portox.hxx | 1 -
sw/source/core/undo/undel.cxx | 5 -
sw/source/filter/ww8/dump/dump8a.cxx | 4 -
sw/source/filter/ww8/dump/ww8dout.cxx | 2 -
sw/source/filter/xml/xmlitemi.cxx | 3 -
sw/source/ui/app/error.src | 2 -
sw/source/ui/chrdlg/ccoll.src | 1 -
sw/source/ui/chrdlg/drpcps.src | 1 -
sw/source/ui/chrdlg/numpara.src | 1 -
sw/source/ui/dbui/dbui.src | 2 +-
sw/source/ui/dbui/mmoutputpage.cxx | 9 --
sw/source/ui/docvw/edtdd.cxx | 3 -
sw/source/ui/envelp/envelp.src | 1 -
sw/source/ui/envelp/envfmt.hrc | 2 -
sw/source/ui/envelp/envfmt.src | 1 -
sw/source/ui/envelp/envlop.hrc | 2 -
sw/source/ui/envelp/envlop.src | 1 -
sw/source/ui/envelp/envprt.hrc | 2 -
sw/source/ui/envelp/envprt.src | 1 -
sw/source/ui/envelp/label.hrc | 2 -
sw/source/ui/envelp/label.src | 1 -
sw/source/ui/envelp/labfmt.hrc | 2 -
sw/source/ui/envelp/labfmt.src | 1 -
sw/source/ui/envelp/labprt.hrc | 2 -
sw/source/ui/envelp/labprt.src | 1 -
sw/source/ui/envelp/mailmrge.hrc | 2 -
sw/source/ui/envelp/mailmrge.src | 1 -
sw/source/ui/fldui/changedb.hrc | 2 -
sw/source/ui/fldui/fldtdlg.hrc | 4 -
sw/source/ui/frmdlg/cption.src | 2 +-
sw/source/ui/inc/caption.hxx | 7 --
sw/source/ui/inc/maildispatcher.hxx | 3 -
sw/source/ui/inc/swmn_tmpl.hrc | 1 -
sw/source/ui/inc/unodispatch.hxx | 5 +-
sw/source/ui/misc/linenum.cxx | 5 -
sw/source/ui/uiview/view.cxx | 1 -
sw/source/ui/uno/unotxdoc.cxx | 1 -
sw/source/ui/wrtsh/wrtsh1.cxx | 1 -
sw/util/hidother.src | 1 -
60 files changed, 5 insertions(+), 242 deletions(-)
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 084501e..d3db499 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -33,10 +33,6 @@
#include <editeng/editdata.hxx>
#include <svtools/colorcfg.hxx>
-//#ifndef _ACCESSIBILITY_HXX_
-//#include "accessibility.hxx"
-//#endif
-
class SmDocShell;
class SmViewShell;
class EditView;
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 98e1ecf..3e086c1 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -28,8 +28,6 @@
#ifndef _DBUI_HRC
#define _DBUI_HRC
-// #include *****************************************************************
-
#include "rcid.hrc"
// Dialoge --------------------------------------------------------------------
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 564b8da..8d3c827 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -28,8 +28,6 @@
#ifndef _DIALOG_HRC
#define _DIALOG_HRC
-// #include *****************************************************************
-
#include "rcid.hrc"
// Dialoge ******************************************************************
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 42a23e1..29a4248 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -28,8 +28,6 @@
#ifndef _ENVELP_HRC
#define _ENVELP_HRC
-// #include -------------------------------------------------------------------
-
#include "rcid.hrc"
// Dialoge --------------------------------------------------------------------
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 6cb2fb1..c2fce19 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -29,9 +29,6 @@
#include <tools/string.hxx>
#include "swdllapi.h"
-//#ifndef _NUMRULE_HXX
-//#include <numrule.hxx>
-//#endif
#include <calbck.hxx>
#include <editeng/numitem.hxx>
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index e5528bb..7cb70b2 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -28,9 +28,6 @@
#define SW_LINEINFO_HXX
#include "calbck.hxx"
-//#ifndef _NUMRULE_HXX
-//#include <numrule.hxx>
-//#endif
#include <editeng/numitem.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 6369b39..a3d3cee 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -33,8 +33,6 @@
#include "swtypes.hxx"
-//#include "numrule.hxx"
-
class SwTxtNode;
class SwRegHistory; // steht im RolBck.hxx
class SwTxtAttr;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 066abef..9006c88 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -33,9 +33,6 @@
#include "swdllapi.h"
#include <swtypes.hxx> //fuer SwTwips
#include <frmfmt.hxx>
-//#ifndef _NUMRULE_HXX
-//#include <numrule.hxx>
-//#endif
#include <editeng/numitem.hxx>
class SfxPoolItem;
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index f0c0465..28aff5f 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -28,8 +28,6 @@
#ifndef _SWEVENT_HXX
#define _SWEVENT_HXX
-// #include *****************************************************************
-
#include <tools/solar.h>
#include <sfx2/sfx.hrc>
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 400c29b..6fb8ecd 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -38,7 +38,6 @@
#include <IDocumentListItems.hxx>
// <--
// --> OD 2010-01-13 #b6912256#
-//#include <svtools/svstdarr.hxx>
#include <doc.hxx>
// <--
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 368e076..30f8ad0 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -61,7 +61,6 @@
#include <unotools/charclass.hxx> // for GetWordBoundary
// for get/setCharacterAttribute(...)
#include <unocrsr.hxx>
-//#include <unoobj.hxx>
#include <unoport.hxx>
#include <doc.hxx>
#include <crsskip.hxx>
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 43d57b2..c68a230 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -35,7 +35,6 @@
#endif
#include <cstdlib>
#include <climits>
-// #include <cmath>
#include <cfloat>
#include <hintids.hxx>
#include <rtl/math.hxx>
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index a602ce7..5134b3c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -70,101 +70,9 @@ long SwSelPaintRects::nPixPtY = 0;
MapMode* SwSelPaintRects::pMapMode = 0;
-#ifdef SHOW_BOOKMARKS
-// #include <IMark.hxx>
-//
-// class SwBookmarkRects : public SwSelPaintRects
-// {
-// virtual void Paint( const Rectangle& rRect );
-// virtual void FillRects();
-//
-// public:
-// SwBookmarkRects( const SwCrsrShell& rSh ) : SwSelPaintRects( rSh ) {}
-// };
-//
-// void SwBookmarkRects::Paint( const Rectangle& rRect )
-// {
-// Window* pWin = GetShell()->GetWin();
-//
-// RasterOp eOld( pWin->GetRasterOp() );
-// BOOL bLCol = pWin->IsLineColor();
-// Color aLCol( pWin->GetLineColor() );
-// BOOL bFCol = pWin->IsFillColor();
-// Color aFCol( pWin->GetFillColor() );
-//
-// pWin->SetRasterOp( ROP_XOR );
-// Color aCol( RGB_COLORDATA( 0xF0, 0xC8, 0xF0 ) ^ COL_WHITE );
-// pWin->SetFillColor( aCol );
-// pWin->SetLineColor( aCol );
-//
-// pWin->DrawRect( rRect );
-//
-// if( bLCol ) pWin->SetLineColor( aLCol ); else pWin->SetLineColor();
-// if( bFCol ) pWin->SetFillColor( aFCol ); else pWin->SetFillColor();
-// pWin->SetRasterOp( eOld );
-// }
-//
-// void SwBookmarkRects::FillRects()
-// {
-// SwRegionRects aReg( GetShell()->VisArea() );
-//
-// const SwBookmarks& rBkmkTbl = GetShell()->getIDocumentMarkAccess()->getBookmarks();
-// SwShellCrsr* pCrsr = 0;
-// for( USHORT n = 0; n < rBkmkTbl.Count(); ++n )
-// {
-// const SwBookmark& rBkmk = *rBkmkTbl[ n ];
-// if( rBkmk.IsBookMark() && rBkmk.GetOtherPos() )
-// {
-// if( !pCrsr )
-// {
-// pCrsr = new SwShellCrsr( *GetShell(), rBkmk.GetPos() );
-// pCrsr->SetMark();
-// }
-// else
-// *pCrsr->GetPoint() = rBkmk.GetPos();
-// *pCrsr->GetMark() = *rBkmk.GetOtherPos();
-// pCrsr->FillRects();
-// for( USHORT i = 0; i < pCrsr->Count(); ++i )
-// aReg -= (*pCrsr)[ i ];
-//
-// pCrsr->Remove( 0, i );
-// }
-// }
-// if( pCrsr ) delete pCrsr;
-//
-// aReg.Invert();
-// SwRects::Insert( &aReg, 0 );
-// }
-//
-// SwBookmarkRects* pBookMarkRects = 0;
-//
-// void ShowBookmarks( const SwCrsrShell* pSh, int nAction, const SwRect* pRect = 0 )
-// {
-// if( !pBookMarkRects && pSh->getIDocumentMarkAccess()->getBookmarks().Count() )
-// pBookMarkRects = new SwBookmarkRects( *pSh );
-//
-// if( pBookMarkRects )
-// {
-// switch( nAction )
-// {
-// case 1: pBookMarkRects->Show(); break;
-// case 2: pBookMarkRects->Hide(); break;
-// case 3: pBookMarkRects->Invalidate( *pRect ); break;
-// }
-//
-// if( !pBookMarkRects->Count() )
-// delete pBookMarkRects, pBookMarkRects = 0;
-// }
-// }
-//
-// #define SHOWBOOKMARKS1( nAct ) ShowBookmarks( GetShell(),nAct );
-// #define SHOWBOOKMARKS2( nAct, pRect ) ShowBookmarks( GetShell(),nAct, pRect );
-
-#else
-
+#ifndef SHOW_BOOKMARKS
#define SHOWBOOKMARKS1( nAct )
#define SHOWBOOKMARKS2( nAct, pRect )
-
#endif
#ifdef SHOW_REDLINES
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index f709dec..9bc4164 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -57,10 +57,6 @@
#include <com/sun/star/embed/EmbedMisc.hpp>
-// OD 18.06.2003 #108784#
-//#ifndef _SVDVMARK_HXX //autogen
-//#include <svx/svdvmark.hxx>
-//#endif
#include <vector>
// --> OD 2004-06-24 #i28701#
#include <sortedobjs.hxx>
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index a1c31e2..6570e13 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-// #include <math.h>
#include <float.h>
#include <rtl/math.hxx>
#include <svl/zforlist.hxx>
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 281a676..25fafab 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-// #include <math.h>
#include <tools/datetime.hxx>
#include <svl/zforlist.hxx>
#include <com/sun/star/util/DateTime.hpp>
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 3805421..3dd95b5 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -47,8 +47,6 @@
//diesem befreundet. So kann der FlowFrm anstelle des this-Pointer mit der
//Referenz auf den SwFrm arbeiten.
-//#include "frame.hxx" //fuer inlines
-
class SwPageFrm;
class SwRect;
class SwBorderAttrs;
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 03062a0..7785985 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -36,10 +36,8 @@
#include <map>
#include <boost/weak_ptr.hpp>
+
class SwAsyncRetrieveInputStreamThreadConsumer;
-//#ifndef _RETRIEVEINPUTSTREAMCONSUMER_HXX
-//#include <retrieveinputstreamconsumer.hxx>
-//#endif
/** Singleton class to manage retrieved input stream data in Writer
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index 7b0646a..5391403 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -29,9 +29,6 @@
#include <observablethread.hxx>
#include <tools/string.hxx>
-//#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
-//#include <com/sun/star/uno/Reference.hxx>
-//#endif
#include <com/sun/star/io/XInputStream.hpp>
#include <retrievedinputstreamdata.hxx>
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 9d06a54..cec77a0 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -71,26 +71,6 @@
using namespace nsSwDocInfoSubType;
-
-//#include "poolfmt.hxx" // fuer InSetExpField
-//#include "poolfmt.hrc" // fuer InSetExpField
-
-//#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)
-
-//#define FIELDFNTAB_SIZE 37
-//#if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN
-//#error Feld-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
-//#endif
-
-//#endif
-
-//#define SWG_AUTHORITY_ENTRY_LCL 'E'
-
-//sal_Char __FAR_DATA sSW3IO_FixedField[] = "FixedExport";
-//sal_Char __FAR_DATA sSW3IO_AuthorityField[] = "AuthorityExport";
-/* #108791# */
-//sal_Char __FAR_DATA sSW3IO_DropDownField[] = "DropDownExport";
-
struct OldFormats
{
NfIndexTableOffset eFormatIdx;
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index d75faf8..2735ab6 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -27,8 +27,6 @@
#ifndef _PORGLUE_HXX
#define _PORGLUE_HXX
-//#include <stdlib.h>
-
#include "porlin.hxx"
class SwRect;
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index d2c1228..4c4996e 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -29,7 +29,6 @@
#define _PORTOX_HXX
#include "portxt.hxx"
-//#include "porglue.hxx"
/*************************************************************************
* class SwToxPortion
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index edf6f99..c8f6594 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -53,11 +53,6 @@
#include <comcore.hrc> // #111827#
#include <undo.hrc>
-// #include <editeng/svxacorr.hxx>
-// #include <comphelper/processfactory.hxx>
-// #include <editeng/unolingu.hxx>
-// #include <unotools/localedatawrapper.hxx>
-
// using namespace comphelper;
inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx
index 26e007e..17783d4 100644
--- a/sw/source/filter/ww8/dump/dump8a.cxx
+++ b/sw/source/filter/ww8/dump/dump8a.cxx
@@ -28,13 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-//#include <stdio.h> // SEEK_SET
#include <string.h> // memset(), ...
#include <io.h> // access()
-
-//#include "defs.hxx"
#include <tools/solar.h>
#include <sot/storage.hxx>
#include "ww8struc.hxx"
diff --git a/sw/source/filter/ww8/dump/ww8dout.cxx b/sw/source/filter/ww8/dump/ww8dout.cxx
index e2ce247..4607553 100644
--- a/sw/source/filter/ww8/dump/ww8dout.cxx
+++ b/sw/source/filter/ww8/dump/ww8dout.cxx
@@ -30,9 +30,7 @@
#include <stdio.h> // getchar
-//#include "defs.hxx"
#include <tools/solar.h> // BYTE
-//#include "wwscan.hxx" // aWwStor
#include "ww8dout.hxx"
#include <tools/stream.hxx>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index d4bf6d4..9485d10 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -47,9 +47,6 @@
#include <editeng/brshitem.hxx>
#include <editeng/langitem.hxx>
-#ifndef _XMLOFF_XMLTABI_HXX
-//#include <xmloff/xmltabi.hxx>
-#endif
#include "xmlbrshi.hxx"
#include <paratr.hxx>
#include <doc.hxx>
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 6c61b34..0345a21 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -26,8 +26,6 @@
************************************************************************/
#define __RSC
-
- //#include <tools/errcode.hxx>
#include "globals.hrc"
#include "app.hrc"
#include "swerror.h"
diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src
index 0d8baf2..14afc8b 100644
--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "globals.hrc"
#include "chrdlg.hrc"
#include "ccoll.hrc"
diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src
index ae3da33..473deef 100644
--- a/sw/source/ui/chrdlg/drpcps.src
+++ b/sw/source/ui/chrdlg/drpcps.src
@@ -25,7 +25,6 @@
*
************************************************************************/
- // #include *****************************************************************
#include "globals.hrc"
#include "chrdlg.hrc"
#include "drpcps.hrc"
diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src
index 14ed11f..df83af4 100644
--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "globals.hrc"
#include "chrdlg.hrc"
#include "numpara.hrc"
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 8d07341..ce6b297 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -26,9 +26,9 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "dbui.hrc"
#include "helpid.h"
+
ModalDialog DLG_DBSELECTION
{
OutputSize = TRUE ;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 8ef3715..e267b32 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -55,9 +55,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
-//#ifndef _SFX_DOCFILT_HACK_HXX
-//#include <sfx2/docfilt.hxx>
-//#endif
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include <vcl/print.hxx>
@@ -67,12 +64,6 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdb/XColumn.hpp>
-//#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
-//#include <com/sun/star/beans/PropertyValue.hpp>
-//#endif
-//#ifndef _BASEDLGS_HXX
-//#include <sfx2/basedlgs.hxx>
-//#endif
#include <dbmgr.hxx>
#include <swunohelper.hxx>
#include <vos/mutex.hxx>
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index f76f95d..dffe615 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -34,9 +34,6 @@
#include <svx/svdview.hxx>
#include <editeng/outliner.hxx>
-//#ifndef _SVDVMARK_HXX //autogen
-//#include <svx/svdvmark.hxx>
-//#endif
#include <svx/svdobj.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src
index 285f488..94cc2d4 100644
--- a/sw/source/ui/envelp/envelp.src
+++ b/sw/source/ui/envelp/envelp.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "envelp.hrc"
#include "globals.hrc"
// Strings ******************************************************************
diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc
index df10c15..d2d7011 100644
--- a/sw/source/ui/envelp/envfmt.hrc
+++ b/sw/source/ui/envelp/envfmt.hrc
@@ -28,8 +28,6 @@
#ifndef _ENVFMT_HRC
#define _ENVFMT_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index 1698743..57132b7 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "envfmt.hrc"
#include "helpid.h"
// TP_ENV_FMT ---------------------------------------------------------------
diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc
index 359b9f2..1974387 100644
--- a/sw/source/ui/envelp/envlop.hrc
+++ b/sw/source/ui/envelp/envlop.hrc
@@ -28,8 +28,6 @@
#ifndef _ENVLOP_HRC
#define _ENVLOP_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index 2c02563..9c91079 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "envlop.hrc"
#include "helpid.h"
// DLG_ENV ------------------------------------------------------------------
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index b5a8a03..32e5e62 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -28,8 +28,6 @@
#ifndef _ENVPRT_HRC
#define _ENVPRT_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index 25a92fc..e38f7ca 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma *****************************************************************
- // #include ****************************************************************
#include "envprt.hrc"
#include "helpid.h"
// TP_ENV_PRT ---------------------------------------------------------------
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc
index 9457fff..c74d9fb 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/ui/envelp/label.hrc
@@ -28,8 +28,6 @@
#ifndef _LABEL_HRC
#define _LABEL_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index f2200a0..2d3d9c3 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "label.hrc"
#include "globals.hrc"
#include "helpid.h"
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 96e5110..399b906 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -28,8 +28,6 @@
#ifndef _LABFMT_HRC
#define _LABFMT_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 8d39f44..49b5e55 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "labfmt.hrc"
#include "helpid.h"
// TP_LAB_FMT ---------------------------------------------------------------
diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc
index 56cc1e0..6e3a191 100644
--- a/sw/source/ui/envelp/labprt.hrc
+++ b/sw/source/ui/envelp/labprt.hrc
@@ -28,8 +28,6 @@
#ifndef _LABPRT_HRC
#define _LABPRT_HRC
-// #include *****************************************************************
-
#include "envelp.hrc"
// Lokale Resourcen *********************************************************
diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src
index b6452f5..7d663f9 100644
--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -26,7 +26,6 @@
************************************************************************/
// #pragma ******************************************************************
- // #include *****************************************************************
#include "labprt.hrc"
#include "helpid.h"
// TP_LAB_PRT ---------------------------------------------------------------
diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc
index f98c69c..5f3ef37 100644
--- a/sw/source/ui/envelp/mailmrge.hrc
+++ b/sw/source/ui/envelp/mailmrge.hrc
@@ -28,8 +28,6 @@
#ifndef _MAILMRGE_HRC
#define _MAILMRGE_HRC
-// #include -----------------------------------------------------------------
-
#include "envelp.hrc"
// Elemente -----------------------------------------------------------------
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
index f87f084..146fd02 100644
--- a/sw/source/ui/envelp/mailmrge.src
+++ b/sw/source/ui/envelp/mailmrge.src
@@ -25,7 +25,6 @@
*
************************************************************************/
- // #include *****************************************************************
#include "mailmrge.hrc"
#include "cmdid.h"
#include "helpid.h"
diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc
index 7ab2765..e121a97 100644
--- a/sw/source/ui/fldui/changedb.hrc
+++ b/sw/source/ui/fldui/changedb.hrc
@@ -28,8 +28,6 @@
#ifndef _CHANGEDB_HRC
#define _CHANGEDB_HRC
-// #include -----------------------------------------------------------------
-
// Elemente -----------------------------------------------------------------
#define FT_DESC 1
diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc
index eaa88e5..dcec8a7 100644
--- a/sw/source/ui/fldui/fldtdlg.hrc
+++ b/sw/source/ui/fldui/fldtdlg.hrc
@@ -28,10 +28,6 @@
#ifndef _FLDTDLG_HRC
#define _FLDTDLG_HRC
-// #include -----------------------------------------------------------------
-
-// #define ------------------------------------------------------------------
-
#define RC_FLDTDLG_BEGIN 0
// Datenbankfeld-TabPage:
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
index da651a4..9440c78 100644
--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- // #include *****************************************************************
+
#include "helpid.h"
#include "frmui.hrc"
#include "cption.hrc"
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx
index ffadad1..7eaf9a6 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/ui/inc/caption.hxx
@@ -28,17 +28,10 @@
#define _CAPTION_HXX
#include <tools/string.hxx>
-//#ifndef _STREAM_HXX //autogen
-//#include <tools/stream.hxx>
-//#endif
#include <tools/globname.hxx>
#include <SwCapObjType.hxx>
#include "swdllapi.h"
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
class SW_DLLPUBLIC InsCaptionOpt
{
private:
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx
index e2c0d91..095cc4c 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -28,9 +28,6 @@
#ifndef INCLUDED_MAILDISPATCHER_HXX
#define INCLUDED_MAILDISPATCHER_HXX
-//#ifndef _COM_SUN_STAR_MAIL_XMAILSERVER_HPP_
-//#include "com/sun/star/mail/XMailServer.hpp"
-//#endif
#include "com/sun/star/mail/XSmtpService.hpp"
#include "com/sun/star/mail/XMailMessage.hpp"
#include <osl/thread.hxx>
diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc
index af1c013..631f4a8 100644
--- a/sw/source/ui/inc/swmn_tmpl.hrc
+++ b/sw/source/ui/inc/swmn_tmpl.hrc
@@ -35,7 +35,6 @@
#include "globals.hrc"
#include "helpid.h"
#include "popup.hrc"
-//#include "cfgid.h"
/* --------------------- F O R M A T --------------------------------- */
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index 5deae6b..c1477f3 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -35,13 +35,10 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <list>
-//#ifndef _OSL_MUTEX_HXX_
-//#include <osl/mutex.hxx>
-//#endif
#include <vos/mutex.hxx>
class SwView;
-//---------------------------------------------------------------------------------------------------------------------
+
class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
<
::com::sun::star::frame::XDispatchProviderInterceptor,
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 918d181..d6aada9 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -41,11 +41,6 @@
#include <docsh.hxx>
#include <charfmt.hxx>
-//#ifndef _FLDMGR_HXX //autogen
-//#include <fldmgr.hxx>
-//#endif
-
-
#include <docstyle.hxx>
#include "fldbas.hxx"
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 0e3d55e..342bbb2 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -97,7 +97,6 @@
#include <swprtopt.hxx>
#include <linguistic/lngprops.hxx>
#include <editeng/unolingu.hxx>
-//#include <sfx2/app.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/scanner/ScannerContext.hpp>
#include <com/sun/star/scanner/XScannerManager.hpp>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 0ea6f0f..2008dbc 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -142,7 +142,6 @@
#include <view.hxx>
#include <srcview.hxx>
-//#include <com/sun/star/i18n/ScriptType.hpp>
#include <svtools/langtab.hxx>
#include <map>
#include <set>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 1942f82..60d99a5 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -94,7 +94,6 @@
#include <paratr.hxx>
#include <ndtxt.hxx>
#include <editeng/acorrcfg.hxx>
-//#include <svx/acorrcfg.hxx>
#include <IMark.hxx>
// -> #111827#
diff --git a/sw/util/hidother.src b/sw/util/hidother.src
index 5f992c0..c5173f8 100644
--- a/sw/util/hidother.src
+++ b/sw/util/hidother.src
@@ -25,7 +25,6 @@
*
************************************************************************/
#include "../inc/helpid.h" // HID_FUNC_XXX
-//#include "shellid.hxx" // HID_FUNC_XXX da kommen sie eigentlich her
#include "hidother.hrc"
// Help-IDs fuer Dokument-Fenster
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
