[Libreoffice-commits] .: 5 commits - accessibility/source basctl/source bridges/source chart2/source cosv/inc cppcanvas/source crashrep/source cui/source dbaccess/source desktop/unx dtrans/source editeng/inc editeng/source extensions/source filter/source formula/inc fpicker/source framework/inc framework/source i18npool/source l10ntools/source lingucomponent/source linguistic/inc oox/inc padmin/source regexp/source reportdesign/source sal/osl sal/qa sal/workben scaddins/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source starmath/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source tools/inc tools/source uui/source vbahelper/inc vcl/generic vcl/inc vcl/source writerfilter/source xml2cmp/source xmloff/source xmlsecurity/source xmlsecurity/workben
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jul 2 08:47:20 PDT 2012
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 2
basctl/source/basicide/basidesh.src | 7
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 2
chart2/source/controller/dialogs/ResourceIds.hrc | 1
chart2/source/controller/dialogs/tp_AxisPositions.src | 1
cosv/inc/cosv/comfunc.hxx | 3
cppcanvas/source/mtfrenderer/emfplus.cxx | 2
crashrep/source/unx/main.cxx | 2
cui/source/customize/eventdlg.hrc | 3
cui/source/dialogs/scriptdlg.hrc | 1
cui/source/inc/numpages.hxx | 1
cui/source/inc/optpath.hxx | 4
cui/source/options/doclinkdialog.src | 1
cui/source/options/optaccessibility.hrc | 1
cui/source/options/treeopt.hrc | 2
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/labdlg.hrc | 2
cui/source/tabpages/macroass.hrc | 2
cui/source/tabpages/textanim.src | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 1
dbaccess/source/ui/dlg/queryfilter.hrc | 1
dbaccess/source/ui/inc/TableDesignControl.hxx | 1
dbaccess/source/ui/inc/dbu_resource.hrc | 6
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 3
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 7
dbaccess/source/ui/tabledesign/table.src | 1
desktop/unx/source/splashx.c | 10 -
dtrans/source/win32/ftransl/ftranslentry.cxx | 5
editeng/inc/editeng/outliner.hxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editundo.cxx | 3
editeng/source/editeng/editundo.hxx | 6
editeng/source/items/flditem.cxx | 3
editeng/source/misc/splwrap.cxx | 3
editeng/source/outliner/outliner.cxx | 2
extensions/source/abpilot/abpresid.hrc | 1
extensions/source/bibliography/datman.cxx | 2
extensions/source/dbpilots/optiongrouplayouter.cxx | 1
extensions/source/propctrlr/taborder.hrc | 2
extensions/source/update/ui/updatecheckui.cxx | 2
filter/source/graphicfilter/icgm/chart.hxx | 10 -
filter/source/graphicfilter/icgm/main.hxx | 12 -
filter/source/msfilter/powerpoint/pptcom.hxx | 2
filter/source/svg/svgwriter.hxx | 1
formula/inc/formula/formula.hxx | 3
fpicker/source/office/iodlg.hxx | 2
framework/inc/acceleratorconst.h | 1
framework/source/fwe/xml/menudocumenthandler.cxx | 1
i18npool/source/nativenumber/nativenumbersupplier.cxx | 1
l10ntools/source/merge.cxx | 5
lingucomponent/source/lingutil/lingutil.hxx | 12 -
linguistic/inc/linguistic/misc.hxx | 1
oox/inc/oox/export/utils.hxx | 2
padmin/source/helper.hxx | 2
regexp/source/reclass.cxx | 2
reportdesign/source/ui/dlg/CondFormat.hrc | 1
sal/osl/unx/process.cxx | 4
sal/osl/unx/signal.c | 2
sal/qa/osl/file/osl_File_Const.h | 5
sal/workben/testfile.cxx | 2
sc/inc/address.hxx | 2
sc/inc/column.hxx | 3
sc/inc/global.hxx | 17 --
sc/inc/pivot.hxx | 1
sc/inc/refdata.hxx | 10 -
sc/source/filter/inc/scflt.hxx | 11 -
sc/source/ui/inc/optdlg.hrc | 3
sc/source/ui/inc/submenu.hrc | 1
sc/source/ui/inc/viewdata.hxx | 1
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/view/tabvwsh3.cxx | 6
scaddins/source/analysis/analysisdefs.hxx | 1
scaddins/source/analysis/analysishelper.hxx | 1
sd/inc/glob.hxx | 4
sd/inc/sdattr.hrc | 1
sd/source/filter/html/htmlex.cxx | 3
sd/source/ui/annotations/annotations.hrc | 2
sd/source/ui/app/_app.hrc | 1
sd/source/ui/dlg/morphdlg.cxx | 6
sd/source/ui/dlg/present.src | 1
sd/source/ui/inc/present.hrc | 1
sd/source/ui/inc/pubdlg.hrc | 4
sd/source/ui/view/drviewsb.cxx | 2
sfx2/inc/sfx2/cntids.hrc | 1
sfx2/inc/sfx2/evntconf.hxx | 2
sfx2/inc/sfx2/msg.hxx | 15 -
sfx2/inc/sfx2/prnmon.hxx | 4
sfx2/inc/sfx2/sfx.hrc | 6
sfx2/inc/sfx2/sfxbasemodel.hxx | 2
sfx2/inc/sfx2/sfxsids.hrc | 1
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/inc/doctemplates.hxx | 1
sfx2/source/inc/eventsupplier.hxx | 2
sfx2/source/inc/sfxtypes.hxx | 7
sfx2/source/view/sfxbasecontroller.cxx | 3
starmath/source/smres.src | 2
starmath/source/typemap.cxx | 73 ---------
svtools/inc/svtools/imagemgr.hrc | 1
svtools/source/contnr/imivctl.hxx | 3
svtools/source/filter/sgvmain.cxx | 15 -
svtools/source/filter/sgvtext.cxx | 2
svtools/source/filter/wmf/winmtf.hxx | 4
svx/inc/svx/bmpmask.hxx | 10 -
svx/inc/svx/contdlg.hxx | 10 -
svx/inc/svx/globl3d.hxx | 4
svx/inc/svx/svxids.hrc | 2
svx/source/engine3d/float3d.cxx | 2
svx/source/engine3d/float3d.src | 4
svx/source/svdraw/svdcrtv.cxx | 1
svx/source/svdraw/svdobj.cxx | 1
svx/source/tbxctrls/tbxalign.cxx | 1
svx/source/tbxctrls/tbxdraw.hrc | 22 --
svx/source/tbxctrls/tbxdrctl.cxx | 1
sw/inc/chrdlg.hrc | 1
sw/inc/cmdid.h | 78 ----------
sw/inc/fldui.hrc | 1
sw/inc/fmtui.hrc | 2
sw/inc/globals.hrc | 2
sw/inc/index.hrc | 4
sw/inc/rcid.hrc | 1
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/inc/dbg_lay.hxx | 4
sw/source/core/inc/txtfrm.hxx | 8 -
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/chrdlg/chardlg.hrc | 4
sw/source/ui/chrdlg/paradlg.hrc | 3
sw/source/ui/config/optdlg.hrc | 2
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/frmdlg/cption.hrc | 1
sw/source/ui/frmdlg/pattern.hrc | 4
sw/source/ui/inc/frmui.hrc | 2
sw/source/ui/inc/misc.hrc | 16 --
sw/source/ui/inc/ribbar.hrc | 1
sw/source/ui/inc/table.hrc | 1
sw/source/ui/index/cnttab.cxx | 5
sw/source/ui/misc/outline.hrc | 1
sw/source/ui/ribbar/inputwin.hrc | 2
sw/source/ui/ribbar/workctrl.hrc | 1
sw/source/ui/uiview/pview.hrc | 8 -
sw/source/ui/uiview/viewsrch.cxx | 4
sw/source/ui/utlui/navipi.cxx | 12 -
sw/source/ui/utlui/navipi.hrc | 1
sw/source/ui/vba/vbaapplication.cxx | 6
tools/inc/poly.h | 2
tools/inc/tools/fsys.hxx | 3
tools/inc/tools/gen.hxx | 1
tools/source/fsys/dirent.cxx | 4
tools/source/fsys/unx.hxx | 1
tools/source/fsys/wntmsc.hxx | 4
tools/source/generic/color.cxx | 6
uui/source/ids.hrc | 1
vbahelper/inc/vbahelper/vbahelper.hxx | 2
vcl/generic/glyphs/gcach_layout.cxx | 2
vcl/inc/vcl/cmdevt.hxx | 1
vcl/inc/vcl/event.hxx | 1
vcl/inc/vcl/spin.h | 7
vcl/inc/vcl/syswin.hxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 1
writerfilter/source/dmapper/ConversionHelper.cxx | 2
xml2cmp/source/inc/precomp.h | 1
xmloff/source/text/txtprmap.cxx | 4
xmlsecurity/source/dialogs/dialogs.hrc | 24 ---
xmlsecurity/workben/signaturetest.cxx | 2
165 files changed, 14 insertions(+), 707 deletions(-)
New commits:
commit 278000a28b8eceb8528ebdcf1d601de8192979e8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 2 17:45:34 2012 +0200
Remove unused defines
Some of them were commented out for documentation purpose.
Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 9807d60..a08d2d7 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -46,8 +46,6 @@
#include <comphelper/accessibleeventnotifier.hxx>
#define ACCESSIBLE_ACTION_COUNT 1
-#define AID_EXPAND 0
-#define AID_COLLAPSE 1
namespace
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index a275312..e62c779 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -710,8 +710,6 @@ namespace
}
-#define MIN_LINE_SIZE 32
-
void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const * /*bptr*/, unsigned char const * /*eptr*/)
{
sysmips(FLUSH_CACHE,0,0,0);
diff --git a/cosv/inc/cosv/comfunc.hxx b/cosv/inc/cosv/comfunc.hxx
index 65c2729..a294d81 100644
--- a/cosv/inc/cosv/comfunc.hxx
+++ b/cosv/inc/cosv/comfunc.hxx
@@ -62,9 +62,6 @@ no_str(const char * str) { return str != 0 ? *str == '\0' : true; }
} // namespace csv
-#define NON_COPYABLE(xy) \
- private: xy(const xy &); xy & operator=(const xy &)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 79a9f74..7b2e8d7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -875,8 +875,6 @@ namespace cppcanvas
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
#define SET_FILL_COLOR(x) \
rState.fillColor = COLOR(x);
-#define SET_LINE_COLOR(x) \
- rState.lineColor = COLOR(x);
#define SET_TEXT_COLOR(x) \
rState.textColor = COLOR(x);
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 658fd48..6e385d2 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -76,8 +76,6 @@ static char g_szStackFile[L_tmpnam] = "";
static char g_szDescriptionFile[2048] = "";
static char g_szReportFile[2048] = "";
-#define PSTACK_CMD "pstack %d"
-
#ifdef LINUX
#define PMAP_CMD "cat /proc/%d/maps"
#else
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index cc89339..897aa15 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -141,7 +141,6 @@ class SvxBulletPickTabPage : public SfxTabPage
/*--------------------------------------------------
TabPage for complete numeration
--------------------------------------------------*/
-#define NUMTYPE_MEMBER 4 // number of elements of the FormatString per level
#define NUM_VALUSET_COUNT 16
class SvxNumPickTabPage : public SfxTabPage
{
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 7e85761..d09021a 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -54,10 +54,6 @@ namespace svx
struct OptPath_Impl;
class SvxPathTabPage;
-// define ----------------------------------------------------------------
-
-#define SfxPathTabPage SvxPathTabPage
-
// class SvxPathTabPage --------------------------------------------------
class SvxPathTabPage : public SfxTabPage
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 63b1ade..505b2a9 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -581,8 +581,6 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
// -----------------------------------------------------------------------
-#define IS_DONT_CARE(a) ((a).GetState() == svx::FRAMESTATE_DONTCARE )
-
sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
{
bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs );
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 45b6609..b3bea65 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -88,7 +88,6 @@ namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))
#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR "))
#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE "))
-#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = "))
#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))
#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index 341b2dd..5430a0b 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -25,7 +25,6 @@
#include "IClipBoardTest.hxx"
#include "TypeInfo.hxx"
-#define TABPAGESIZE 70
namespace dbaui
{
class OTableDesignView;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 2afdb91..b3b2c98 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -34,13 +34,6 @@ namespace connectivity
namespace dbaui
{
- //==================================================================
-#define SIZ_NONE 0
-#define SIZ_TOP 1
-#define SIZ_BOTTOM 2
-#define SIZ_LEFT 4
-#define SIZ_RIGHT 8
-
#define BROW_FIELD_ROW 0
#define BROW_COLUMNALIAS_ROW 1
#define BROW_TABLE_ROW 2
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 3d3981d..b08ba48 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -99,9 +99,6 @@ struct splash
#define PROGRESS_YOFFSET 18
#define PROGRESS_BARSPACE 2
-#define BMP_HEADER_LEN 14
-#define WIN_INFO_LEN 40
-
#define UINT8( x ) ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) )
#define UINT16( x ) ( ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) + \
@@ -114,13 +111,6 @@ struct splash
#define MAX( x, y ) ( ( (x) > (y) )? (x): (y) )
-#define LOAD_FAILURE( msg ) \
- { \
- fprintf( stderr, "%s: " msg, filename ); \
- close( fd ); \
- return 0; \
- }
-
/* libpng-1.2.41 */
#ifndef PNG_TRANSFORM_GRAY_TO_RGB
# define PNG_TRANSFORM_GRAY_TO_RGB 0x2000
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 7a7b217..8e40e53 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -37,11 +37,6 @@
// the implementation names
#define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator"
-// the registry key names
-// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName"
-// < Implementation-Name ></UNO/SERVICES/>< Service-Name >
-#define REGKEY_NAME "/com.sun.star.datatransfer.DataFormatTranslator/UNO/SERVICES/com.sun.star.datatransfer.DataFormatTranslator"
-
//-----------------------------------------------------------------------------------------------------------
// namespace directives
//-----------------------------------------------------------------------------------------------------------
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 8007945..fb6df2e 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -186,8 +186,6 @@ inline void ParaRange::Adjust()
}
}
-#define OL_ROOTPARENT (Paragraph*)NULL
-
class EDITENG_DLLPUBLIC OutlinerView
{
friend class Outliner;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 05bc899..58d0f7a 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -32,8 +32,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#define USE_SVXFONT
-
#include <svtools/ctrltool.hxx>
#include <editeng/svxfont.hxx>
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index b0328ab..ac5a6de 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -37,9 +37,6 @@
DBG_NAME( EditUndo )
-#define MAX_UNDOS 100 // From this quantity it may be deleted ....
-#define MIN_UNDOS 50 // so much has to be left ...
-
#define NO_UNDO 0xFFFF
#define GROUP_NOTFOUND 0xFFFF
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 9358350..bd33621 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -33,12 +33,6 @@
#include <editeng/editund2.hxx>
#include <editeng/editdata.hxx>
-#define UNDO_NOACTION 0
-#define UNDO_NEWUNDO 1
-#define UNDO_UNDOSDELETED 2
-#define UNDO_EMPTYGROUPDELETED 3
-#define UNDO_INVALIDEND 4
-
class EditEngine;
class EditView;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 5b039dd..6a42e4b 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -46,9 +46,6 @@
using namespace com::sun::star;
-#define FRAME_MARKER (sal_uInt32)0x21981357
-#define CHARSET_MARKER (FRAME_MARKER+1)
-
SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTextContent)
{
uno::Reference<beans::XPropertySet> xPropSet(xTextContent, uno::UNO_QUERY);
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index d564006..8c1c34c 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -90,9 +90,6 @@ void SvxPrepareAutoCorrect( String &rOldText, String &rNewText )
#define SVX_LANG_MISSING 2
#define SVX_LANG_MISSING_DO_WARN 3
-#define SVX_FLAGS_NEW
-
-
struct lt_LanguageType
{
bool operator()( LanguageType n1, LanguageType n2 ) const
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d124a4a..7247c63 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -66,8 +66,6 @@
#include <cassert>
using ::std::advance;
-#define DEFAULT_SCALE 75
-
static const sal_uInt16 nDefStyles = 3; // Special treatment for the first 3 levels
static const sal_uInt16 nDefBulletIndent = 800;
static const sal_uInt16 nDefBulletWidth = 700;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index b036674..9be49b7 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -97,8 +97,6 @@ using namespace ::ucb;
#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar)
#define C2S(cChar) String::CreateFromAscii(cChar)
-#define MAP_TOKEN ';'
-#define PAIR_TOKEN ':'
Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
{
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index d98bf5b..99b68ad 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -45,7 +45,6 @@ namespace dbp
//.........................................................................
#define BUTTON_HEIGHT 300
-#define TOP_HEIGHT 300
#define HEIGHT 450
#define OFFSET 300
#define MIN_WIDTH 600
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index ea1f050..a6ce20f 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -70,8 +70,6 @@
#define PROPERTY_CLICK_HDL RTL_CONSTASCII_STRINGPARAM("MenuClickHDL")
#define PROPERTY_SHOW_MENUICON RTL_CONSTASCII_STRINGPARAM("MenuIconVisible")
-#define START_TIMER 1
-
using namespace ::com::sun::star;
//------------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index bfe7ff2..d052ce7 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -35,7 +35,7 @@
#define PIECHART 21 /* Standard pie chart file. */
#define ORGCHART 26 /* Standard org chart file. */
#define TTLCHART 31 /* Title chart file. */
-#define BULCHART 32 /* Bullet chart file. */
+// BULCHART 32 /* Bullet chart file. */
#define TABCHART 33 /* Table chart file. */
#define DRWCHART 41 /* Chart with drawings only.*/
#define MLTCHART 42 /* Multiple chart file. */
@@ -44,16 +44,16 @@
#define SYMFILE 47 /* Symbol file. */
/* the following were added although SPC doesn't have a #define */
/* for them... */
-#define AUTOTTLCHT 95 /* Autobuild TTL CHT */
-#define AUTOBULCHT 96 /* Autobuild BUL CHT */
-#define AUTOTABCHT 97 /* Autobuild TAB CHT */
+// AUTOTTLCHT 95 /* Autobuild TTL CHT */
+// AUTOBULCHT 96 /* Autobuild BUL CHT */
+// AUTOTABCHT 97 /* Autobuild TAB CHT */
/* FNC 10/11/93: for the chart stream, ALLCHART was added. */
/* It is used specifically by PPT in its Template to let */
/* us know that the template applies to all charts, not to */
/* one specific chart type. */
#define ALLCHART 127 /* Applies to all chart types */
-#define ALLCHART_TPL 255 /* Applies to all chart types */
+// ALLCHART_TPL 255 /* Applies to all chart types */
#define IOC_CHTTITLE 1 /* Title for any chart. */
#define IOC_CHTFOOTNOTE 2 /* ::com::sun::star::text::Footnote for any chart. */
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
index 0722375..a48dc5c 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -24,10 +24,11 @@
// ---------------------------------------------------------------
-#define CGM_LEVEL1 0x0001 // VERSION 1 METAFILE
-#define CGM_LEVEL2 0x0002
-#define CGM_LEVEL3 0x0003
-#define CGM_GDSF_ONLY 0x00F0
+// CGM_LEVEL1 0x0001 // VERSION 1 METAFILE
+// CGM_LEVEL2 0x0002
+// CGM_LEVEL3 0x0003
+// CGM_GDSF_ONLY 0x00F0
+// CGM_GDSF_ONLY 0x00F0
#define CGM_UNKNOWN_LEVEL 0x00F1
#define CGM_UNKNOWN_COMMAND 0x00F2
#define CGM_DESCRIPTION 0x00F3
@@ -38,9 +39,6 @@
// ELEMENT
#define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col )
-#define ALIGN2( _nElementSize ) { _nElementSize = ( _nElementSize + 1 ) & ~1; }
-#define ALIGN4( _nElementSize ) { _nElementSize = ( _nElementSize + 3 ) & ~3; }
-#define ALIGN8( _nElementSize ) { _nElementSize = ( _nElementSize + 7 ) & ~7; }
#include <vcl/salbtype.hxx>
#include <tools/stream.hxx>
diff --git a/filter/source/msfilter/powerpoint/pptcom.hxx b/filter/source/msfilter/powerpoint/pptcom.hxx
index 2228b0f..f25e6ad 100644
--- a/filter/source/msfilter/powerpoint/pptcom.hxx
+++ b/filter/source/msfilter/powerpoint/pptcom.hxx
@@ -49,7 +49,6 @@
#define NMSP_LANG com::sun::star::lang
#define NMSP_IO com::sun::star::io
#define NMSP_SAX com::sun::star::xml::sax
-#define NMSP_PRES com::sun::star::presentation
#define NMSP_REGISTRY com::sun::star::registry
#define NMSP_DOCUMENT com::sun::star::document
@@ -58,7 +57,6 @@
#define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj >
#define ANY NMSP_UNO::Any
#define B2UCONST( _def_pChar ) (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
-#define PPT_DTD_STRING B2UCONST( "<!DOCTYPE office:document-styles PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index d0de0a1..b2821b6 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -63,7 +63,6 @@
#define NMSP_UNO com::sun::star::uno
#define NMSP_LANG com::sun::star::lang
#define NMSP_SAX com::sun::star::xml::sax
-#define NMSP_SVG com::sun::star::svg
#define NMSP_REGISTRY com::sun::star::registry
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 6d09521..666750f 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -33,9 +33,6 @@ namespace formula
#define STRUCT_FOLDER 2
#define STRUCT_ERROR 3
-#define STRUCT_ERR_C1 1
-#define STRUCT_ERR_C2 2
-
enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT };
//============================================================================
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 682509d..91153f4 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -83,8 +83,6 @@ class SvtFileDialogFilter_Impl;
#define SFX_EXTRA_SELECTION 0x00000080L
#define SFX_EXTRA_IMAGE_TEMPLATE 0x00000100L
-#define RET_MANAGER 100
-
#define FILEDIALOG_FILTER_ALL "*.*"
//*****************************************************************************
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index 63afcbb..cce8a9d 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -37,7 +37,6 @@ namespace framework{
#define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA")
-#define XMLNS_ACCEL DECLARE_ASCII("accel")
#define XMLNS_XLINK DECLARE_ASCII("xlink")
// same items with a name space alias
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 8b12893..27ac1f4 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -47,7 +47,6 @@
#define XMLNS_MENU "http://openoffice.org/2001/menu"
-#define XMLNS_PREFIX "menu:"
#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar"
#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu"
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index cd3d2ca..a53527b 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -521,7 +521,6 @@ static sal_Int16 natnum2[] = {
static sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2);
#define isLang(lang) rLocale.Language.equalsAsciiL(lang, 2)
-#define isCtry(ctry) rLocale.Country.equalsAsciiL(ctry, 2)
static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale)
{
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 1388460..9fe2656 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -136,11 +136,6 @@ sal_Bool MergeData::operator==( ResData *pData )
// class MergeDataFile
//
-#define FFORMAT_UNKNOWN 0x0000
-#define FFORMAT_NEW 0x0001
-#define FFORMAT_OLD 0x0002
-
-
MergeDataFile::MergeDataFile(
const rtl::OString &rFileName,
const rtl::OString &rFile,
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 9b2885a..f1e0e45 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -34,18 +34,6 @@
# define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
#endif
-#define OU2A(rtlOUString) \
- ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
- RTL_TEXTENCODING_ASCII_US).getStr()
-
-#define OU2UTF8(rtlOUString) \
- ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
- RTL_TEXTENCODING_UTF8).getStr()
-
-#define OU2ISO_1(rtlOUString) \
- ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
- RTL_TEXTENCODING_ISO_8859_1).getStr()
-
#define OU2ENC(rtlOUString, rtlEncoding) \
::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
rtlEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr()
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index ee41fe4..b46cef2 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -69,7 +69,6 @@ class LocaleDataWrapper;
#define SN_LINGU_SERVCICE_MANAGER "com.sun.star.linguistic2.LinguServiceManager"
#define SN_LINGU_PROPERTIES "com.sun.star.linguistic2.LinguProperties"
#define SN_DICTIONARY_LIST "com.sun.star.linguistic2.DictionaryList"
-#define SN_OTHER_LINGU "com.sun.star.linguistic2.OtherLingu"
#define SN_DESKTOP "com.sun.star.frame.Desktop"
diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx
index 9dee58c..a6b9154 100644
--- a/oox/inc/oox/export/utils.hxx
+++ b/oox/inc/oox/export/utils.hxx
@@ -33,8 +33,6 @@
#define US(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ))
#define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr()
#define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr()
-#define H32S(x) rtl::OString::valueOf( (sal_Int32) x, 16 ).getStr()
-#define H64S(x) rtl::OString::valueOf( (sal_Int64) x, 16 ).getStr()
#define IS(x) rtl::OString::valueOf( x ).getStr()
#define USS(x) rtl::OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index bc759ce..d252c17 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -39,8 +39,6 @@
class Config;
-#define PSPRINT_PPDDIR "driver"
-
namespace padmin
{
class DelMultiListBox : public MultiListBox
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index 8fdadef..004add2 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -174,8 +174,6 @@
/* (Re)Allocate N items of type T using malloc, or fail. */
#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
#define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t)))
-#define RETALLOC_IF(addr, n, t) \
- if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t)
#define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
#define BYTEWIDTH 16 /* In bits (assuming sizeof(sal_Unicode)*8) */
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index cb9d6c8..280b7ec 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -75,10 +75,6 @@
#define MAX_ARGS 255
#define MAX_ENVS 255
-#if defined(MACOSX) || defined(IOS) || defined(IORESOURCE_TRANSFER_BSD) || defined(AIX)
-#define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(int))
-#endif
-
/******************************************************************************
*
* Data Type Definition
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index 8697522..f3a5f8a 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -85,8 +85,6 @@
# define ACT_ABORT ACT_SYSTEM
#endif
-#define MAX_PATH_LEN 2048
-
#if defined(HAVE_MEMCHECK_H)
#include <memcheck.h>
#endif
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 939e6df..15b9a62 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -57,11 +57,6 @@ const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS
const sal_Char pBuffer_Number[] = "1234567890";
const sal_Char pBuffer_Blank[] = "";
-#define TRUNC_LEN 10;
-#define ENLARG_LEN 100;
-
-
-
//------------------------------------------------------------------------
// OS dependent/independent definitions/includes
// we use FILE_PREFIX for URL prefix,
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 0ec2fe9..22f05b8 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -51,8 +51,6 @@
using namespace osl;
using namespace rtl;
-#define MAXIMPATH 256
-
rtl::OUString root;
rtl::OUString dir1;
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 26598db..526c9d5 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -120,7 +120,6 @@ const SCROW SCROWS64K = 65536;
// === old stuff defines =====================================================
#define MAXROW_30 8191
-#define MAXROW_40 31999
#ifdef SC_LIMIT_ROWS
#undef MAXROWCOUNT_DEFINE
@@ -135,7 +134,6 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1;
#define VALIDROW(nRow) (ValidRow(nRow))
#define VALIDTAB(nTab) (ValidTab(nTab))
#define VALIDCOLROW(nCol,nRow) (ValidColRow(nCol,nRow))
-#define VALIDCOLROWTAB(nCol,nRow,nTab) (ValidColRowTab(nCol,nRow,nTab))
// === old stuff defines end =================================================
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e969ffb..6f776e1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -68,9 +68,6 @@ class ScFlatBoolRowSegments;
struct ScSetStringParam;
struct ScColWidthParam;
-#define COLUMN_DELTA 4
-
-
struct ScNeededSizeOptions
{
const ScPatternAttr* pPattern;
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 03451d1..1f29753 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -115,8 +115,6 @@ const SCSIZE MAXSUBTOTAL = 3;
#define POINTS_PER_INCH TEX_POINTS_PER_INCH
#endif
#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH)
-#define INCH_PER_CM (1.0 / CM_PER_INCH)
-#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH)
#define TWIPS_PER_POINT 20.0
#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH)
#define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH)
@@ -161,14 +159,6 @@ namespace sc
#define SC_SIZE_OPTIMUM 0xFFFF
- // update flags
-#define UF_SCROLL_LEFT 1
-#define UF_SCROLL_RIGHT 2
-#define UF_SCROLL_UP 4
-#define UF_SCROLL_DOWN 8
-#define UF_ROW 16
-#define UF_VIEW 32
-
// repaint flags (for messages)
#define PAINT_GRID 1
#define PAINT_TOP 2
@@ -221,8 +211,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
#define PASTE_MUL 3
#define PASTE_DIV 4
-#define PASTE_NONEMPTY 5
-
// bits for HasAttr
#define HASATTR_LINES 1
#define HASATTR_MERGED 2
@@ -282,11 +270,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
// is bit set in set?
#define IS_SET(bit,set)(((set)&(bit))==(bit))
-#define SEL_ALL -1 // input line: select all
-#define RES_CANCEL 0 // results of function AutoPilot pages
-#define RES_BACKWARD 1
-#define RES_END 2
-
enum CellType
{
CELLTYPE_NONE,
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 8446e78..a4cee2c 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -53,7 +53,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#define PIVOT_DATA_FIELD (MAXCOLCOUNT)
-#define PIVOT_FUNC_REF (MAXCOLCOUNT)
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index edaee01..687f0f3 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -44,16 +44,6 @@ struct OldSingleRefBools
sal_uInt8 bOldFlag3D; // two sal_Bool flags (see further down)
};
-#define SR_ABSOLUTE 0 // Absolute value
-#define SR_RELABS 1 // Relative value as absolute value (until release 3.1)
-#define SR_RELATIVE 2 // Relative value as delta value (after release 3.1)
-#define SR_DELETED 3 // Deleted col/row/tab
-
-#define SRF_3D 0x01 // 3D reference, was the sal_Bool (before build 304a)
-#define SRF_RELNAME 0x02 // Reference derived from RangeName with relative values
-#define SRF_BITS 0x03 // Mask of possible bits
-
-
struct SC_DLLPUBLIC ScSingleRefData // Single reference (one address) into the sheet
{
SCsCOL nCol; // Absolute values
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 35f7743..6caa83c 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -490,17 +490,6 @@ struct Sc10ChartSheetData
sal_Char Reserved[64];
};
-#define AGPie2D 1 // Pie Chart 2D
-#define AGPie3D 2 // Pie Chart 3D
-#define AGBar2D 3 // Bar Chart 2D
-#define AGBar3D 4 // Bar Chart 3D
-#define AGGantt 5 // Gantt Diagramm
-#define AGLine 6 // Line Chart
-#define AGLogLine 7 // Logarythmic-Coordinate Chart
-#define AGArea 8 // Area Chart
-#define AGHLC 11 // High-Low-Close Chart
-#define AGPolar 10 // Polar-Coordinate Chart
-
typedef sal_Char Sc10ChartText[30];
struct Sc10ChartTypeData
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 4a08a9d..e567e4c 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -36,7 +36,6 @@
// ---------------------------------------------------------------------------
-#define SC_SLIDER_SIZE 2
#define SC_SMALL3DSHADOW COL_BLACK
#define SC_SIZE_NONE 65535
const SCCOL SC_TABSTART_NONE = SCCOL_MAX;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index e262d6b..bbd195a 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -550,8 +550,6 @@ ScNavigatorSettings::ScNavigatorSettings() :
SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )
-#define IS_MODE(bit)(((nFlags)&(bit))==(bit))
-
ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
Window* pParent,
sal_uInt16 nId,
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 22d5060..224b2cf 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -79,12 +79,6 @@
using ::std::auto_ptr;
-#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
-#define GET_STRING(nid) ((const SfxStringItem&)pReqArgs->Get(nid)).GetValue()
-#define GET_UINT16(nid) ((const SfxUInt16Item&)pReqArgs->Get(nid)).GetValue()
-#define GET_BOOL(nid) ((const SfxBoolItem&)pReqArgs->Get(nid)).GetValue()
-#define RECALC_PAGE(pDocSh) ScPrintFunc( pDocSh, GetPrinter(), nCurTab ).UpdatePages()
-
//------------------------------------------------------------------
/** Try to parse the given range using Calc-style syntax first, then
diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx
index 0248e79..07b18d0 100644
--- a/scaddins/source/analysis/analysisdefs.hxx
+++ b/scaddins/source/analysis/analysisdefs.hxx
@@ -36,7 +36,6 @@
#define THROWDEF_RTE_IAE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException)
#define THROW_IAE throw ::com::sun::star::lang::IllegalArgumentException()
#define THROWDEF_RTE_IAE_NCE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException,::com::sun::star::sheet::NoConvergenceException)
-#define THROW_NCE throw ::com::sun::star::sheet::NoConvergenceException()
#define CHK_Freq ( nFreq != 1 && nFreq != 2 && nFreq != 4 )
#define CHK_FINITE(d) if( !::rtl::math::isFinite( d ) ) THROW_IAE
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 24ecbd1..bad6e21 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -43,7 +43,6 @@ class ScaAnyConverter;
#define PI 3.1415926535897932
-#define PI_2 (PI/2.0)
#define EOL ( ( const sal_Char* ) 1 )
#define EOE ( ( const sal_Char* ) 2 )
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 1be31fc..e009712 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -26,10 +26,6 @@
//------------------------------------------------------------------
-#define DIA_SLOW 0
-#define DIA_MEDIUM 1
-#define DIA_FAST 2
-
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1
#define SD_IF_SDVIEWSHELL SFX_INTERFACE_SD_START + 2
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 42c48d3..0439077 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -137,9 +137,6 @@ const char *pButtonNames[NUM_BUTTONS] =
#define BTN_MORE 10
#define BTN_LESS 11
-// Fuer Detectfilter
-#define CALC_OPTIONS "9,34,SYSTEM"
-
// *********************************************************************
// Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote
// *********************************************************************
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index cda852d..9092a09 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -47,12 +47,6 @@
namespace sd {
-#define FADE_STEP "FadeSteps"
-#define FADE_ATTRIB "FadeAttributes"
-#define FADE_ORIENT "FadeOrientation"
-#define FADE_TRUE "true"
-#define FADE_FALSE "false"
-
MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) :
ModalDialog ( pParent, SdResId( DLG_MORPH ) ),
aGrpPreset ( this, SdResId( GRP_PRESET ) ),
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 30768af..0628fe7 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -71,8 +71,6 @@
#include "SlideSorter.hxx"
#include "controller/SlideSorterController.hxx"
-#define RET_DELETE 100
-
namespace sd {
/*************************************************************************
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 5bb5f17..d111549 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -48,8 +48,6 @@
class SfxObjectShell;
class SvxMacroTableDtor;
-#define SFX_NO_EVENT USHRT_MAX
-
struct SFX2_DLLPUBLIC SfxEventName
{
sal_uInt16 mnId;
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 2a6980a..70d3468 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -196,21 +196,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
0, 0, 0, 0, 0, 0, 0 \
}
-#define SFX_SLOT_ATTR( id, GroupId, Dummy, ExecMethodPtr, StateMethodPtr, Flags, ItemClass ) \
- { id, GroupId, id, Flags, \
- USHRT_MAX, 0, \
- ExecMethodPtr, \
- StateMethodPtr, \
- (const SfxType*) &a##ItemClass##_Impl, \
- 0, 0, 0, 0, 0, 0, 0 \
- }
-
-#define SFX_SLOT_ENUM( SlaveId, GroupId, MasterId, Value, Flags ) \
- { SlaveId, GroupId, id, Flags, \
- MasterId, Value, 0, 0, \
- (const SfxType*) &aSfxBoolItem_Impl, \
- 0, 0, 0, 0, 0, 0, 0 \
- }
#define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext, ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs, Name, Prop, UnoName ) \
{ id, GroupId, hid, Flags | Prop, \
USHRT_MAX, 0, \
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 48273cd..180b641 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -41,10 +41,6 @@ struct SfxPrintProgress_Impl;
// ------------------------------------------------------------------------
-#define PAGE_MAX 9999 // max. Number of pages to be printed
-
-// ------------------------------------------------------------------------
-
struct SfxPrintOptDlg_Impl;
class SfxPrintOptionsDialog : public ModalDialog
{
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 4444451..3b9cd64 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -119,7 +119,6 @@
#define XCOMPONENT ::com::sun::star::lang::XComponent
#define XMODEL ::com::sun::star::frame::XModel
#define XMODEL2 ::com::sun::star::frame::XModel2
-#define XMODIFIABLE ::com::sun::star::util::XModifiable
#define XMODIFIABLE2 ::com::sun::star::util::XModifiable2
#define XMODIFYBROADCASTER ::com::sun::star::util::XModifyBroadcaster
#define XMODIFYLISTENER ::com::sun::star::util::XModifyListener
@@ -161,7 +160,6 @@
#define MUTEX ::osl::Mutex
#define UNOTYPE ::com::sun::star::uno::Type
#define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier
-#define XINDEXACCESS ::com::sun::star::container::XIndexAccess
#define XTRANSFERABLE ::com::sun::star::datatransfer::XTransferable
#define DATAFLAVOR ::com::sun::star::datatransfer::DataFlavor
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 09b242d..2af76a2 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -149,7 +149,7 @@ using namespace ::comphelper;
#define TBI_SEARCHDIALOG 1008
#define TBI_SOURCEVIEW 1009
#define TBI_SELECTIONMODE 1010
-#define TBI_ONSTARTUP 1011
+// TBI_ONSTARTUP 1011
#define CONFIGNAME_HELPWIN DEFINE_CONST_UNICODE("OfficeHelp")
#define CONFIGNAME_INDEXWIN DEFINE_CONST_UNICODE("OfficeHelpIndex")
diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index 48db15e..390d2b7 100644
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
@@ -49,7 +49,6 @@
#define XLOCALIZABLE ::com::sun::star::lang::XLocalizable
#define XMODEL ::com::sun::star::frame::XModel
#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define XNAMEACCESS ::com::sun::star::container::XNameAccess
#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo
#define XSTORABLE ::com::sun::star::frame::XStorable
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 4a43c1f..63184fe 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -70,13 +70,11 @@ namespace comphelper
#define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster
#define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener
#define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier
-#define XJOBEXECUTOR ::com::sun::star::task::XJobExecutor
#define EVENTOBJECT ::com::sun::star::lang::EventObject
#define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException
#define WRAPPEDTARGETEXCEPTION ::com::sun::star::lang::WrappedTargetException
#define ANY ::com::sun::star::uno::Any
#define REFERENCE ::com::sun::star::uno::Reference
-#define WEAKREFERENCE ::com::sun::star::uno::WeakReference
#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
#define SEQUENCE ::com::sun::star::uno::Sequence
#define UNOTYPE ::com::sun::star::uno::Type
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 980ae1f..4dd20fe 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -148,13 +148,6 @@ struct StringList_Impl : private Resource
};
-#define SFX_DEL_PTRARR(pArr) \
- { \
- for ( sal_uInt16 n = (pArr)->Count(); n--; ) \
- delete (pArr)->GetObject(n); \
- DELETEX(pArr); \
- }
-
class SfxBoolResetter
{
sal_Bool& _rVar;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index f4b1a7d..9848c94 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -98,9 +98,6 @@
#define EVENTOBJECT ::com::sun::star::lang::EventObject
#define OTYPECOLLECTION ::cppu::OTypeCollection
#define OIMPLEMENTATIONID ::cppu::OImplementationId
-#define MUTEXGUARD ::osl::MutexGuard
-#define UNOQUERY ::com::sun::star::uno::UNO_QUERY
-#define MAPPING ::com::sun::star::uno::Mapping
#define XCOMPONENT ::com::sun::star::lang::XComponent
#define XINTERFACE ::com::sun::star::uno::XInterface
#define XKEYHANDLER ::com::sun::star::awt::XKeyHandler
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index f2948df..05524bb 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -17,79 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-#define ITEMID_PTR 0
-#define ITEMID_SHADOW 0
-#define ITEMID_PAGE 0
-#define ITEMID_SETITEM 0
-#define ITEMID_HORJUSTIFY 0
-#define ITEMID_VERJUSTIFY 0
-#define ITEMID_ORIENTATION 0
-#define ITEMID_MARGIN 0
-#define ITEMID_AUTHOR 0
-#define ITEMID_DATE 0
-#define ITEMID_TEXT 0
-#define ITEMID_SPELLCHECK 0
-#define ITEMID_HYPHENREGION 0
-#define ITEMID_FONT 0
-#define ITEMID_FONTHEIGHT 0
-#define ITEMID_BRUSH 0
-#define ITEMID_BOX 0
-#define ITEMID_LINE 0
-#define ITEMID_LINESPACING 0
-#define ITEMID_ADJUST 0
-#define ITEMID_WIDOWS 0
-#define ITEMID_ORPHANS 0
-#define ITEMID_HYPHENZONE 0
-#define ITEMID_TABSTOP 0
-#define ITEMID_FMTSPLIT 0
-#define ITEMID_PAGEMODEL 0
-#define ITEMID_FONTLIST 0
-#define ITEMID_POSTURE 0
-#define ITEMID_WEIGHT 0
-#define ITEMID_FONTWIDTH 0
-#define ITEMID_UNDERLINE 0
-#define ITEMID_CROSSEDOUT 0
-#define ITEMID_SHADOWED 0
-#define ITEMID_AUTOKERN 0
-#define ITEMID_WORDLINEMODE 0
-#define ITEMID_CONTOUR 0
-#define ITEMID_PROPSIZE 0
-#define ITEMID_COLOR 0
-#define ITEMID_CHARSETCOLOR 0
-#define ITEMID_KERNING 0
-#define ITEMID_CASEMAP 0
-#define ITEMID_ESCAPEMENT 0
-#define ITEMID_LANGUAGE 0
-#define ITEMID_NOLINEBREAK 0
-#define ITEMID_NOHYPHENHERE 0
-#define ITEMID_SEARCH 0
-#define ITEMID_COLOR_TABLE 0
-#define ITEMID_GRADIENT_LIST 0
-#define ITEMID_HATCH_LIST 0
-#define ITEMID_BITMAP_LIST 0
-#define ITEMID_DASH_LIST 0
-#define ITEMID_LINEEND_LIST 0
-#define ITEMID_NUMBERINFO 0
-#define ITEMID_CHARTSTYLE 0
-#define ITEMID_CHARTDATADESCR 0
-#define ITEMID_CHARTLEGENDPOS 0
-#define ITEMID_CHARTTEXTORDER 0
-#define ITEMID_CHARTTEXTORIENT 0
-#define ITEMID_DOUBLE 0
-#define ITEMID_PAPERBIN 0
-#define ITEMID_SIZE 0
-#define ITEMID_LRSPACE 0
-#define ITEMID_ULSPACE 0
-#define ITEMID_PRINT 0
-#define ITEMID_OPAQUE 0
-#define ITEMID_PROTECT 0
-#define ITEMID_MACRO 0
-#define ITEMID_BOXINFO 0
-#define ITEMID_FMTBREAK 0
-#define ITEMID_FMTKEEP 0
-
#define CharSetItem SfxVoidItem
#define FontFamilyItem SfxVoidItem
#define FontPitchItem SfxVoidItem
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 2dc4cf2..2125780 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -74,9 +74,6 @@ class IcnGridMap_Impl;
// for the bounding rectangle
#define LROFFS_BOUND 2
#define TBOFFS_BOUND 2
-// distance focus rectangle to icon
-#define LROFFS_ICON 2
-#define TBOFFS_ICON 2
// distance icon to text
#define HOR_DIST_BMP_STRING 3
#define VER_DIST_BMP_STRING 3
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 1f07b83..3f59d6a 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -140,7 +140,6 @@ extern SgfFontLst* pSgfFonts;
#define EscReset '\x1f' /* Flag loeschen */
#define EscDeflt '\x11' /* Flag auf default setzen */
#define EscToggl '\x1d' /* Flag Toggeln */
-#define EscRelat '%'
#define EscNoFlg 0
#define EscNoVal -2147483647 /* -MaxLongInt */
//==============================================================================
@@ -151,7 +150,6 @@ extern SgfFontLst* pSgfFonts;
#define ChrXPosArrSize (MaxLineChars+1+1) /* 2k - Beginnt mit 0 im gegensatz zu StarDraw */
#define CharLineSize (MaxLineChars+1+1)
-#define EscStr (UCHAR[MaxEscLen+1]);
#define MinChar 32
#define MaxChar 255
diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx
index a488690..8e2194c 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -78,8 +78,8 @@
#define NULL_PEN 8
#define OEM_FIXED_FONT 10
// ANSI_FIXED_FONT 11
-#define ANSI_VAR_FONT 12
-#define SYSTEM_FONT 13
+// ANSI_VAR_FONT 12
+// SYSTEM_FONT 13
// DEVICE_DEFAULT_FONT 14
// DEFAULT_PALETTE 15
#define SYSTEM_FIXED_FONT 16
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index c21bef0..0e85f0f 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -186,16 +186,6 @@ private:
SVX_DLLPRIVATE void SetAccessibleNames (void);
};
-/*************************************************************************
-|*
-|* Defines
-|*
-\************************************************************************/
-
-#define SVXBMPMASK() ( (SvxBmpMask*) ( SfxViewFrame::Current()->GetChildWindow( \
- SvxBmpMaskChildWindow::GetChildWindowId() )-> \
- GetWindow() ) )
-
#endif // _BMPMASK_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index f8fdbee..34233ab 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -101,16 +101,6 @@ public:
const sal_uIntPtr nFlags = 0L );
};
-/*************************************************************************
-|*
-|* Defines
-|*
-\************************************************************************/
-
-#define SVXCONTOURDLG() ( (SvxContourDlg*) ( SfxViewFrame::Current()->GetChildWindow( \
- SvxContourDlgChildWindow::GetChildWindowId() )-> \
- GetWindow() ) )
-
#endif // _REDUCED_CONTDLG_HXX_
#endif // _CONTDLG_HXX_
diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index e334b9c..d5d4951 100644
--- a/svx/inc/svx/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
@@ -22,10 +22,6 @@
#include <tools/solar.h>
-#define E3D_STREAMING
-
-const double PrecisionLimit = 1.0e-14;
-
const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
sal_uInt32('3')*0x00000100+
sal_uInt32('D')*0x00010000+
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index e8d6f23..645e081 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -57,9 +57,7 @@
#include <editeng/colritem.hxx>
#include <svx/e3ditem.hxx>
-
#include <svx/gallery.hxx>
-#define GALLERY_THEME "3D"
#include <svl/whiter.hxx>
#include <svx/float3d.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8ea566f..078ed6a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -40,7 +40,6 @@
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
#include <svx/svdouno.hxx>
-#define XOR_CREATE_PEN PEN_SOLID
#include <svx/svdopath.hxx>
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index ce624e0..a71db0b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1798,7 +1798,6 @@ void SdrObject::BurnInStyleSheetAttributes()
GetProperties().ForceStyleToHardAttributes();
}
-#define Imp2ndKennung (0x434F4D43)
SdrObjUserData* SdrObject::ImpGetMacroUserData() const
{
SdrObjUserData* pData=NULL;
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 91c8158..eb22171 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -50,14 +50,11 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_INSERT (SID_SW_START + 300)
#define FN_FORMAT (SID_SW_START + 400)
#define FN_EXTRA (SID_SW_START + 600)
-#define FN_WINDOW (SID_SW_START + 700)
-#define FN_HELP (SID_SW_START + 800)
#define FN_SELECTION (SID_SW_START + 900)
#define FN_QUERY (SID_SW_START + 1000)
#define FN_ENVELP (SID_SW_START + 1050)
#define FN_PARAM (SID_SW_START + 1100)
#define FN_STAT (SID_SW_START + 1180)
-#define FN_PRNOPT (SID_SW_START + 1200)
#define FN_PGPREVIEW (SID_SW_START + 1250)
#define FN_FRAME (SID_SW_START + 1300)
#define FN_INSERT2 (SID_SW_START + 1400)
@@ -79,52 +76,24 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_UNO_RANGE_BEGIN FN_FORMAT2
#define FN_UNO_RANGE_END (FN_PARAM2 + 199)
-#define HELP_OFFSET 1100
-#define CMD_STR_OFFSET 2200
-#define CMDID_END 5500
-
/*--------------------------------------------------------------------
Region: File
--------------------------------------------------------------------*/
-#define FN_CLOSE_FILE (FN_FILE + 1 ) /* Close */
-
#define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Create Global Document */
-#define FN_NEW_FILE (FN_FILE + 5 ) /* New */
#define FN_OPEN_FILE (FN_FILE + 7 ) /* Open */
-#define FN_EDIT_FILE (FN_FILE + 8 ) /* Open or ToTop */
-
-#define FN_INETFILE (FN_FILE + 9 ) /* Internet File-Dialog */
-
-#define FN_PRINT_FILE (FN_FILE + 10) /* Print */
-#define FN_SAVE_FILE (FN_FILE + 13) /* Save */
-#define FN_EXIT (FN_FILE + 17) /* Close Writer */
-
-#define FN_DOC_MGR_DLG (FN_FILE + 32) /* Document-Manager */
-
-#define FN_GET_DOCSTAT (FN_FILE + 33) /* Get document statistics */
#define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Send outline to impress */
#define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37) /* Send outline to clipboard */
#define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* Create HTML document */
-#define FN_APP_START (FN_FILE + 98) /* Macro for App.Start */
-#define FN_APP_END (FN_FILE + 99) /* Macro for App.End */
-
/*--------------------------------------------------------------------
Region: Edit
--------------------------------------------------------------------*/
-#define FN_CLEAR (FN_EDIT + 1 ) /* Clear */
-#define FN_COPY (FN_EDIT + 2 ) /* Copy */
-#define FN_CUT (FN_EDIT + 3 ) /* Cut */
#define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Edit field */
-#define FN_EDIT_LINK (FN_EDIT + 8 ) /* Edit link */
#define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Edit link dialog */
-#define FN_GOTO (FN_EDIT + 11) /* Go to */
-#define FN_PASTE (FN_EDIT + 13) /* Paste */
#define FN_NUMBER_BULLETS (FN_EDIT + 21) /* Bullets */
-#define FN_REPEAT (FN_EDIT + 22) /* Repeat last */
#define FN_EDIT_IDX_ENTRY_DLG (FN_EDIT + 23) /* Edit Index-Entry */
#define FN_UPDATE_FIELDS (FN_EDIT + 26) /* Update fields */
#define FN_EXECUTE_MACROFIELD (FN_EDIT + 27) /* Execute macrofield */
@@ -234,7 +203,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_SET_PAGE (FN_VIEW + 29) /* Set page template to paragraph */
// more Navigator
-#define FN_CONTENT_LB (FN_VIEW + 32) /**/
#define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/
#define FN_SHOW_ROOT (FN_VIEW + 34) /**/
#define FN_DROP_REGION (FN_VIEW + 35) /**/
@@ -290,7 +258,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_POSTIT (FN_INSERT + 29) /* Insert/edit PostIt */
#define FN_INSERT_TABLE (FN_INSERT + 30) /* Insert Table */
#define FN_INSERT_STRING (FN_INSERT+31)
-#define FN_INSERT_COLS (FN_INSERT + 32) /* Insert Columns */
#define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33) /* Insert interactive frame */
#define FN_INSERT_FRAME (FN_INSERT + 34) /* Insert Frame */
@@ -364,21 +331,13 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* superscript */
#define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* subscript */
-#define FN_SET_CASEMAP (FN_FORMAT + 14) /* CaseMap */
-#define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */
-
#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* mirror horizontally */
#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* mirror vertically */
-#define FN_SET_ADJUST (FN_FORMAT + 28) /* parametrized alignemnt */
-
-#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */
-#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */
#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */
#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */
#define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* columns per page */
#define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* background */
-#define FN_FORMAT_PAGE (FN_FORMAT + 51) /* page */
#define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* page */
#define FN_FORMAT_COLUMN (FN_FORMAT + 53) /* columns */
#define FN_FORMAT_DROPCAPS (FN_FORMAT + 54) /* initials */
@@ -499,8 +458,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */
-#define FN_IS_IMAGE (FN_FORMAT2 + 6) /* numbering: with graphic? */
-
#define FN_GOTO_NEXT_REGION (FN_FORMAT2 + 9) /* */
#define FN_GOTO_PREV_REGION (FN_FORMAT2 + 10) /* */
@@ -559,21 +516,14 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */
#define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* */
#define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* learn words */
-#define FN_NUMBERING (FN_EXTRA + 9 ) /* numbering/bullets*/
#define FN_NUMBERING_OUTLINE_DLG (FN_EXTRA + 12) /* */
#define FN_SORTING_DLG (FN_EXTRA + 14) /* */
#define FN_CALCULATE (FN_EXTRA + 15) /* */
#define FN_GLOSSARY_DLG (FN_EXTRA + 20) /* text building blocks */
-#define FN_PLAY_MACRO (FN_EXTRA + 23) /* run macro */
#define FN_EXPAND_GLOSSARY (FN_EXTRA + 28) /* expand text building blocks */
-#define FN_CONFIG_MENU (FN_EXTRA + 30) /* configure menu */
-#define FN_CONFIG_KEY (FN_EXTRA + 31) /* configure keyboard */
#define FN_CHANGE_PAGENUM (FN_EXTRA + 34) /* change page numbers*/
-#define FN_MACRO_POPUP (FN_EXTRA + 37) /* all macro functions*/
-#define FN_BULLET (FN_EXTRA + 38) /* bullet list */
-
// Region: Glossary
#define FN_AUTO_CORRECT (FN_EXTRA + 49 ) /* Autocorrect from Basic */
@@ -584,16 +534,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_NAVIGATION_PI_GOTO_PAGE (FN_EXTRA + 59 ) /* goto page from navigation-PI */
-#define FN_RESERVED_9 (FN_EXTRA + 86) /* place holder */
-#define FN_RESERVED_8 (FN_EXTRA + 87) /* place holder */
-#define FN_RESERVED_7 (FN_EXTRA + 88) /* place holder */
-#define FN_RESERVED_6 (FN_EXTRA + 89) /* place holder */
-#define FN_RESERVED_5 (FN_EXTRA + 90) /* place holder */
-#define FN_RESERVED_4 (FN_EXTRA + 91) /* place holder */
-#define FN_RESERVED_3 (FN_EXTRA + 92) /* place holder */
-#define FN_RESERVED_2 (FN_EXTRA + 93) /* place holder */
-#define FN_RESERVED_1 (FN_EXTRA + 94) /* place holder */
-
#define FN_COLL_TYPE (FN_EXTRA + 98) /* type for GlobalDoc-Collection*/
#define FN_COLL_ADD (FN_EXTRA + 99)
@@ -824,8 +764,6 @@ included in c-context files, so c++ style stuff will cause problems.
QUERY-Block
--------------------------------------------------------------------*/
-#define FN_IS_MODIFIED (FN_QUERY +16) /* Was the document modified? */
-
#define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */
#define FN_GET_PRINT_AREA (FN_QUERY +32) /* Get attribute for printable area of page */
@@ -845,7 +783,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_ENVELOP (FN_ENVELP )
-
#define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1)
#define FN_DELETE_ALL_NOTES (FN_NOTES+2)
#define FN_HIDE_NOTE (FN_NOTES+3)
@@ -872,7 +809,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_PARAM_MOVE_SELECTION (FN_PARAM+3)
#define FN_PARAM_ADDPRINTER (FN_PARAM+18)
-#define FN_PARAM_GRID (FN_PARAM+19)
#define FN_PARAM_DOCDISP (FN_PARAM+20)
#define FN_PARAM_ELEM (FN_PARAM+21)
#define FN_PARAM_SWTEST (FN_PARAM+22)
@@ -886,10 +822,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_PARAM_REGION_EDIT_IN_READONLY (FN_PARAM+28)
#define FN_PARAM_INSERT_AFTER (FN_PARAM+29)
-#define FN_PARAM_WIDTH (FN_PARAM+39)
-#define FN_PARAM_DIR (FN_PARAM+41)
-#define FN_PARAM_COUNT (FN_PARAM+42)
-#define FN_PARAM_COLOR (FN_PARAM+43)
#define FN_PARAM_TABLE_NAME (FN_PARAM+44)
#define FN_PARAM_TABLE_HEADLINE (FN_PARAM+50)
@@ -900,8 +832,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_PARAM_FIELD_SUBTYPE (FN_PARAM+56)
#define FN_PARAM_FIELD_FORMAT (FN_PARAM+57)
-#define FN_PARAM_EVENT (FN_PARAM+68)
-#define FN_PARAM_URL (FN_PARAM+69)
#define FN_PARAM_GRF_REALSIZE (FN_PARAM+70)
#define FN_PARAM_GRF_DIALOG (FN_PARAM+71)
#define FN_INET_FIELD_MACRO (FN_PARAM+77) /* Id for URL-Field-Macros*/
@@ -918,12 +848,8 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* predefined numbering */
-#define FN_PARAM_DIST (FN_PARAM2+7) /* and width, for metric transformation */
-
#define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* for ShadowCursor options */
-#define FN_PARAM_10 (FN_PARAM2+11)
-
#define FN_TEXT_RANGE (FN_PARAM2+12) /* TextRange Property*/
#define FN_PARAM_CRSR_IN_PROTECTED (FN_PARAM2+13) /* Cursor in protected areas */
@@ -1013,10 +939,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define MID_12 0xf9
#define MID_13 0xfa
-#ifndef SID_SW_DOCMAN_PATH
-#define SID_SW_DOCMAN_PATH (SID_OFASLOTS_START + 6)
-#endif
-
// defines for Event-assignments per Macro
#define MAC_EVENT_MOUSEOVER 0x01 //
#define MAC_EVENT_MOUSECLICK 0x02 //
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 7d45201..e9e7ab8 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -79,8 +79,6 @@
using namespace com::sun::star;
-#define DEFTEXTSIZE 12
-
extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index fdeb6c9..b84066f 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -60,10 +60,6 @@
#define ACT_NEXT_SECT 8
#define ACT_PREV_SECT 9
-#define SNAP_LOWER 0x00000001
-#define SNAP_FLYFRAMES 0x00000002
-#define SNAP_TABLECONT 0x00000004
-
#ifdef DBG_UTIL
#include "swtypes.hxx"
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index e8da527..fc292b5 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -33,8 +33,6 @@
#include "cntfrm.hxx"
#include "ndtxt.hxx"
-#define STRSIZE(x) (sizeof(x)-1)
-
class SwCharRange;
class SwTxtNode;
class SwTxtFormatter;
@@ -56,12 +54,6 @@ class SwScriptInfo;
class SwViewOption;
class SwWrongList;
-#define GRID_ON 0
-#define GRID_HEIGHT 1
-#define RUBY_HEIGHT 2
-#define RUBY_TOP 3
-#define GRID_CELLS 4
-
/// Represents the visualization of a paragraph.
class SwTxtFrm: public SwCntntFrm
{
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 7a6fba1..8cf1e07 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -83,8 +83,6 @@ namespace {
static bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, xub_StrLen &rPos );
}
-#define MAX_TXTPORLEN 300
-
inline void ClearFly( SwTxtFormatInfo &rInf )
{
delete rInf.GetFly();
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index ac4fce1..c290254 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -80,8 +80,6 @@
#define ENV_NEWDOC RET_OK
#define ENV_INSERT RET_USER
-#define ENV_CANCEL SHRT_MAX
-
// Function used for labels and envelopes in applab.cxx and appenv.cxx
String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText )
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index cd5bdec..1ad8643 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -459,8 +459,6 @@ SwPageGridExample::~SwPageGridExample()
delete pGridItem;
}
-#define MAX_ROWS 10
-#define MAX_LINES 15
void SwPageGridExample::DrawPage( const Point& rOrg,
const sal_Bool bSecond,
const sal_Bool bEnabled )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4daba7a..d2aae21 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -101,11 +101,6 @@ using namespace ::sfx2;
static const sal_Unicode aDeliStart = '['; // for the form
static const sal_Unicode aDeliEnd = ']'; // for the form
-#define POS_GRF 0
-#define POS_OLE 1
-#define POS_TABLE 2
-#define POS_FRAME 3
-
#define IDX_FILE_EXTENSION rtl::OUString("*.sdi")
String lcl_CreateAutoMarkFileDlg( const String& rURL,
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index d0f6079..ce57fca 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -73,10 +73,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::i18n;
-#define SRCH_ATTR_OFF 0
-#define SRCH_ATTR_ON 1
-#define SRCH_ATTR_SET 2
-
/*--------------------------------------------------------------------
Beschreibung: Search Parameter
--------------------------------------------------------------------*/
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index e813629..903d6af 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -68,18 +68,6 @@
#define PAGE_CHANGE_TIMEOUT 1000 //Timeout fuer Seitenwechsel
-#define JUMP_TYPE_TBL 0
-#define JUMP_TYPE_FRM 1
-#define JUMP_TYPE_GRF 2
-#define JUMP_TYPE_REG 3
-#define JUMP_TYPE_BKM 4
-
-// Version fuer Konfiguration
-
-#define NAVI_VERSION0 0
-#define NAVI_VERSION1 1
-#define NAVI_VERSION2 2 // bIsGlobalActive
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index e0e34cd..7633d3a 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -52,12 +52,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::uno::UNO_QUERY;
using ::rtl::OUString;
-// Enable our own join detection for Intersection and Union
-// should be more efficient than using ScRangeList::Join ( because
-// we already are testing the same things )
-
-#define OWN_JOIN 1
-
// #TODO is this defined somewhere else?
#if ( defined UNX )
#define FILE_PATH_SEPERATOR "/"
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 11eaccc..3321eec 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -31,8 +31,6 @@
#include <tools/gen.hxx>
-#define MAX_64KPOINTS ((((sal_uInt16)0xFFFF)-32)/sizeof(Point))
-
// -------------------
// - ImplPolygonData -
// -------------------
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index d15c19c..e307c0c 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -54,7 +54,6 @@ class BigInt;
typedef ::std::vector< DirEntry* > DirEntryList;
typedef ::std::vector< FileStat* > FileStatList;
-#define FSYS_BUFSIZE 1024
#define FSYS_SHORTNAME_DELIMITER '@'
// FSysAccess
@@ -134,8 +133,6 @@ typedef int FSysAction;
// Fuer RFS
#define RFS_IDENTIFIER "-rfs-"
-#define RFS_LOWER "-rfs-"
-#define RFS_UPPER "-RFS-"
typedef sal_uIntPtr FSysError;
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index f53dba8..6c07542 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -268,7 +268,6 @@ inline Size::Size( long nWidth, long nHeight ) :
// - Range -
// ---------
-#define RANGE_MIN LONG_MIN
#define RANGE_MAX LONG_MAX
class Range : public Pair
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index a5c88a6..e008261 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1664,10 +1664,6 @@ const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const
return *pRes;
}
-#define MAX_EXT_MAX 250
-#define MAX_LEN_MAX 255
-#define INVALID_CHARS_DEF "\\/\"':|^<>?*"
-
/*************************************************************************
|*
|* DirEntry::CreatePath()
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index 6274508..d36de6a 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -39,7 +39,6 @@
#define DEFSTYLE FSYS_STYLE_BSD
#define CMP_LOWER(s) (s)
-#define TEMPNAME() tmpnam(0)
#define LOWER(aString) (aString.Lower())
#include <time.h>
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index 6cda2a1..1e21034 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -50,8 +50,6 @@
#ifndef S_IFBLK
#define S_IFBLK 0x6000
#endif
-#define setdrive(n,a) _chdrive(n)
-#define GETDRIVE(n) (n = _getdrive())
#define dirent _WIN32_FIND_DATAA
#define d_name cFileName
@@ -69,8 +67,6 @@ typedef struct
#define MKDIR( p ) mkdir( p )
#define CMP_LOWER(s) ( s.toAsciiLowerCase() )
-#define START_DRV 'a'
-
inline sal_Bool DRIVE_EXISTS(char c)
{
rtl::OStringBuffer aDriveRoot;
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index aa848f7..cacafcd 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -267,12 +267,6 @@ SvStream& Color::Write( SvStream& rOStm, sal_Bool bNewFormat )
// -----------------------------------------------------------------------
#define COL_NAME_USER ((sal_uInt16)0x8000)
-#define COL_RED_1B ((sal_uInt16)0x0001)
-#define COL_RED_2B ((sal_uInt16)0x0002)
-#define COL_GREEN_1B ((sal_uInt16)0x0010)
-#define COL_GREEN_2B ((sal_uInt16)0x0020)
-#define COL_BLUE_1B ((sal_uInt16)0x0100)
-#define COL_BLUE_2B ((sal_uInt16)0x0200)
// -----------------------------------------------------------------------
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index 78a2f44..42f7ea2 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -194,8 +194,6 @@ public:
#define VBA_LEFT "PositionX"
#define VBA_TOP "PositionY"
-#define VBA_HEIGHT "Height"
-#define VBA_WIDTH "Width"
class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
{
public:
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 2e41c70..fa51e62 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -159,8 +159,6 @@ bool ServerFontLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutAr
#ifdef ENABLE_ICU_LAYOUT
-#define bool_t signed char
-
// disable warnings in icu layout headers
#if defined __SUNPRO_CC
#pragma disable_warn
diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx
index 33190d4..2c1ab85 100644
--- a/vcl/inc/vcl/cmdevt.hxx
+++ b/vcl/inc/vcl/cmdevt.hxx
@@ -403,7 +403,6 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
#define COMMAND_MEDIA ((sal_uInt16)17)
#define COMMAND_SELECTIONCHANGE ((sal_uInt16)18)
#define COMMAND_PREPARERECONVERSION ((sal_uInt16)19)
-#define COMMAND_USER ((sal_uInt16)4096)
class VCL_DLLPUBLIC CommandEvent
{
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 13f4784..0850024 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -341,7 +341,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
#define EVENT_INPUTDISABLE 11
#define EVENT_EXECUTEDIALOG 100
#define EVENT_ENDEXECUTEDIALOG 101
-#define EVENT_USER 10000
class VCL_DLLPUBLIC NotifyEvent
{
diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h
index 1579d1f..0760b94 100644
--- a/vcl/inc/vcl/spin.h
+++ b/vcl/inc/vcl/spin.h
@@ -25,13 +25,6 @@
class Rectangle;
class OutputDevice;
-// -----------------------------------------------------------------------
-
-#define SPIN_DELAY 280
-#define SPIN_SPEED 60
-
-// -----------------------------------------------------------------------
-
void ImplDrawSpinButton( OutputDevice* pOutDev,
const Rectangle& rUpperRect,
const Rectangle& rLowerRect,
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index c61b970..df77041 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -55,7 +55,6 @@ class TaskPaneList;
#define ICON_DATABASE_DOCUMENT 12
#define ICON_MATH_DOCUMENT 13
#define ICON_MACROLIBRARY 1
-#define ICON_PLAYER 100
#define ICON_SETUP 500
// -------------------
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 6d73e91..7dbf570 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7950,7 +7950,6 @@ void PDFWriterImpl::drawLine( const Point& rStart, const Point& rStop, const Lin
}
}
-#define WCONV( x ) m_pReferenceDevice->ImplDevicePixelToLogicWidth( x )
#define HCONV( x ) m_pReferenceDevice->ImplDevicePixelToLogicHeight( x )
void PDFWriterImpl::drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove )
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 1ddda4e..8796829 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -46,8 +46,6 @@ const sal_Int16 API_LINE_DASHED = 2;
#define LINE_WIDTH_1 36
#define LINE_WIDTH_2 89
#define LINE_WIDTH_3 142
-#define LINE_WIDTH_4 177
-#define LINE_WIDTH_5 18
#define DOUBLE_LINE0_OUT LINE_WIDTH_0
#define DOUBLE_LINE0_IN LINE_WIDTH_0
diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h
index 31a6e22..aa7f115 100644
--- a/xml2cmp/source/inc/precomp.h
+++ b/xml2cmp/source/inc/precomp.h
@@ -34,7 +34,6 @@ typedef long intt;
#define REF( x ) (&(x))
-#define MREF( x ) (&(pThis->x))
#define THIS_ pThis
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index edf8c2d..118bd19 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -71,14 +71,10 @@ using namespace ::xmloff::token;
// section properties
#define MS_E( a, p, l, t, c ) \
_M_E( a, p, l, (t|XML_TYPE_PROP_SECTION), c )
-#define MS_ED( a, p, l, t, c ) \
- _M_ED( a, p, l, (t|XML_TYPE_PROP_SECTION), c )
// ruby properties
#define MR_E( a, p, l, t, c ) \
_M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
-#define MR_ED( a, p, l, t, c ) \
- _M_ED( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
#define M_END() \
{ NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 }
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 6dc169c..80af1e3 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -79,8 +79,6 @@ void Main();
#define BUTTONHEIGHT 22
#define BUTTONSPACE 20
-#define LISTBOXHEIGHT 120
-
// -----------------------------------------------------------------------
SAL_IMPLEMENT_MAIN()
commit 892bb81d17b3351c196661c44fb15b29509c7115
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 2 17:39:58 2012 +0200
hrc cleanup: Remove unused defines
Change-Id: Iaa7da7745fc01544d9a503b313479b2450810524
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index d7ff5d0..44eee67 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -618,13 +618,6 @@ String RID_STR_GETLINE
#define MN_HELP 31
#define MN_TEMPLATES 11
-#define MN_PLEDIT 20
-#define MN_PLVIEW 21
-#define MN_PLEXTRA 22
-#define MN_PLWIN 30
-#define MN_PLHELP 31
-#define MN_PLTEMPLATES 11
-
/*
The application menu bar resource has become obsolete. You can now find the menu bar definition at:
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 8354dfe..5bf0196 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -53,7 +53,6 @@
#define TP_CHARTTYPE 910
#define TP_RANGECHOOSER 911
#define TP_WIZARD_TITLEANDOBJECTS 912
-#define TP_LOCATION 913
#define TP_DATA_SOURCE 914
#define TP_3D_SCENEGEOMETRY 915
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src
index c112837..9cfaeba 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.src
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.src
@@ -55,7 +55,6 @@
#define XTICK_2 (XTICK_1+60)
#define XTICK_3 (XTICK_2+60)
#define XTICK_4 (XTICK_3+60)
-#define XTICK_5 (XTICK_4+6)
#define TICKWIDTH 59
TabPage TP_AXIS_POSITIONS
diff --git a/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index d319d11..a9eb7d3 100644
--- a/cui/source/customize/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -25,6 +25,3 @@
#define TXT_SAVEIN 10
#define LB_SAVEIN 11
-
-#define ID_APP 21
-#define ID_DOC 22
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 8aa0854..cb3b501 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -45,7 +45,6 @@
#define ED_LIBNAME 14
#define PB_OK 15
#define PB_CANCEL 16
-#define DLG_NEWLIB 17
#define STR_FT_RENAME 18
#define STR_RENAME 19
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index 56a16cd..45fcc3b 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -32,7 +32,6 @@
#define HEIGHT_EDIT 12
#define LINE_1_Y 6
-#define LINE_2_Y LINE_1_Y + HEIGHT_EDIT + 4
#define OFFSET_Y 6
ModalDialog DLG_DOCUMENTLINK
diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index 42f3c1f..e80f40b 100644
--- a/cui/source/options/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
@@ -49,7 +49,6 @@
#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define WHOLE_HEIGHT 185
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
#define DIFF(v1,v2) (v2-v1)
#define SUM(v1,v2) (v2+v1)
diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
index 04c01c2..4ca1834 100644
--- a/cui/source/options/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
@@ -28,7 +28,6 @@
#define FL_SEPARATOR 19
#define FT_HINT 21
-#define CB_DISABLE 22
#define ST_LOAD_ERROR 24
// metrics
@@ -48,7 +47,6 @@
#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X)
#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT)
#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME)
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 2f11292..a9b34f4 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -52,5 +52,3 @@
#define BMP_CAPTTYPE_2 2
#define BMP_CAPTTYPE_3 3
#define BMP_CAPTTYPE_4 4
-
-#define SHOW_NONE 4
diff --git a/cui/source/tabpages/macroass.hrc b/cui/source/tabpages/macroass.hrc
index 18dfce4..5be13a4 100644
--- a/cui/source/tabpages/macroass.hrc
+++ b/cui/source/tabpages/macroass.hrc
@@ -31,9 +31,7 @@
#define LB_MACROS 7
// FREE
#define FT_LABEL4LB_MACROS 9
-#define STR_JAVASCRIPT 10
#define STR_MACROS 11
-#define ED_JAVASCRIPT 12
#define STR_EVENT 13
#define STR_ASSMACRO 14
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index fcfbcc8..1845853 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -54,10 +54,6 @@
/* step delay */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
/* delay time */ RSC_CD_TEXTBOX_HEIGHT)
-
-// left space for real controls
-#define MA_LEFT_SPACE (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT)
-
// tabpage total size
#define MA_TOTAL_WIDTH 260
#define MA_TOTAL_HEIGHT RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM
diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc
index d183c39..c504c5a 100644
--- a/dbaccess/source/ui/dlg/queryfilter.hrc
+++ b/dbaccess/source/ui/dlg/queryfilter.hrc
@@ -43,7 +43,6 @@
#define ET_WHEREVALUE3 3
#define STR_NOENTRY 1
-#define STR_DEFAULT 3
#define STR_COMPARE_OPERATORS 4
#define BT_OK 1
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 0caa88f..b648806 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -88,8 +88,6 @@
#define DLG_COLWIDTH RID_DIALOG_START + 9
#define DLG_ATTR RID_DIALOG_START + 10
#define DLG_SAVE_AS RID_DIALOG_START + 11
-#define DLG_ERROR RID_DIALOG_START + 12
-#define DLG_TEXT RID_DIALOG_START + 13
#define DLG_JOIN_TABADD RID_DIALOG_START + 14
#define DLG_QRY_JOIN RID_DIALOG_START + 15
#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16
@@ -101,7 +99,6 @@
#define DLG_DIRECTSQL RID_DIALOG_START + 22
#define DLG_PASSWORD RID_DIALOG_START + 23
#define DLG_DOMAINPASSWORD RID_DIALOG_START + 24
-#define DLG_RENAME RID_DIALOG_START + 25
#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28
@@ -134,9 +131,6 @@
// FREE
#define PAGE_ORACLE_JDBC RID_PAGE_START + 27
#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28
- // FREE
-#define PAGE_MOZILLA RID_PAGE_START + 32
-
#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41
#define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index e252209..d3c8726 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -18,9 +18,6 @@
#ifndef DBAUI_TOOLBOX_HXX
#define DBAUI_TOOLBOX_HXX
-#define CUR_ITEM ToolBoxItem
-#define CUR_SEPARATOR CUR_ITEM {Type = TOOLBOXITEM_SEPARATOR;}
-
#define MID_SBA_QRY_REFRESH \
Identifier = ID_BROWSER_REFRESH ; \
Text [ en-US ] = "Refresh"; \
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 579d1de..26ec026 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -39,7 +39,6 @@
#define MN_EDIT 20
#define MN_VIEW 21
#define MN_EXTRA 22
-#define MN_INDEX 23
#define MN_WIN 30
#define MN_HELP 31
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 7ebea57..d1bce11 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -161,7 +161,6 @@
//........................................................................
#define ET_DATASOURCENAME 1
-#define ET_LOCATION 2
//........................................................................
#define PB_INVOKE_ADMIN_DIALOG 1
diff --git a/extensions/source/propctrlr/taborder.hrc b/extensions/source/propctrlr/taborder.hrc
index 16b4bc2..92532ef 100644
--- a/extensions/source/propctrlr/taborder.hrc
+++ b/extensions/source/propctrlr/taborder.hrc
@@ -20,8 +20,6 @@
#define FT_CONTROLS 1
-#define LB_CONTROLS 1
-
#define PB_MOVE_UP 1
#define PB_MOVE_DOWN 2
#define PB_AUTO_ORDER 3
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc
index 85eb1f8..776bc4b 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -48,7 +48,6 @@
#define PB_HELP 11
#define FL_SEPARATOR1 12
#define ED_CONDITION_RHS 13
-#define CT_CONDITION 14
#define SB_ALL_CONDITIONS 18
#define WND_COND_PLAYGROUND 19
#define BTN_MOVE_UP 20
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 0341484..3b5b4e3 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -18,7 +18,6 @@
#include "sc.hrc"
-
#define TP_GENERAL 1
#define TP_SAVE 2
#define TP_PATH 3
@@ -27,10 +26,8 @@
#define TP_USERLISTS 7
#define TP_PRINT 8
#define TP_GRID 10
-#define TP_CONTENT 11
#define TP_LAYOUT 12
#define TP_INPUT 13
-#define TP_CHANGES 14
#define TP_FORMULA 15
// TP_CALC:
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc
index f2412d8..6cb0a9e 100644
--- a/sc/source/ui/inc/submenu.hrc
+++ b/sc/source/ui/inc/submenu.hrc
@@ -17,7 +17,6 @@
*/
// IDs fuer Untermenues
-#define SUBMENU_NAME 8
#define SUBMENU_OBJARRANGE 23
#define SUBMENU_ANCHOR 24
#define SUBMENU_OBJMIRROR 33
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index bcc6591..edc76ca 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -131,7 +131,6 @@
#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y
#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1
-#define ATTR_OPTIONS ATTR_OPTIONS_START
#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
#define ATTR_OPTIONS_CONTENTS ATTR_OPTIONS_START + 2
#define ATTR_OPTIONS_MISC ATTR_OPTIONS_START + 3
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
index 0443b70..54c902d 100644
--- a/sd/source/ui/annotations/annotations.hrc
+++ b/sd/source/ui/annotations/annotations.hrc
@@ -47,6 +47,4 @@
#define FT_AUTHOR 1
-#define CT_TEXT 5
-
#endif // _SD_ANNOTATIONPANE_HRC
diff --git a/sd/source/ui/app/_app.hrc b/sd/source/ui/app/_app.hrc
index d5847a1..2762b98 100644
--- a/sd/source/ui/app/_app.hrc
+++ b/sd/source/ui/app/_app.hrc
@@ -28,6 +28,5 @@
#define MN_SUB_TEMPLATES 95
#define MN_SUB_POSITION 96
#define MN_SUB_MASTERPAGE 97
-#define MN_SUB_SEND 98
#endif
diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index 5be0502..a1aead6 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -29,7 +29,6 @@
#include "present.hrc"
#define DISTANCE 23
-#define DISTANCE2 ((DISTANCE) + 81)
ModalDialog DLG_START_PRESENTATION
{
diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc
index 7d536f8..2f9bf1b 100644
--- a/sd/source/ui/inc/present.hrc
+++ b/sd/source/ui/inc/present.hrc
@@ -33,7 +33,6 @@
#define RBT_STANDARD 4
#define RBT_WINDOW 5
#define RBT_AUTO 6
-#define FT_PAUSE 1
#define TMF_PAUSE 1
#define CBX_AUTOLOGO 1
diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc
index 6127ac9..12722fd 100644
--- a/sd/source/ui/inc/pubdlg.hrc
+++ b/sd/source/ui/inc/pubdlg.hrc
@@ -95,9 +95,6 @@
#define PAGE5_TITEL 81
#define PAGE5_TEXTONLY 82
#define PAGE5_BUTTONS 83
-#define PAGE5_TITEL_2 84
-#define PAGE5_NOBACK 85
-#define PAGE5_BACKS 86
//////////////////////////////
@@ -110,7 +107,6 @@
#define PAGE6_VLINK 107
#define PAGE6_ALINK 108
#define PAGE6_DOCCOLORS 109
-#define PAGE6_USECOLOR 110
#define PAGE6_PREVIEW 111
//////////////////////////////
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index 4862445..b5207bc 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -45,7 +45,6 @@
#define SID_CHAOS_END 9799
#define SID_DISTRIBUTION (SID_CHAOS_START + 26)
-#define SID_UPDATE (SID_CHAOS_START + 86)
#define SID_INSERT (SID_CHAOS_START + 90)
#define SID_VIEW_FLD_PIC (SID_CHAOS_START + 185)
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 8e67cd0..0688ced 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -212,7 +212,6 @@
#define SID_OFFICE_CUSTOMERNUMBER (SID_SFX_START + 1608)
#define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610)
#define SID_CURRENT_URL (SID_SFX_START + 1613)
-#define SID_GROUPVIEW (SID_SFX_START + 1621)
#define SID_TIPWINDOW (SID_SFX_START + 1632)
#define SID_CHARSET (SID_SFX_START + 1633)
diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc
index 7ea636e..ac4fe8b 100644
--- a/svtools/inc/svtools/imagemgr.hrc
+++ b/svtools/inc/svtools/imagemgr.hrc
@@ -30,7 +30,6 @@
#define IMG_DATABASE (IMAGELIST_START + 53)
#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54)
#define IMG_GIF (IMAGELIST_START + 61)
-#define IMG_HELP (IMAGELIST_START + 62)
#define IMG_HTML (IMAGELIST_START + 63)
#define IMG_JPG (IMAGELIST_START + 64)
#define IMG_MATH (IMAGELIST_START + 68)
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index ba0cd3a..6acefcb 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -456,7 +456,6 @@
#define SID_ATTR_LONG_LRSPACE ( SID_SVX_START + 285 )
#define SID_FRAME_TO_TOP ( SID_SVX_START + 286 )
#define SID_FRAME_TO_BOTTOM ( SID_SVX_START + 287 )
-#define SID_POSTIT ( SID_SVX_START + 288 )
#define SID_SEARCH_SEARCHSET ( SID_SVX_START + 292 )
#define SID_SEARCH_REPLACESET ( SID_SVX_START + 293 )
#define SID_SET_SUPER_SCRIPT ( SID_SVX_START + 294 )
@@ -534,7 +533,6 @@
#define SID_ATTR_3D_INTERN ( SID_SVX_START + 422 )
#define SID_PSZ_FUNCTION ( SID_SVX_START + 423 )
#define SID_OFASLOTS_START ( SID_SVX_START + 425 )
-#define SID_AUTOPILOT SID_SD_AUTOPILOT
#define SID_TABLE_INSERT_COL_DLG ( SID_SVX_START + 426 )
#define SID_TABLE_INSERT_ROW_DLG ( SID_SVX_START + 427 )
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 15767a6..ab3e463 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -35,11 +35,7 @@
#define BUTTON_WIDTH 13
#define BUTTON_HEIGHT 13
#define VT_BUTTON_WIDTH 18
-#define GROUP_Y (BORDER + BUTTON_HEIGHT + 3)
-#define GROUP_HEIGHT 95
#define GROUP_WIDTH (WIDTH - 2 * BORDER)
-#define GROUP_PREV_X 60
-#define GROUP_PREV_Y (GROUP_Y + GROUP_HEIGHT + 1)
#define IMG_BUTTON_HEIGHT 15
#define IMG_BUTTON_NEXT (IMG_BUTTON_HEIGHT + 2)
#define IMG_BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, IMG_BUTTON_HEIGHT )
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index dd56cc7..a365245 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -23,7 +23,6 @@
#define DLG_CHAR (RC_CHRDLG_BEGIN + 1)
#define DLG_PARA (RC_CHRDLG_BEGIN + 2)
-#define DLG_PAGE (RC_CHRDLG_BEGIN + 3)
#define DLG_BREAK (RC_CHRDLG_BEGIN + 5)
#define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8)
#define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9)
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 20438e0..b09dc96 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -29,7 +29,6 @@
#include "rcid.hrc"
-#define DLG_POSTIT (RC_FLDDLG_BEGIN + 4)
#define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5)
#define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9)
#define DLG_JAVAEDIT (RC_FLDDLG_BEGIN + 10)
diff --git a/sw/inc/fmtui.hrc b/sw/inc/fmtui.hrc
index 12e1dd4..20c6b3f 100644
--- a/sw/inc/fmtui.hrc
+++ b/sw/inc/fmtui.hrc
@@ -30,8 +30,6 @@
#define STR_PAGE_FOOTNOTE (RC_FMTUI_BEGIN + 7)
#define STR_PAGE_TEXTGRID (RC_FMTUI_BEGIN + 8)
-#define MN_TEXT (RC_FMTUI_BEGIN + 20)
-
#define ST_CUSTOMIZE 1
// Do not change relations to base 2!!!
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index b7773d0..616ea64 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -63,7 +63,6 @@
// DIALOGS -----------------------------------------------------------
-#define DLG_LISTBOX (RC_GLOBALS_BEGIN + 1)
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
#define DLG_SPECIAL (RC_GLOBALS_BEGIN + 3)
@@ -144,7 +143,6 @@
#define TP_FRM_URL (RC_GLOBALS_BEGIN + 42)
#define TP_CHAR_URL (RC_GLOBALS_BEGIN + 43)
-#define TP_LAYOUT_OPT (RC_GLOBALS_BEGIN + 44)
#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45)
#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47)
#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48)
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 0497d42..6d07ec1 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -25,11 +25,7 @@
#include "rcid.hrc"
-#define DLG_FORMEDT (RC_INDEX_BEGIN + 0)
-#define DLG_IDX (RC_INDEX_BEGIN + 1)
-#define DLG_USRIDX (RC_INDEX_BEGIN + 2)
#define DLG_INSIDXMARK (RC_INDEX_BEGIN + 3)
-#define DLG_CNTTABLE (RC_INDEX_BEGIN + 4)
#define DLG_MULTMRK (RC_INDEX_BEGIN + 5)
#define STR_TITLE (RC_INDEX_BEGIN + 6)
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 89a338b..8f9bd1c 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -59,7 +59,6 @@
#define RC_ENVELP (RC_BASE + 2750)
#define RC_STATLIN_STR (RC_BASE + 2850)
#define RC_COMMON_CORE (RC_BASE + 2950)
-#define RC_WIZARD (RC_BASE + 3050)
#define RC_POPUPS (RC_BASE + 3150)
#define RC_SHELLS (RC_BASE + 3250)
#define RC_CFGITEMS (RC_BASE + 3350)
diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc
index 37d9079..5d1bb42 100644
--- a/sw/source/ui/chrdlg/chardlg.hrc
+++ b/sw/source/ui/chrdlg/chardlg.hrc
@@ -15,9 +15,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define SIZE_FT 5
-#define COLOR_LB 12
-#define CAPS_RB 21
#define FL_URL 50
#define FT_URL 51
@@ -35,4 +32,3 @@
#define ED_TEXT 64
#define FT_NAME 65
#define ED_NAME 66
-
diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc
index 16aae43..b3644ed 100644
--- a/sw/source/ui/chrdlg/paradlg.hrc
+++ b/sw/source/ui/chrdlg/paradlg.hrc
@@ -16,9 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define TAB_CONTROL 55
-#define DIST_FRM 8
-#define TOP_DIST 10
-#define BOTTOM_DIST 12
#define HYPHEN_BOX_AFTER 44
#define HYPHEN_BOX_BEFORE 22
#define OK_BTN 50
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 76d6a7f..b02e34d 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -61,7 +61,6 @@
#define BT_EDIT 55
#define BT_NEW 56
#define BT_DELETE 57
-#define BT_DEFAULT 58
#define CB_CHAR_HIDDEN 61
// Print-Extra-Page
#define CB_PGRF 61
@@ -148,7 +147,6 @@
#define FT_MOVE 128
#define FT_COMMENT 133
-#define FT_UNKNOWN 137
#define FL_TABLE_SEPARATOR 139
#define CB_PROSPECT_RTL 140
diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc
index 767b2af..fac440c 100644
--- a/sw/source/ui/frmdlg/cption.hrc
+++ b/sw/source/ui/frmdlg/cption.hrc
@@ -37,7 +37,6 @@
#define LB_LEVEL 17
#define FT_SEPARATOR 18
#define ED_SEPARATOR 19
-#define CB_COPY_ATTR 20
#define BTN_AUTOCAPTION 23
#define TXT_SEP 24
#define EDT_SEP 25
diff --git a/sw/source/ui/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc
index 8beb7ab..0eaf55a 100644
--- a/sw/source/ui/frmdlg/pattern.hrc
+++ b/sw/source/ui/frmdlg/pattern.hrc
@@ -16,10 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define COLOR_LBL 3
-#define COLOR_LBOX 4
-
#define OK_BTN 11
#define CANCEL_BTN 12
-#define RESET_BTN 13
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index f677617..2bfc38b 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -22,7 +22,6 @@
#include "rcid.hrc"
#include "globals.hrc"
-#define DLG_BORDER (RC_FRMDLG_BEGIN + 3)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list