20 files changed, 2 insertions, 278 deletions
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index d48984391808..01f0ba78bf8e 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -22,8 +22,6 @@
 #include "scitems.hxx"
 #include <editeng/memberids.hrc>
 
-#define ITEMID_DBTYPE           0
-
 #include <sfx2/msg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
@@ -94,7 +92,6 @@
 
 #define SvxDrawToolItem             SfxAllEnumItem
 #define SvxDrawAlignItem            SfxAllEnumItem
-#define SvxChooseControlItem        SfxEnumItem
 #define avmedia_MediaItem           ::avmedia::MediaItem
 
 #if defined(IOS)
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index eb36cc92780e..89617f743608 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -50,7 +50,6 @@ using namespace com::sun::star;
 //  entries in the "type" ListBox
 #define DP_TYPELIST_TABLE   0
 #define DP_TYPELIST_QUERY   1
-#define DP_TYPELIST_SQL     2
 #define DP_TYPELIST_SQLNAT  3
 
 //-------------------------------------------------------------------------
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index d4744c454ef1..78e19fd81d4d 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -39,7 +39,6 @@
                         | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF          ABS_SREF \
                         | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D      ABS_SREF | SCA_TAB_3D
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
 //----------------------------------------------------------------------------
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 30997924df94..62dbcf369043 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -28,13 +28,6 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
-//  Pixelabstand zum Schliessen von Freihand-Zeichnungen
-#ifndef CLOSE_PIXDIST
-#define CLOSE_PIXDIST 5
-#endif
-
-//------------------------------------------------------------------------
-
 /*************************************************************************
 |*
 |* Konstruktor
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index b7994fb5c4c4..55bf00d1ca8b 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -17,63 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// TOOLS
-#define _BIGINT_HXX
-#define _CACHESTR_HXX
-#define _SVMEMPOOL_HXX
-#define _CACHESTR_HXX
-#define _SV_MULTISEL_HXX
-
-//SV
-#define _CONFIG_HXX
-#define _CURSOR_HXX
-#define _HELP_HXX
-#define _SPIN_HXX
-#define _STATUS_HXX
-#define _SOUND_HXX
-
-//svtools
-#define _SCRWIN_HXX
-#define _RULER_HXX
-#define _STDMENU_HXX
-#define _CTRLTOOL_HXX
-
-//SVTOOLS
-#define _FILTER_HXX
-#define _SVTABBX_HXX
-
-//sfxcore.hxx
-#define _SFXGENLINK_HXX
-#define _SFXHINTPOST_HXX
-#define _SFXDOCINF_HXX
-
-// SFX
-#define _SFXMSGPOOL_HXX
-#define _PASSWD_HXX
-#define _SFXTBXCTRL_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXMNUITEM_HXX
-#define _SFXIMGMGR_HXX
-#define _SFX_MINFITEM_HXX
-#define _SFXEVENT_HXX
-
-//sfxdlg.hxx
-#define _SFX_DINFDLG_HXX
-#define _SFX_MGETEMPL_HXX
-#define _SFX_TPLPITEM_HXX
-#define _NEWSTYLE_HXX
-
-//sfxitems.hxx
-#define _SFXFLAGITEM_HXX
-#define _SFXPTITEM_HXX
-#define _SFXRECTITEM_HXX
-#define _SFXITEMITER_HXX
-#define _SFX_WHITER_HXX
-#define _SFXPOOLCACH_HXX
-#define _SFXRNGITEM_HXX
-
-//------------------------------------------------------------------------
-
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdetc.hxx>
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index edc9445f7dd4..5364d5cd1cfe 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -37,8 +37,6 @@
 #define ScGraphicShell
 #include "scslots.hxx"
 
-#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
-
 class ScExternalToolEdit : public ExternalToolEdit
 {
     FmFormView* m_pView;
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 2a4b9d744165..79185a965e31 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -35,9 +35,6 @@
 #define ScMediaShell
 #include "scslots.hxx"
 
-#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
-
-
 SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) )
 {
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR) );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 84155409ec26..9345776aabe3 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -46,11 +46,8 @@
                         | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF          ABS_SREF \
                         | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D      ABS_SREF | SCA_TAB_3D
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
-#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
-
 #define RD_SPECIAL_NONE         0
 #define RD_SPECIAL_CONTENT      1
 #define RD_SPECIAL_VISCONTENT   2
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 752bf7089a4e..58012cfc7862 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -35,13 +35,8 @@
                         | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF          ABS_SREF \
                         | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D      ABS_SREF | SCA_TAB_3D
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
-
-
-#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
-
 //============================================================================
 //  class ScHighlightChgDlg
 
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 60bc8eaf1c7b..4468198a75ae 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -35,14 +35,8 @@
                         | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF          ABS_SREF \
                         | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D      ABS_SREF | SCA_TAB_3D
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
-//----------------------------------------------------------------------------
-
-#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute()
-#define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute()
-
 //============================================================================
 //  class ScSimpleRefDlg
 
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 67758d5d8801..3270ad9e23e1 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -47,7 +47,6 @@
     | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
 #define ABS_DREF          ABS_SREF \
     | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D      ABS_SREF | SCA_TAB_3D
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
 ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 85e8c44f44eb..d7506379aea1 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -61,7 +61,6 @@ using ::rtl::OUString;
 #define HDL(hdl)            LINK( this, ScPrintAreasDlg, hdl )
 #define ERRORBOX(nId)       ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \
                             ScGlobal::GetRscString( nId ) ).Execute()
-#define SWAP(x1,x2)         { int n=x1; x1=x2; x2=n; }
 
 // globale Funktionen (->am Ende der Datei):
 
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 0ae46f3a905f..be48bf0464e2 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _TPHFEDIT_CXX
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index bc33f4f28630..b0e20cfeaf5a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -94,7 +94,6 @@
 #include "scresid.hxx"
 
 using namespace com::sun::star;
-#define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
 
 // #i111553# provides the name of the VBA constant for this document type (e.g. 'ThisExcelDoc' for Calc)
 #define SC_UNO_VBAGLOBNAME "VBAGlobalConstantName"
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index fb90a9659411..3a826749a48c 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -40,10 +40,6 @@
 //  (selection left/right must be first because the continuous lines
 //  are partly overwritten later)
 
-#define SC_HDRPAINT_SEL_RIGHT   0
-#define SC_HDRPAINT_SEL_LEFT    1
-#define SC_HDRPAINT_TOP         2
-#define SC_HDRPAINT_SEL_TOP     3
 #define SC_HDRPAINT_SEL_BOTTOM  4
 #define SC_HDRPAINT_BOTTOM      5
 #define SC_HDRPAINT_TEXT        6
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 071d8de31eba..4417e9467e42 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -17,80 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _BIGINT_HXX
-#define _CACHESTR_HXX
-#define _CONFIG_HXX
-#define _CURSOR_HXX
-#define _CTRLTOOL_HXX
-#define _MACRODLG_HXX
-#define _OUTLINER_HXX
-#define _PASSWD_HXX
-#define _PRNDLG_HXX
-#define _RULER_HXX
-#define _SCRWIN_HXX
-#define _STDMENU_HXX
-#define _TABBAR_HXX
-
-//sfx
-#define _SFXCTRLITEM
-#define _SFXDISPATCH_HXX
-#define _SFXIMGMGR_HXX
-#define _SFX_MINFITEM_HXX
-
-//sfxcore.hxx
-#define _SFXGENLINK_HXX
-#define _SFXHINTPOST_HXX
-#define _SFXDOCINF_HXX
-
-// SFX
-#define _SFXMSGPOOL_HXX
-#define _PASSWD_HXX
-#define _SFXTBXCTRL_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXMNUITEM_HXX
-#define _SFXIMGMGR_HXX
-#define _SFX_MINFITEM_HXX
-#define _SFXEVENT_HXX
-
-//sfxdlg.hxx
-#define _SFX_DINFDLG_HXX
-#define _SFX_MGETEMPL_HXX
-#define _SFX_TPLPITEM_HXX
-#define _NEWSTYLE_HXX
-
-//sfxitems.hxx
-#define _SFXFLAGITEM_HXX
-#define _SFXPTITEM_HXX
-#define _SFXRECTITEM_HXX
-#define _SFXITEMITER_HXX
-#define _SFX_WHITER_HXX
-#define _SFXPOOLCACH_HXX
-#define _SFXRNGITEM_HXX
-
-#define _SFXBASIC_HXX
-#define _SFX_TEMPLDLG_HXX
-#define _SFXIMGMGR_HXX
-#define _SFXMNUITEM_HXX
-#define _SFXMNUMGR_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXTBXCTRL_HXX
-#define _SFXREQUEST_HXX
-#define _SFXOBJFACE_HXX
-#define _SFXMSGPOOL_HXX
-#define _SFXMSG_HXX
-#define _SFX_PRNMON_HXX
-
-#define _SVTABBX_HXX
-
-#define _SVX_HYPHEN_HXX
-#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTPATH_HXX
-#define _SVX_OPTLINGU_HXX
-#define _SVX_RULER_HXX
-#define _SVX_RULRITEM_HXX
-#define _SVX_SPLWRAP_HXX
-#define _SVX_THESDLG_HXX
-
 #include <sfx2/childwin.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index e30ba687a60f..c8e408418605 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -17,69 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// TOOLS
-#define _BIGINT_HXX
-#define _CACHESTR_HXX
-#define _SVMEMPOOL_HXX
-#define _CACHESTR_HXX
-
-//SV
-#define _CONFIG_HXX
-#define _CURSOR_HXX
-#define _HELP_HXX
-#define _SPIN_HXX
-#define _SOUND_HXX
-
-//svtools
-#define _SCRWIN_HXX
-#define _RULER_HXX
-#define _STDMENU_HXX
-#define _CTRLTOOL_HXX
-
-//SVTOOLS
-#define _FILTER_HXX
-#define _SVTABBX_HXX
-
-//sfxcore.hxx
-#define _SFXGENLINK_HXX
-#define _SFXHINTPOST_HXX
-#define _SFXDOCINF_HXX
-
-// SFX
-#define _SFXMSGPOOL_HXX
-#define _PASSWD_HXX
-#define _SFXTBXCTRL_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXMNUITEM_HXX
-#define _SFXIMGMGR_HXX
-#define _SFX_MINFITEM_HXX
-#define _SFXEVENT_HXX
-
-//sfxdlg.hxx
-#define _SFX_DINFDLG_HXX
-#define _SFX_MGETEMPL_HXX
-#define _SFX_TPLPITEM_HXX
-#define _NEWSTYLE_HXX
-#define _SFXDOCKWIN_HXX
-
-//sfxitems.hxx
-#define _SFXFLAGITEM_HXX
-#define _SFXPTITEM_HXX
-#define _SFXRECTITEM_HXX
-#define _SFXITEMITER_HXX
-#define _SFX_WHITER_HXX
-#define _SFXPOOLCACH_HXX
-#define _SFXRNGITEM_HXX
-
-#define _SVX_HYPHEN_HXX
-#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTPATH_HXX
-#define _SVX_OPTLINGU_HXX
-#define _SVX_RULER_HXX
-#define _SVX_RULRITEM_HXX
-#define _SVX_SPLWRAP_HXX
-#define _SVX_THESDLG_HXX
-
 #include <svx/svdmodel.hxx>
 #include <svl/smplhint.hxx>
 
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index d991b12e4ded..6f44a531248f 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -31,7 +31,9 @@
 #include "tabprotection.hxx"
 #include "markdata.hxx"
 
+#if defined WNT
 #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
+#endif
 
 extern sal_uInt16 nScFillModeMouseModifier;             // global.cxx
 
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 52ef47bd0fb6..0f94f9bed8bd 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -27,8 +27,6 @@
 
 ////////////////////// Umsetzen der Standard-Defines //////////////////////
 
-#define _SVDPAGE_HXX        // SdrPage
-
 #ifdef _SDR_NOGRAFOBJ
     #undef _SDR_NOGRAFOBJ
     #define _SVDOGRAF_HXX
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 28481eefaccf..ac26088950e1 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -17,50 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _BIGINT_HXX
-#define _CACHESTR_HXX
-#define _CONFIG_HXX
-#define _CURSOR_HXX
-#define _CTRLTOOL_HXX
-#define _MACRODLG_HXX
 #define _OUTLINER_HXX
-#define _RULER_HXX
-#define _SCRWIN_HXX
-#define _STDCTRL_HXX
-#define _STDMENU_HXX
-#define _TABBAR_HXX
-#define _VALUESET_HXX
-
-#define _PASSWD_HXX
-
-#define _SFX_PRNMON_HXX
-#define _SFX_RESMGR_HXX
-#define _SFX_TEMPLDLG_HXX
-#define _SFXBASIC_HXX
-#define _SFXCTRLITEM
-#define _SFXMNUITEM_HXX
-#define _SFXMNUMGR_HXX
-#define _SFXMSGPOOL_HXX
-#define _SFX_MINFITEM_HXX
-#define _SFXOBJFACE_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXTBXCTRL_HXX
-
-#define _SVTABBX_HXX
-#define _SVTREEBOX_HXX
-#define _SVTREELIST_HXX
-
-#define _SVX_HYPHEN_HXX
-#define _SVX_LAYCTRL_HXX
-#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTPATH_HXX
-#define _SVX_OPTLINGU_HXX
-#define _SVX_RULER_HXX
-#define _SVX_RULRITEM_HXX
-#define _SVX_SELCTRL_HXX
-#define _SVX_SPLWRAP_HXX
-#define _SVX_STDDLG_HXX
-#define _SVX_THESDLG_HXX
 
 #include "scitems.hxx"
 #include <svx/svdetc.hxx>