[Libreoffice] [Patch] Remove some dead code in sc

Hello,

Here is a small patch for dead code cleaning on sc

(LGPLv3+ / MPL)

Julien

commit 70660374dc7702e77d8089b8253cfdf39c651411
Author: serval <serval2412@yahoo.fr>
Date:   Sat Jan 15 01:00:00 2011 +0100

    Remove some dead code

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 9e92ac8..733964a 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -89,7 +89,6 @@
 
 //     Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker
 //     immer an der richtigen Zelle angezeigt wird
-//#define SHRINK_DIST          3
 //     und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt
 #define SHRINK_DIST            25
 
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 095fdbd..45ca915 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -46,9 +46,6 @@ using ::std::auto_ptr;
 using ::std::unary_function;
 using ::std::for_each;
 
-//2do: DocOption TimeOut?
-//#define SC_CHARTTIMEOUT 1000         // eine Sekunde keine Aenderung/KeyEvent
-
 // Update chart listeners quickly, to get a similar behavior to loaded charts
 // which register UNO listeners.
 #define SC_CHARTTIMEOUT 10
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 7e49aa8..0bbc1f1 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -57,8 +57,6 @@ using namespace formula;
 #define SCdEpsilon                1.0E-7
 #define SC_MAX_ITERATION_COUNT    20
 #define MAX_ANZ_DOUBLE_FOR_SORT 100000
-// PI jetzt als F_PI aus solar.h
-//#define   PI            3.1415926535897932
 
 const double ScInterpreter::fMaxGammaArgument = 171.624376956302;  // found experimental
 const double fMachEps = ::std::numeric_limits<double>::epsilon();
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 81887cf..32fec8a 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -98,7 +98,6 @@ using ::std::vector;
 #define SC_SERVICE_DRVMAN                      "com.sun.star.sdbc.DriverManager"
 
 //!    move to a header file?
-//#define SC_DBPROP_DATASOURCENAME     "DataSourceName"
 #define SC_DBPROP_ACTIVECONNECTION     "ActiveConnection"
 #define SC_DBPROP_COMMAND                      "Command"
 #define SC_DBPROP_COMMANDTYPE          "CommandType"
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 0fd5c74..3b2e5ce 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -42,92 +42,22 @@
 #define _TREELIST_HXX
 #define _CACHESTR_HXX
 #define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
 #define _DYNARY_HXX
-//#define _UNQIDX_HXX
 #define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
 #define _CACHESTR_HXX
 #define _SV_MULTISEL_HXX
 
 //SV
-//#define _CLIP_HXX ***
 #define _CONFIG_HXX
 #define _CURSOR_HXX
 #define _FONTDLG_HXX
 #define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
 #define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
 #define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX ***
-//#define _SPLIT_HXX
 #define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX ***
-//#define _TOOLBOX_HXX
 #define _STATUS_HXX
 #define _SVTCTRL3_HXX
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
-//#define _FILDLG_HXX ***
-//#define _PRNDLG_HXX
 #define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _MENU_HXX ***
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
 #define _SOUND_HXX
 
 #if defined  WIN
@@ -137,48 +67,28 @@
 //svtools
 #define _SCRWIN_HXX
 #define _RULER_HXX
-//#define _TABBAR_HXX
-//#define _VALUESET_HXX
 #define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _CTRLBOX_HXX
 #define _CTRLTOOL_HXX
 #define _EXTATTR_HXX
 #define _FRM3D_HXX
 #define _EXTATTR_HXX
 
 //SVTOOLS
-//#define _SVTREELIST_HXX
 #define _FILTER_HXX
-//#define _SVLBOXITM_HXX
-//#define _SVTREEBOX_HXX
 #define _SVICNVW_HXX
 #define _SVTABBX_HXX
 
 //sfxcore.hxx
-//#define _SFXINIMGR_HXX
-//#define _SFXCFGITEM_HXX
-//#define _SFX_PRINTER_HXX
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
 #define _SFXLINKHDL_HXX
-//#define _SFX_PROGRESS_HXX
 
 //sfxsh.hxx
-//#define _SFX_SHELL_HXX
-//#define _SFXAPP_HXX
-//#define _SFXDISPATCH_HXX
-//#define _SFXMSG_HXX
-//#define _SFXOBJFACE_HXX
-//#define _SFXREQUEST_HXX
 #define _SFXMACRO_HXX
 
 // SFX
-//#define _SFXAPPWIN_HXX
 #define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
 #define _SFXPRNMON_HXX
 #define _INTRO_HXX
 #define _SFXMSGDESCR_HXX
@@ -195,79 +105,37 @@
 #define _SFXEVENT_HXX
 
 //sfxdoc.hxx
-//#define _SFX_OBJSH_HXX
-//#define _SFX_CLIENTSH_HXX
-//#define _SFXDOCINF_HXX
-//#define _SFX_OBJFAC_HXX
 #define _SFX_DOCFILT_HXX
-//#define _SFXDOCFILE_HXX
-//define _VIEWFAC_HXX
-//#define _SFXVIEWFRM_HXX
-//#define _SFXVIEWSH_HXX
-//#define _MDIFRM_HXX
 #define _SFX_IPFRM_HXX
-//#define _SFX_INTERNO_HXX
 
 //sfxdlg.hxx
-//#define _SFXTABDLG_HXX
-//#define _BASEDLGS_HXX
 #define _SFX_DINFDLG_HXX
 #define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
-//#define _SFX_STYLEDLG_HXX
 #define _NEWSTYLE_HXX
-//#define _SFXDOCTEMPL_HXX
-//#define _SFXDOCTDLG_HXX
-//#define _SFX_TEMPLDLG_HXX
-//#define _SFXNEW_HXX
 #define _SFXDOCMAN_HXX
-//#define _SFXDOCKWIN_HXX **
 
 //sfxitems.hxx
 #define _SFX_WHMAP_HXX
-//#define _ARGS_HXX ***
-//#define _SFXPOOLITEM_HXX
-//#define _SFXINTITEM_HXX
-//#define _SFXENUMITEM_HXX
 #define _SFXFLAGITEM_HXX
-//#define _SFXSTRITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
-//#define _SFXITEMPOOL_HXX
-//#define _SFXITEMSET_HXX
 #define _SFXITEMITER_HXX
 #define _SFX_WHITER_HXX
 #define _SFXPOOLCACH_HXX
-//#define _AEITEM_HXX
 #define _SFXRNGITEM_HXX
-//#define _SFXSLSTITM_HXX
-//#define _SFXSTYLE_HXX
-
-//xout.hxx
-//#define _XENUM_HXX
-//#define _XPOLY_HXX
-//#define _XATTR_HXX
-//#define _XOUTX_HXX
-//#define _XPOOL_HXX
-//#define _XTABLE_HXX
 
 //svdraw.hxx
 #define _SDR_NOITEMS
 #define _SDR_NOTOUCH
 #define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS
 
-//#define SI_NOITEMS
-//#define SI_NODRW
 #define _SI_NOSBXCONTROLS
 #define _VCATTR_HXX
 #define _VCONT_HXX
-//#define _VCSBX_HXX ***
 #define _SI_NOOTHERFORMS
 #define _VCTRLS_HXX
-//#define _VCDRWOBJ_HXX ***
 #define _SI_NOCONTROL
 #define _SETBRW_HXX
 #define _VCBRW_HXX
diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index 20efbef..4924c16 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -71,7 +71,6 @@
 #define LB_ALGORITHM        19
 #define        BTN_NATURALSORT         20
 
-//#define RID_SCDLG_SORT_WARNING
 #define FT_TEXT             1
 #define FT_TIP              2
 #define BTN_EXTSORT         3
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index afaefed..25506ec 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -42,96 +42,25 @@
 #define _TREELIST_HXX
 #define _CACHESTR_HXX
 #define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
 #define _DYNARY_HXX
-//#define _UNQIDX_HXX
 #define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
 #define _CACHESTR_HXX
 #define _SV_MULTISEL_HXX
 
 //SV
-//#define _CLIP_HXX
 #define _CONFIG_HXX
 #define _CURSOR_HXX
 #define _FONTDLG_HXX
 #define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
 #define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
 #define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX
-//#define _SPLIT_HXX
 #define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX
-//#define _TOOLBOX_HXX
-//#define _STATUS_HXX
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
 #define _FILDLG_HXX
-//#define _PRNDLG_HXX
 #define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _MENU_HXX
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
 #define _SOUND_HXX
 
 
 #define SI_NOITEMS
-//#define SI_NODRW
 #define _SI_NOSBXCONTROLS
 #define _SI_NOOTHERFORMS
 #define _SI_NOCONTROL
@@ -141,8 +70,6 @@
 // SFX
 #define _SFXAPPWIN_HXX
 #define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
 #define _SFXPRNMON_HXX
 #define _INTRO_HXX
 #define _SFXMSGDESCR_HXX
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index fed6f09..f1d114d 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -53,19 +53,15 @@
 #define _OUTLINER_HXX
 #define _PASSWD_HXX
 #define _PRNDLG_HXX
-//#define _POLY_HXX
 #define _PVRWIN_HXX
 #define _QUEUE_HXX
 #define _RULER_HXX
 #define _SCRWIN_HXX
 #define _SETBRW_HXX
 #define _STACK_HXX
-//#define _STATUS_HXX ***
 #define _STDMENU_HXX
 #define _TABBAR_HXX
-//#define _VCBRW_HXX
 #define _VCTRLS_HXX
-//#define _VCSBX_HXX
 #define _VCONT_HXX
 #define _VDRWOBJ_HXX
 
@@ -83,29 +79,16 @@
 
 
 //sfxcore.hxx
-//#define _SFXINIMGR_HXX ***
-//#define _SFXCFGITEM_HXX
-//#define _SFX_PRINTER_HXX
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
 #define _SFXLINKHDL_HXX
-//#define _SFX_PROGRESS_HXX
 
 //sfxsh.hxx
-//#define _SFX_SHELL_HXX
-//#define _SFXAPP_HXX
-//#define _SFXDISPATCH_HXX
-//#define _SFXMSG_HXX ***
-//#define _SFXOBJFACE_HXX ***
-//#define _SFXREQUEST_HXX
 #define _SFXMACRO_HXX
 
 // SFX
-//#define _SFXAPPWIN_HXX ***
 #define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
 #define _SFXPRNMON_HXX
 #define _INTRO_HXX
 #define _SFXMSGDESCR_HXX
@@ -122,72 +105,32 @@
 #define _SFXEVENT_HXX
 
 //sfxdoc.hxx
-//#define _SFX_OBJSH_HXX
-//#define _SFX_CLIENTSH_HXX
-//#define _SFXDOCINF_HXX
-//#define _SFX_OBJFAC_HXX
 #define _SFX_DOCFILT_HXX
-//#define _SFXDOCFILE_HXX ***
-//define _VIEWFAC_HXX
-//#define _SFXVIEWFRM_HXX
-//#define _SFXVIEWSH_HXX
-//#define _MDIFRM_HXX ***
 #define _SFX_IPFRM_HXX
-//#define _SFX_INTERNO_HXX
 
 //sfxdlg.hxx
-//#define _SFXTABDLG_HXX
-//#define _BASEDLGS_HXX ***
 #define _SFX_DINFDLG_HXX
 #define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
-//#define _SFX_STYLEDLG_HXX
 #define _NEWSTYLE_HXX
-//#define _SFXDOCTEMPL_HXX ***
-//#define _SFXDOCTDLG_HXX ***
-//#define _SFX_TEMPLDLG_HXX ***
-//#define _SFXNEW_HXX ***
 #define _SFXDOCMAN_HXX
-//#define _SFXDOCKWIN_HXX
 
 //sfxitems.hxx
 #define _SFX_WHMAP_HXX
 #define _ARGS_HXX
-//#define _SFXPOOLITEM_HXX
-//#define _SFXINTITEM_HXX
-//#define _SFXENUMITEM_HXX
 #define _SFXFLAGITEM_HXX
-//#define _SFXSTRITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
-//#define _SFXITEMPOOL_HXX
-//#define _SFXITEMSET_HXX
 #define _SFXITEMITER_HXX
 #define _SFX_WHITER_HXX
 #define _SFXPOOLCACH_HXX
-//#define _AEITEM_HXX
 #define _SFXRNGITEM_HXX
-//#define _SFXSLSTITM_HXX
-//#define _SFXSTYLE_HXX
-
-//xout.hxx
-//#define _XENUM_HXX
-//#define _XPOLY_HXX
-//#define _XATTR_HXX
-//#define _XOUTX_HXX
-//#define _XPOOL_HXX
-//#define _XTABLE_HXX
 
 //svdraw.hxx
 #define _SDR_NOITEMS
 #define _SDR_NOTOUCH
 #define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS
-
-
-
 
 #define _SFXBASIC_HXX
 #define _SFX_DOCFILE_HXX
@@ -213,21 +156,11 @@
 //si
 #define _SI_NOSBXCONTROLS
 #define _SI_NOCONTROL
-//#define SI_NOITEMS
-//#define SI_NODRW
-//#define SI_NOOTHERFORMS
 #define _SIDLL_HXX
-//#define _VCSBX_HXX
-//#define _VCBRW_HXX
 
-//#define _SVDATTR_HXX         <--- der wars
 #define _SVDXOUT_HXX
 #define _SVDEC_HXX
-//#define _SVDIO_HXX
-//#define _SVDLAYER_HXX
-//#define _SVDRAG_HXX
 #define _SVINCVW_HXX
-//#define _SV_MULTISEL_HXX
 #define _SVRTV_HXX
 #define _SVTABBX_HXX
 
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 58c048d..45592eb 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -42,89 +42,19 @@
 #define _TREELIST_HXX
 #define _CACHESTR_HXX
 #define _NEW_HXX
-//#define _SHL_HXX
-//#define _LINK_HXX
-//#define _ERRCODE_HXX
-//#define _GEN_HXX
-//#define _FRACT_HXX
-//#define _STRING_HXX
-//#define _MTF_HXX
-//#define _CONTNR_HXX
-//#define _LIST_HXX
-//#define _TABLE_HXX
 #define _DYNARY_HXX
-//#define _UNQIDX_HXX
 #define _SVMEMPOOL_HXX
-//#define _UNQID_HXX
-//#define _DEBUG_HXX
-//#define _DATE_HXX
-//#define _TIME_HXX
-//#define _DATETIME_HXX
-//#define _INTN_HXX
-//#define _WLDCRD_HXX
-//#define _FSYS_HXX
-//#define _STREAM_HXX
 #define _CACHESTR_HXX
-//#define _SV_MULTISEL_HXX
 
 //SV
-//#define _CLIP_HXX ***
 #define _CONFIG_HXX
 #define _CURSOR_HXX
 #define _FONTDLG_HXX
 #define _PRVWIN_HXX
-//#define _COLOR_HXX
-//#define _PAL_HXX
-//#define _BITMAP_HXX
-//#define _GDIOBJ_HXX
-//#define _POINTR_HXX
-//#define _ICON_HXX
-//#define _IMAGE_HXX
-//#define _KEYCOD_HXX
-//#define _EVENT_HXX
 #define _HELP_HXX
-//#define _APP_HXX
-//#define _MDIAPP_HXX
-//#define _TIMER_HXX
-//#define _METRIC_HXX
-//#define _REGION_HXX
-//#define _OUTDEV_HXX
-//#define _SYSTEM_HXX
-//#define _VIRDEV_HXX
-//#define _JOBSET_HXX
-//#define _PRINT_HXX
-//#define _WINDOW_HXX
-//#define _SYSWIN_HXX
-//#define _WRKWIN_HXX
 #define _MDIWIN_HXX
-//#define _FLOATWIN_HXX
-//#define _DOCKWIN_HXX
-//#define _CTRL_HXX
-//#define _SCRBAR_HXX
-//#define _BUTTON_HXX
-//#define _IMAGEBTN_HXX
-//#define _FIXED_HXX
-//#define _GROUP_HXX
-//#define _EDIT_HXX
-//#define _COMBOBOX_HXX
-//#define _LSTBOX_HXX
-//#define _SELENG_HXX ***
-//#define _SPLIT_HXX
 #define _SPIN_HXX
-//#define _FIELD_HXX
-//#define _MOREBTN_HXX ***
-//#define _TOOLBOX_HXX
-//#define _STATUS_HXX ***
-//#define _DIALOG_HXX
-//#define _MSGBOX_HXX
-//#define _SYSDLG_HXX
-//#define _PRNDLG_HXX
 #define _COLDLG_HXX
-//#define _TABDLG_HXX
-//#define _GDIMTF_HXX
-//#define _POLY_HXX
-//#define _ACCEL_HXX
-//#define _GRAPH_HXX
 #define _SOUND_HXX
 
 #if defined  WIN
@@ -134,48 +64,28 @@
 //svtools
 #define _SCRWIN_HXX
 #define _RULER_HXX
-//#define _TABBAR_HXX
-//#define _VALUESET_HXX
 #define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _CTRLBOX_HXX
 #define _CTRLTOOL_HXX
 #define _EXTATTR_HXX
 #define _FRM3D_HXX
 #define _EXTATTR_HXX
 
 //SVTOOLS
-//#define _SVTREELIST_HXX ***
 #define _FILTER_HXX
-//#define _SVLBOXITM_HXX ***
-//#define _SVTREEBOX_HXX ***
 #define _SVICNVW_HXX
 #define _SVTABBX_HXX
 
 //sfxcore.hxx
-//#define _SFXINIMGR_HXX ***
-//#define _SFXCFGITEM_HXX
-//#define _SFX_PRINTER_HXX
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
 #define _SFXLINKHDL_HXX
-//#define _SFX_PROGRESS_HXX
 
 //sfxsh.hxx
-//#define _SFX_SHELL_HXX
-//#define _SFXAPP_HXX
-//#define _SFXDISPATCH_HXX
-//#define _SFXMSG_HXX ***
-//#define _SFXOBJFACE_HXX ***
-//#define _SFXREQUEST_HXX
 #define _SFXMACRO_HXX
 
 // SFX
-//#define _SFXAPPWIN_HXX ***
 #define _SFX_SAVEOPT_HXX
-//#define _SFX_CHILDWIN_HXX
-//#define _SFXCTRLITEM_HXX
 #define _SFXPRNMON_HXX
 #define _INTRO_HXX
 #define _SFXMSGDESCR_HXX
@@ -192,69 +102,32 @@
 #define _SFXEVENT_HXX
 
 //sfxdoc.hxx
-//#define _SFX_OBJSH_HXX
-//#define _SFX_CLIENTSH_HXX
-//#define _SFXDOCINF_HXX
-//#define _SFX_OBJFAC_HXX
 #define _SFX_DOCFILT_HXX
-//#define _SFXDOCFILE_HXX ***
-//define _VIEWFAC_HXX
-//#define _SFXVIEWFRM_HXX
-//#define _SFXVIEWSH_HXX
-//#define _MDIFRM_HXX ***
 #define _SFX_IPFRM_HXX
-//#define _SFX_INTERNO_HXX
 
 //sfxdlg.hxx
-//#define _SFXTABDLG_HXX
-//#define _BASEDLGS_HXX ***
 #define _SFX_DINFDLG_HXX
 #define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
-//#define _SFX_STYLEDLG_HXX
 #define _NEWSTYLE_HXX
-//#define _SFXDOCTEMPL_HXX ***
-//#define _SFXDOCTDLG_HXX ***
-//#define _SFX_TEMPLDLG_HXX ***
-//#define _SFXNEW_HXX ***
 #define _SFXDOCMAN_HXX
 #define _SFXDOCKWIN_HXX
 
 //sfxitems.hxx
 #define _SFX_WHMAP_HXX
-//#define _ARGS_HXX ***
-//#define _SFXPOOLITEM_HXX
-//#define _SFXINTITEM_HXX
-//#define _SFXENUMITEM_HXX
 #define _SFXFLAGITEM_HXX
-//#define _SFXSTRITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
-//#define _SFXITEMPOOL_HXX
-//#define _SFXITEMSET_HXX
 #define _SFXITEMITER_HXX
 #define _SFX_WHITER_HXX
 #define _SFXPOOLCACH_HXX
-//#define _AEITEM_HXX
 #define _SFXRNGITEM_HXX
-//#define _SFXSLSTITM_HXX
-//#define _SFXSTYLE_HXX
-
-//xout.hxx
-//#define _XENUM_HXX
-//#define _XPOLY_HXX
-//#define _XATTR_HXX
-//#define _XOUTX_HXX
-//#define _XPOOL_HXX
-//#define _XTABLE_HXX
 
 //svdraw.hxx
 #define _SDR_NOITEMS
 #define _SDR_NOTOUCH
 #define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS
 #define _SDR_NOTRANSFORM
 #define _SDR_NOVIEWMARKER
 #define _SDR_NODRAGMETHODS
@@ -262,20 +135,14 @@
 #define _SDR_NOXOUTDEV
 
 
-//#define SI_NOITEMS
-//#define SI_NODRW
 #define _SI_NOSBXCONTROLS
-//#define _VCATTR_HXX
 #define _VCONT_HXX
-//#define _VCSBX_HXX
 #define _SI_NOOTHERFORMS
 #define _VCTRLS_HXX
-//#define _VCDRWOBJ_HXX
 #define _SI_NOCONTROL
 #define _SETBRW_HXX
 #define _VCBRW_HXX
 #define _SI_NOSBXCONTROLS
-//#define _SIDLL_HXX ***
 
 #define _SVX_DAILDLL_HXX
 #define _SVX_HYPHEN_HXX
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index ebb4032..8ad149e 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -33,8 +33,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-//#define SI_VCDRAWOBJ
-
 #include <tools/urlobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>