diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
| commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
| tree | c8b168e8e0619c387d30f206848ec30ca7238a00 | |
| parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) | |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
263 files changed, 54 insertions, 1478 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 1613afcc2cb0..6d23f2004fb2 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -37,14 +37,13 @@ # define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer" #endif +#if !defined DBG +# if OSL_DEBUG_LEVEL > 2 #ifdef AVMEDIA_GST_0_10 # define AVVERSION "gst 0.10: " #else # define AVVERSION "gst 1.0: " #endif - -#if !defined DBG -# if OSL_DEBUG_LEVEL > 2 #define DBG(...) do { fprintf (stderr, "%s", AVVERSION); fprintf (stderr, __VA_ARGS__); fprintf (stderr, "\n"); } while (0); # else #define DBG(...) diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 42f005d47bcb..fddf8bbb03c5 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// CLOOKS: -#define _SPIN_HXX - #include "basidesh.hxx" #include <tools/diagnose_ex.h> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index aa53f97ad570..7592943d77a5 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -55,13 +55,6 @@ using namespace com::sun::star; -// for the bsearch -#ifdef WNT -#define CDECL _cdecl -#endif -#if defined(UNX) -#define CDECL -#endif #ifdef UNX #include <sys/resource.h> #endif diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a7ad6d56e5b4..211618a4b544 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -397,7 +397,6 @@ RTLFUNC(ChrW) #ifdef UNX -#define _MAX_PATH 260 #define _PATH_INCR 250 #endif diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 1e882c244f50..752e6cd5b854 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -44,10 +44,6 @@ #define _RWMASK 0x0F00 // mask for R/W-bits #define _TYPEMASK 0xF000 // mask for the entry's type -#define _READ 0x0100 // can be read -#define _BWRITE 0x0200 // can be used as Lvalue -#define _LVALUE _BWRITE // can be used as Lvalue -#define _READWRITE 0x0300 // both #define _OPT 0x0400 // parameter is optional #define _CONST 0x0800 // property is const #define _METHOD 0x3000 @@ -58,7 +54,6 @@ #define _LFUNCTION 0x1300 // mask for function which also works as Lvalue #define _SUB 0x2100 #define _ROPROP 0x4100 // mask Read Only-Property -#define _WOPROP 0x4200 // mask Write Only-Property #define _RWPROP 0x4300 // mask Read/Write-Property #define _CPROP 0x4900 // mask for constant diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 5cd8153b1dab..20a1a851b5b2 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -30,7 +30,6 @@ #define ATTR_IMP_ITALIC 5 #define ATTR_IMP_STRIKETHROUGH 6 #define ATTR_IMP_UNDERLINE 7 -#define ATTR_IMP_WEIGHT 8 #define ATTR_IMP_SIZE 9 #define ATTR_IMP_NAME 10 diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index c0e23ff868eb..de96b62ecd53 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -46,9 +46,6 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings #define _NO_DIGIT -1 -#define MAX_NO_OF_EXP_DIGITS 5 - // +4 because of the value range: between -308 and +308 - // +1 for closing 0 #define MAX_NO_OF_DIGITS DBL_DIG #define MAX_DOUBLE_BUFFER_LENGTH MAX_NO_OF_DIGITS + 9 // +1 for leading sign @@ -83,7 +80,6 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings // decimal point for floating-point-numbers. // all format-strings are compatible to Visual-Basic: #define GENERALNUMBER_FORMAT "0.############" -#define CURRENCY_FORMAT "@$0.00;@($0.00)" #define FIXED_FORMAT "0.00" #define STANDARD_FORMAT "@0.00" #define PERCENT_FORMAT "0.00%" @@ -980,7 +976,7 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg ) } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_CURRENCY ) ) { - sFormatStrg = sCurrencyFormatStrg; // old: CURRENCY_FORMAT; + sFormatStrg = sCurrencyFormatStrg; } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_FIXED ) ) { diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c index 764bb32e34b6..4ee898fd0717 100644 --- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c @@ -35,17 +35,6 @@ #include "sal/types.h" -#if defined assert -#undef assert -#endif - -#define assert(X) if (!X) { (*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/RuntimeException"), "assertion failed"); return;} - - -#define SYSTEM_WIN32 1 -#define SYSTEM_WIN16 2 -#define SYSTEM_JAVA 3 -#define SYSTEM_MAC 5 #define SYSTEM_XWINDOW 6 SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c index 4fe43a419536..47d2e8ffee20 100644 --- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -35,10 +35,6 @@ #include "sal/types.h" -#define SYSTEM_WIN32 1 -#define SYSTEM_WIN16 2 -#define SYSTEM_JAVA 3 -#define SYSTEM_MAC 5 #define SYSTEM_XWINDOW 6 diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx index b3726cc1d518..40adaa012e8a 100644 --- a/bridges/source/cpp_uno/shared/types.cxx +++ b/bridges/source/cpp_uno/shared/types.cxx @@ -19,7 +19,6 @@ #include "bridges/cpp_uno/shared/types.hxx" -#define INCLUDED_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX #include "typelib/typeclass.h" #include "typelib/typedescription.h" diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index cbda60a0bc95..ca75d35c8ad5 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -298,7 +298,6 @@ namespace cairocanvas } } -#define CANVASBITMAP_IMPLEMENTATION_NAME "CairoCanvas::CanvasBitmap" #define PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME "Canvas::ParametricPolyPolygon" /** surfaceFromXBitmap Create a surface from XBitmap diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index c2c08fa525e8..fd7feb196fdd 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; #define STATE_SIMPLE_RANGE 1 #define STATE_DATA_SERIES 2 #define STATE_OBJECTS 3 -#define STATE_LOCATION 4 #define STATE_LAST STATE_OBJECTS namespace diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 7639b4b38172..7a595ca9d9e7 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -24,7 +24,6 @@ #include <svl/itemset.hxx> // header for class SvxNumberInfoItem -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #include <svx/numinf.hxx> #include <svx/svxdlg.hxx> diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 64eb897e3df9..173c669c3f0b 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -25,13 +25,10 @@ #ifndef DISABLE_DBCONNECTIVITY #ifndef YYBISON #ifndef FLEX_SCANNER -#ifndef BISON_INCLUDED -#define BISON_INCLUDED #include "sqlbison.hxx" #endif #endif #endif -#endif #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/XLocaleData4.hpp> diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index b59042e1bde9..9e00758c66b6 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -63,9 +63,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; -// Maximal number of Rows, that can be processed being sorted with ORDER BY: -#define MAX_KEYSET_SIZE 0x40000 // 256K - namespace { void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext) diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 22fe2a3e8780..b7309b852cbc 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -40,10 +40,6 @@ namespace connectivity using namespace ::com::sun::star::embed; using namespace ::com::sun::star::io; -#define ThrowException(env, type, msg) { \ - env->ThrowNew(env->FindClass(type), msg); } - - StreamHelper::StreamHelper(const Reference< XStream>& _xStream) : m_xStream(_xStream) { diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 38f43765e41b..05c5556814ba 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -35,12 +35,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::connectivity::hsqldb; -/*****************************************************************************/ -/* exception macros */ - -#define ThrowException(env, type, msg) { \ - env->ThrowNew(env->FindClass(type), msg); } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess * Method: isStreamElement diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index 64e60933ad31..351099937dfd 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -#define NULLABLE_UNDEFINED 99 //************************************************************** //************ Class: java.sql.ResultSetMetaData //************************************************************** diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index 9c7521cafb37..e517f4eae494 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -20,9 +20,6 @@ #include "MNSProfileDiscover.hxx" -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 -#endif #include <MNSFolders.hxx> #include <MNSINIParser.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index f2727ba669a5..8640ba11bd41 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -78,9 +78,6 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); #endif -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 -#endif #include <MNSFolders.hxx> #include <MNSINIParser.hxx> diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index cca574d25532..5dc857643463 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -24,10 +24,7 @@ #include <connectivity/sqlerror.hxx> #include <internalnode.hxx> #define YYBISON 1 -#ifndef BISON_INCLUDED -#define BISON_INCLUDED #include <sqlbison.hxx> -#endif #include <connectivity/sqlparse.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 5cf32646e513..2592ffbc5448 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -86,12 +86,7 @@ #define EmfPlusObjectTypeRegion 0x400 #define EmfPlusObjectTypeImage 0x500 #define EmfPlusObjectTypeFont 0x600 -#define EmfPlusObjectTypeStringFormat 0x700 -#define EmfPlusObjectTypeImageAttributes 0x800 -#define EmfPlusRegionInitialStateRectangle 0x10000000 -#define EmfPlusRegionInitialStatePath 0x10000001 -#define EmfPlusRegionInitialStateEmpty 0x10000002 #define EmfPlusRegionInitialStateInfinite 0x10000003 #if OSL_DEBUG_LEVEL > 1 diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index c8417713f6e1..650e39a53297 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -26,8 +26,6 @@ #include "defdlgname.hxx" #include <dialmgr.hxx> -#define MAX_DESCRIPTION_LINES ((long)5) - /************************************************************************* |* |* Dialog for editing a name diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fd1ffcdaf43f..d9f214684eff 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1781,11 +1781,11 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) } else { - // color to use as foreground for an invalid pattern - #define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE) // color to use as background for an invalid pattern #define INVALID_PATTERN_BACKGROUND_COLOR Color(0xff6563) #if 0 + // color to use as foreground for an invalid pattern + #define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE) //! Gives white on white!?! pEd->SetControlBackground( INVALID_PATTERN_BACKGROUND_COLOR); pEd->SetControlForeground( INVALID_PATTERN_FOREGROUND_COLOR); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 3da87b0f34c1..d2e3a11dbb5d 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -26,8 +26,6 @@ #include <svl/intitem.hxx> #include <vcl/edit.hxx> -#define SVX_OPTGENRL_CXX - #include <cuires.hrc> #include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c794bdd2e0e8..d7e68f85a029 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::beans; #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 static const sal_Char cSpell[] = SN_SPELLCHECKER; static const sal_Char cGrammar[] = SN_GRAMMARCHECKER; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 5de1ae771cbb..eb382088837c 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -60,6 +60,7 @@ #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/processfactory.hxx> +#include <editeng/langitem.hxx> #include <editeng/optitems.hxx> #include <editeng/unolingu.hxx> #include <linguistic/misc.hxx> @@ -94,11 +95,6 @@ #include <vcl/waitobj.hxx> #include "svtools/treelistentry.hxx" -#ifndef _SVX_LANGITEM_HXX -#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE -#include <editeng/langitem.hxx> -#endif - #ifdef LINUX #include <sys/stat.h> #endif diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 60df6197415b..5fc05943e37c 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define ITEMID_MACRO 0 -#include <svl/macitem.hxx> -#undef ITEMID_MACRO - #include "macroass.hxx" #include <basic/basmgr.hxx> #include <comphelper/string.hxx> #include <dialmgr.hxx> +#include <svl/macitem.hxx> #include <svx/dialogs.hrc> #include <svtools/svmedit.hxx> #include "cfgutil.hxx" diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 07aac6ff64f4..f7c8aab03be7 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -83,8 +83,6 @@ using namespace com::sun::star::style; #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 -#define NUM_PAGETYPE_BMP 3 -#define PAGETYPE_USER_START 10 #define SHOW_NUMBERING 0 #define SHOW_BULLET 1 diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index bff3bd53a1aa..1ff824764f26 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -71,8 +71,6 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper() diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index b1a27920e7c0..78ad06b680ea 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -36,12 +36,6 @@ #include "xmlfilter.hxx" #include "xmlHelper.hxx" - -#define XML_LINE_LEFT 0 -#define XML_LINE_RIGHT 1 -#define XML_LINE_TOP 2 -#define XML_LINE_BOTTOM 3 - namespace dbaxml { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index ed88d8d7dbd4..abe5d59f40e3 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -74,10 +74,6 @@ using namespace ::com::sun::star::util; #define CONTROL_WIDTH_3 250 #define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) -#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem -#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem - #define HSCROLL_STEP 20 diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index a99ef1c9a3fa..f72a43cf82d3 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -26,8 +26,6 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -#define SPACEBETWEENENTRIES 4 - DBG_NAME(OMarkableTreeListBox) OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle ) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 5b1ba07979b0..a273fbd301a6 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -110,9 +110,6 @@ using namespace ::com::sun::star::document; using namespace ::comphelper; using namespace ::cppu; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 - DBG_NAME(ODbTypeWizDialogSetup) //========================================================================= //= ODbTypeWizDialogSetup diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 12c6d9c5d272..e4a589e8e5b0 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -39,17 +39,13 @@ #if defined WNT #define ODBC_LIBRARY "ODBC32.DLL" -#define ODBC_UI_LIBRARY "ODBCCP32.DLL" #endif #ifdef UNX #ifdef MACOSX #define ODBC_LIBRARY "libiodbc.dylib" -#define ODBC_UI_LIBRARY "libiodbcinst.dylib" #else #define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" #define ODBC_LIBRARY "libodbc.so" -#define ODBC_UI_LIBRARY "libodbcinst.so" #endif #endif @@ -86,7 +82,6 @@ #else #define ODBC_LIBRARY "" -#define ODBC_UI_LIBRARY "" #endif // HAVE_ODBC_SUPPORT @@ -104,7 +99,6 @@ typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEG typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); -#define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a) #define NSQLAllocHandle(a,b,c) (*(TSQLAllocHandle)(m_pAllocHandle))(a,b,c) #define NSQLFreeHandle(a,b) (*(TSQLFreeHandle)(m_pFreeHandle))(a,b) #define NSQLSetEnvAttr(a,b,c,d) (*(TSQLSetEnvAttr)(m_pSetEnvAttr))(a,b,c,d) diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 3cb6690fcb32..c2854e884ea1 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -65,19 +65,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; #define DBAUI_HTML_FONTSIZES 8 // like export, HTML-Options -#define HTML_META_NONE 0 -#define HTML_META_AUTHOR 1 -#define HTML_META_DESCRIPTION 2 -#define HTML_META_KEYWORDS 3 -#define HTML_META_REFRESH 4 -#define HTML_META_CLASSIFICATION 5 -#define HTML_META_CREATED 6 -#define HTML_META_CHANGEDBY 7 -#define HTML_META_CHANGED 8 -#define HTML_META_GENERATOR 9 -#define HTML_META_SDFOOTNOTE 10 -#define HTML_META_SDENDNOTE 11 -#define HTML_META_CONTENT_TYPE 12 // ========================================================================== DBG_NAME(OHTMLReader) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 20d8e8d94717..92aa6bd5fe15 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -663,7 +663,6 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\ //======================================================================== #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) #define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False ) -#define OUT_STR( str ) HTMLOutFuncs::Out_String( (*m_pStream), str ) #define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() #define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) #define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 03f57e2b37f9..dee5ef4dc6b0 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -57,9 +57,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; #define TABWIN_SIZING_AREA 4 -#define LISTBOX_SCROLLING_AREA 6 -#define SCROLLING_TIMESPAN 500 - #define TABWIN_WIDTH_MIN 90 #define TABWIN_HEIGHT_MIN 80 diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f1ab891036dd..fe569292ccb7 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -82,16 +82,6 @@ DBG_NAME(OTableEditorCtrl) // Maximum length in description field #define MAX_DESCR_LEN 256 - -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 5 -#define CONTROL_HEIGHT 20 -#define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) - - //================================================================== DBG_NAME(ClipboardInvalidator) //------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 1556161a555b..36b53f5e69b4 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -34,7 +34,6 @@ #define CONTROL_SPACING_Y 5 #define CONTROL_HEIGHT 20 #define CONTROL_WIDTH_1 140 // 100 -#define CONTROL_WIDTH_2 100 // 60 #define CONTROL_WIDTH_3 250 #define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - CONTROL_HEIGHT - 5) #define DETAILS_OPT_PAGE_WIDTH (CONTROL_WIDTH_1 + CONTROL_SPACING_X + CONTROL_WIDTH_4 + 50) diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 4fb61913e609..115b7c88cef0 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -37,8 +37,6 @@ #include <vcl/svapp.hxx> // --- -#define THISREF() static_cast< XServiceInfo* >(this) - //......................................................................... namespace dbaui { diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 160b56dd9b0b..9b4ba5b39095 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#if defined WNT #define _WIN32_WINNT 0x0500 - - - - +#endif #include "sal/config.h" diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 01fea3e3b3d7..7b61ac925f36 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -33,7 +33,6 @@ #define USER_PACKAGE_MANAGER "user" #define SHARED_PACKAGE_MANAGER "shared" -#define BUNDLED_PACKAGE_MANAGER "bundled" using namespace ::com::sun::star; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 65ca88fa73cf..b0d1350955eb 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -36,7 +36,6 @@ #define USER_PACKAGE_MANAGER OUString("user") #define SHARED_PACKAGE_MANAGER OUString("shared") -#define BUNDLED_PACKAGE_MANAGER OUString("bundled") using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index f95466664286..27ef710a112b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -54,14 +54,16 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; using ::rtl::OString; - +#if defined WNT #define SOFFICE1 "soffice.exe" -#define SOFFICE2 "soffice.bin" #define SBASE "sbase.exe" #define SCALC "scalc.exe" #define SDRAW "sdraw.exe" #define SIMPRESS "simpress.exe" #define SWRITER "swriter.exe" +#endif + +#define SOFFICE2 "soffice.bin" namespace dp_misc { namespace { diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 22e00661d625..4e7b5fb02e26 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -28,9 +28,6 @@ DBG_NAME( EditUndo ) -#define NO_UNDO 0xFFFF -#define GROUP_NOTFOUND 0xFFFF - static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara ) { EPaM aEPaM( nPara, 0 ); diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 24780099c2a9..dacf258e0e0e 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -36,9 +36,6 @@ #include "editeng/editeng.hxx" -#define ACTION_INSERTTEXT 1 -#define ACTION_INSERTPARABRK 2 - #define STYLE_PRE 101 EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index c4ab4c557a90..83dee76661e2 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -22,7 +22,6 @@ #include <svl/zforlist.hxx> #include <tools/urlobj.hxx> -#define _SVX_FLDITEM_CXX #include <unotools/localfilehelper.hxx> #include <editeng/flditem.hxx> diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 9a71ec5e140a..719d93950032 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -47,8 +47,6 @@ #define DEF_WRITER_LSPACE 500 //Standard Indentation #define DEF_DRAW_LSPACE 800 //Standard Indentation -#define NUMITEM_VERSION_01 0x01 -#define NUMITEM_VERSION_02 0x02 #define NUMITEM_VERSION_03 0x03 #define NUMITEM_VERSION_04 0x04 diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 0c943c7827b8..837c0325fba2 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -28,9 +28,6 @@ #include <editeng/svxfont.hxx> #include <editeng/escapementitem.hxx> -// Minimum: Percentage of kernel -#define MINKERNPERCENT 5 - #ifndef REDUCEDSVXFONT const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Space character static sal_Char const sDoubleSpace[] = " "; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index c87d162ad2c7..e5b95169f076 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -65,8 +65,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::linguistic2; -#define CSS com::sun::star - static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl() { uno::Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index 3a168a7445c8..b129ea16c764 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define PROPERTY_FRAME 1 #define ID_TOOLBAR 1 #define ID_GRIDWIN 2 diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index ceaf1c6e7eaf..123c146d51e0 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::rtl; -#define PROPERTY_FRAME 1 //split window size is a percent value #define WIN_MIN_HEIGHT 10 #define WIN_STEP_SIZE 5 diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 4a9f607eaec2..4330a1877923 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -72,8 +72,6 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::container; using namespace ::com::sun::star::frame; -#define PROPERTY_FRAME 1 - class BibliographyLoader : public cppu::WeakImplHelper4 < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader > { diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index b1d3e199a975..dc0737806916 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -123,10 +123,11 @@ long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len) static pid_t nChildPID = 0; #endif +#if defined WNT + #define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1) #define MY_STRING(s) (s), MY_LENGTH(s) -#if defined WNT namespace { bool extendEnvironment(boost::scoped_array< WCHAR > * environment) { diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 9dac2488fcb6..447102ac1d8b 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "nsp_func.hxx" #ifdef UNIX #include <sys/types.h> @@ -34,9 +37,6 @@ #include <dlfcn.h> #endif #include <stdarg.h> -// For vsnprintf() -#define NSP_vsnprintf vsnprintf -#include "nsp_func.hxx" #endif // End UNIX #ifdef WNT @@ -53,8 +53,6 @@ #include <stdlib.h> #include <shlobj.h> #include <objidl.h> -// For vsnprintf() -#define NSP_vsnprintf _vsnprintf #ifdef _MSC_VER #pragma warning (pop) diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index a4812ea7f1ea..a150e3160fac 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -94,9 +94,6 @@ namespace pcr #define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \ DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 ) -#define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \ - DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 ) - sal_uInt16 OPropertyInfoService::s_nCount = 0; OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; //------------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 6bb6024c0d45..61bcb4f020df 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -77,8 +77,6 @@ namespace pcr using namespace ::com::sun::star::ucb; using namespace ::comphelper; -#define THISREF() static_cast< XController* >(this) - //======================================================================== //= OPropertyBrowserController //======================================================================== diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 8a261565be49..7d4e841c7b24 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -41,7 +41,6 @@ #define PlanarConfiguration 284 #define ResolutionUnit 296 #define ColorMap 320 -#define ReferenceBlackWhite 532 // ------------- // - TIFFWriter - diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 7f38566ca714..971b0a1c297a 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <unotools/ucbstreamhelper.hxx> -#define CGM_BREAK_ACTION 0xffffffff #include <osl/endian.h> #include <vcl/virdev.hxx> #include <vcl/graph.hxx> @@ -635,6 +634,7 @@ void CGM::ImplDoClass() { #ifdef CGM_USER_BREAKPOINT #ifdef WNT +#define CGM_BREAK_ACTION 0xffffffff if ( mnActCount == CGM_BREAK_ACTION ) _asm int 0x3; #endif diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6a98e7113067..bca32e2c782d 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -143,8 +143,6 @@ using namespace beans ; using namespace drawing ; using namespace container ; -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - // static counter for OLE-Objects static sal_uInt32 nMSOleObjCntr = 0; #define MSO_OLE_Obj "MSO_OLE_Obj" diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 943bcae39ada..d15ffff5d9f0 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -59,7 +59,6 @@ #include <editeng/unoprnms.hxx> #include <editeng/editids.hrc> -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() #include <editeng/adjustitem.hxx> #include <editeng/escapementitem.hxx> #include <editeng/colritem.hxx> @@ -122,12 +121,8 @@ #define PPT_COLSCHEME (0x08000000) #define PPT_COLSCHEME_HINTERGRUND (0x08000000) #define PPT_COLSCHEME_TEXT_UND_ZEILEN (0x08000001) -#define PPT_COLSCHEME_SCHATTEN (0x08000002) #define PPT_COLSCHEME_TITELTEXT (0x08000003) -#define PPT_COLSCHEME_FUELLBEREICHE (0x08000004) -#define PPT_COLSCHEME_AKZENT (0x08000005) #define PPT_COLSCHEME_A_UND_HYPERLINK (0x08000006) -#define PPT_COLSCHEME_A_H_GESICHERT (0x08000007) #define ANSI_CHARSET 0 #define SYMBOL_CHARSET 2 diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 045f98df265f..12b9b1ed98b6 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -57,13 +57,6 @@ namespace frm using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; -#define FORWARD_TO_PEER_1( unoInterface, method, param1 ) \ - Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ - if ( xTypedPeer.is() ) \ - { \ - xTypedPeer->method( param1 ); \ - } - #define FORWARD_TO_PEER_1_RET( returnType, unoInterface, method, param1 ) \ returnType aReturn; \ Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ @@ -73,13 +66,6 @@ namespace frm } \ return aReturn; -#define FORWARD_TO_PEER_3( unoInterface, method, param1, param2, param3 ) \ - Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ - if ( xTypedPeer.is() ) \ - { \ - xTypedPeer->method( param1, param2, param3 ); \ - } - #define FORWARD_TO_PEER_3_RET( returnType, unoInterface, method, param1, param2, param3 ) \ returnType aReturn; \ Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 347e6234d07d..2ea8f2c28810 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -21,11 +21,8 @@ #include <svl/itempool.hxx> #include <editeng/eeitem.hxx> #include <editeng/editobj.hxx> -#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT #include <editeng/fhgtitem.hxx> -#define ITEMID_FONT EE_CHAR_FONTHEIGHT #include <editeng/fontitem.hxx> -#define ITEMID_LANGUAGE EE_CHAR_LANGUAGE #include <editeng/langitem.hxx> #include <vcl/svapp.hxx> #include <tools/mapunit.hxx> diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 0f3aec1b8283..af14a307fe5f 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -27,17 +27,11 @@ #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> -#define ITEMID_ADJUST EE_PARA_JUST #include <editeng/adjustitem.hxx> -#define ITEMID_WEIGHT EE_CHAR_WEIGHT #include <editeng/wghtitem.hxx> -#define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT #include <editeng/escapementitem.hxx> -#define ITEMID_LINESPACING EE_PARA_SBL #include <editeng/lspcitem.hxx> -#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT #include <editeng/fhgtitem.hxx> -#define ITEMID_FRAMEDIR EE_PARA_WRITINGDIR #include <editeng/frmdiritem.hxx> #include <editeng/scripttypeitem.hxx> diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index ef1168c2a7a8..9f76f9973d8f 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -21,7 +21,6 @@ #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <svx/svxids.hrc> -#define ITEMID_SCRIPTSPACE SID_ATTR_PARA_SCRIPTSPACE #include <editeng/scriptspaceitem.hxx> //........................................................................ diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 56f54c19d202..16a26e7492dc 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -64,31 +64,6 @@ namespace frm xTypedPeer->method( param1 ); \ } -#define FORWARD_TO_PEER_1_RET( returnType, unoInterface, method, param1 ) \ - returnType aReturn; \ - Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ - if ( xTypedPeer.is() ) \ - { \ - aReturn = xTypedPeer->method( param1 ); \ - } \ - return aReturn; - -#define FORWARD_TO_PEER_3( unoInterface, method, param1, param2, param3 ) \ - Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ - if ( xTypedPeer.is() ) \ - { \ - xTypedPeer->method( param1, param2, param3 ); \ - } - -#define FORWARD_TO_PEER_3_RET( returnType, unoInterface, method, param1, param2, param3 ) \ - returnType aReturn; \ - Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \ - if ( xTypedPeer.is() ) \ - { \ - aReturn = xTypedPeer->method( param1, param2, param3 ); \ - } \ - return aReturn; - //================================================================== // ONavigationBarControl //================================================================== diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 462d2268a99c..b36aac2d2e10 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -79,7 +79,6 @@ using namespace xforms; #define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model) #else -#define DBG_INVARIANT_TYPE(TYPE) #define DBG_INVARIANT() #endif @@ -660,8 +659,6 @@ Model::XSet_t Model::getSubmissions() // #define HANDLE_ID 0 -#define HANDLE_Instance 1 -#define HANDLE_InstanceURL 2 #define HANDLE_ForeignSchema 3 #define HANDLE_SchemaRef 4 #define HANDLE_Namespaces 5 diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 485e814bfb29..7544bd1f4e72 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -28,7 +28,6 @@ #include <tools/debug.hxx> #include <svl/solar.hrc> -#define EXPAND_PROTOCOL "vnd.sun.star.expand:" #define ENTER_MOD_METHOD() \ ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ ensureImpl() diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 62c8fab3e19e..853bde68ecc6 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -85,10 +85,7 @@ namespace framework #define SID_SFX_START 5000 #define SID_NEWDOCDIRECT (SID_SFX_START + 537) #define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) #define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) #define SFX_REFERER_USER "private:user" diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index c6689fc20c53..e26f99a55ec1 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -51,8 +51,6 @@ #define STRPOS_NOTFOUND (sal_Int32)-1 -#define SEARCHPATH_DELIMITER ';' - // Variable start/end characters #define SIGN_STARTVARIABLE "$(" #define SIGN_ENDVARIABLE ")" @@ -843,7 +841,7 @@ throw ( NoSuchElementException, RuntimeException ) } // Check preconditions to substitue path variables. - // 1. A path variable can only be substituted if it follows a SEARCHPATH_DELIMITER ';'! + // 1. A path variable can only be substituted if it follows a ';'! // 2. It's located exactly at the start of the string being substituted! if (( aFixedVarTable[ int( nIndex ) ].bAbsPath && (( nPosition == 0 ) || (( nPosition > 0 ) && ( aWorkText[nPosition-1] == ';')))) || ( !aFixedVarTable[ int( nIndex ) ].bAbsPath )) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 5b4b9b3a7b5e..692fb98c07ef 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -59,7 +59,6 @@ #define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) #define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) #define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) -#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) #define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) #define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) #define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) @@ -81,7 +80,6 @@ #define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) #define SID_FM_SCROLLBAR (SID_MORE_FMSLOTS_START + 66) #define SID_FM_SPINBUTTON (SID_MORE_FMSLOTS_START + 67) -#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) #define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) #define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) #define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) @@ -90,8 +88,6 @@ #define SID_FM_EDIT (SID_FMSLOTS_START + 7) #define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) #define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) -#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) -#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) #define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) #define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 06daa6c92989..241f9275daa4 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -139,9 +139,6 @@ namespace framework // special menu ids/command ids for dynamic popup menus #define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) #define SID_MDIWINDOWLIST (SID_SFX_START + 610) #define SID_ADDONLIST (SID_SFX_START + 1677) #define SID_HELPMENU (SID_SFX_START + 410) diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx index 6865f45929ee..9ac5f9c4d125 100644 --- a/hwpfilter/source/fontmap.cxx +++ b/hwpfilter/source/fontmap.cxx @@ -121,7 +121,6 @@ const struct FontEntry FontMapTab[] = {"\xbd\xc5\xb8\xed \xb1\xc3\xbc\xad",3, 0.97} }; -#define FONTCOUNT 4 #ifndef WIN32 #if defined(LINUX) const char* RepFontTab[] = diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index 1187e42ef4c5..396008cbe82e 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -43,24 +43,15 @@ static hchar jaso2ks(hchar hh); // ccvHH2ASC code convert HWP20 to ASC(KSSM) -#define HCA_HALFCH 0x3000 #define HCA_KSS 0x3400 #define HCA_TG 0x37C0 -#define none 0x3401 /* 2.0 null code - space */ -#define noneha 0x00A0 #define noneks 0xA1A1 -#define none1x 0x2402 #define UNI_HANGUL_FIRST 0xac00 -#define UNI_COMP_JAMO_FIRST 0x3131 -#define NUM_CHOSEONG 19 #define NUM_JOONGSEONG 21 #define NUM_JONGSEONG 28 - -#define IDX_INVALID 0xFF - /** * kssm code table matching with ks index */ @@ -547,7 +538,6 @@ static hchar cdkssm2ks_han(hchar kssm) #define IsHangul(c) ((c) & 0x8000) #define IsHanja(c) (((c) & 0x4000)==0x4000) -#define IsJapan(c) (((c) > 0x1f00 && (c) < 0x1fb7)) static const hchar jaso_hh_code[] = { diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx index 6e06f3487906..e1cf5986d8da 100644 --- a/hwpfilter/source/hgzip.cxx +++ b/hwpfilter/source/hgzip.cxx @@ -35,13 +35,6 @@ #define ALLOC(size) malloc(size) #define TRYFREE(p) {if (p) free(p);} -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define RESERVED 0xE0 /* bits 5..7: reserved */ - local int get_byte(gz_stream * s); local int destroy(gz_stream * s); local uLong getLong(gz_stream * s); diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 8cc1f485a07f..0082693f7b16 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -36,12 +36,6 @@ #include <osl/diagnose.h> -#define HWPHeadLen 128 -#define HWPSummaryLen 1008 - -#define FILESTG_SIGNATURE 0xF8995567 -#define FILESTG_SIGNATURE_NORMAL 0xF8995568 - HWPFile *HWPFile::cur_doc = 0; static int ccount = 0; static int pcount = 0; diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index f13bb0b79887..ac85e0a0bcc0 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -#define ERROR RuntimeException() - #define GREGORIAN_CROSSOVER 2299161 namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index 2f537356adf2..237047cbb2d3 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using ::rtl::OUString; -#define ERROR RuntimeException() - namespace com { namespace sun { namespace star { namespace i18n { // not used diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 587362cf2367..c02562be385c 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -55,10 +55,6 @@ typedef struct { #define NUMBER_OMIT_ONE_67 (NUMBER_OMIT_ONE_6|NUMBER_OMIT_ONE_7) #define NUMBER_OMIT_ZERO_ONE_67 ( NUMBER_OMIT_ZERO|NUMBER_OMIT_ONE_67 ) - -#define MAX_SAL_UINT32 0xFFFFFFFF -#define MAX_VALUE (MAX_SAL_UINT32 - 9) / 10 - namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal_Bool useGeresh); diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 3bcd871854a3..d585895d28f9 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -61,12 +61,10 @@ #include <indexentrysupplier_common.hxx> #include <indexentrysupplier_default.hxx> -#define CCLASS_ALL #include <characterclassificationImpl.hxx> #include <unoscripttypedetector.hxx> #include <cclass_unicode.hxx> -#define COLLATOR_ALL #include <collatorImpl.hxx> #include <chaptercollator.hxx> #include <collator_unicode.hxx> diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 32cc23797db6..2c2dd421ca4e 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -360,36 +360,14 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) { #define TITLEMASK bit(UnicodeType::TITLECASE_LETTER) -#define DIGITMASK bit(UnicodeType::DECIMAL_DIGIT_NUMBER)|\ - bit(UnicodeType::LETTER_NUMBER)|\ - bit(UnicodeType::OTHER_NUMBER) - #define ALPHAMASK UPPERMASK|LOWERMASK|TITLEMASK|\ bit(UnicodeType::MODIFIER_LETTER)|\ bit(UnicodeType::OTHER_LETTER) -#define BASEMASK DIGITMASK|ALPHAMASK|\ - bit(UnicodeType::NON_SPACING_MARK)|\ - bit(UnicodeType::ENCLOSING_MARK)|\ - bit(UnicodeType::COMBINING_SPACING_MARK) - #define SPACEMASK bit(UnicodeType::SPACE_SEPARATOR)|\ bit(UnicodeType::LINE_SEPARATOR)|\ bit(UnicodeType::PARAGRAPH_SEPARATOR) -#define PUNCTUATIONMASK bit(UnicodeType::DASH_PUNCTUATION)|\ - bit(UnicodeType::INITIAL_PUNCTUATION)|\ - bit(UnicodeType::FINAL_PUNCTUATION)|\ - bit(UnicodeType::CONNECTOR_PUNCTUATION)|\ - bit(UnicodeType::OTHER_PUNCTUATION) - -#define SYMBOLMASK bit(UnicodeType::MATH_SYMBOL)|\ - bit(UnicodeType::CURRENCY_SYMBOL)|\ - bit(UnicodeType::MODIFIER_SYMBOL)|\ - bit(UnicodeType::OTHER_SYMBOL) - -#define PRINTMASK BASEMASK|SPACEMASK|PUNCTUATIONMASK|SYMBOLMASK - #define CONTROLMASK bit(UnicodeType::CONTROL)|\ bit(UnicodeType::FORMAT)|\ bit(UnicodeType::LINE_SEPARATOR)|\ diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index cff33d1fd4cf..df13e960b772 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -27,11 +27,6 @@ #include <float.h> #include <memory> // auto_ptr<> -#undef MAXCHAR -#define MAXCHAR 127 -#undef MINCHAR -#define MINCHAR -128 - using namespace ::rtl; AstExpression::AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *pExpr2) diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index 298f1f64e0e5..6051e54fbe46 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -29,11 +29,6 @@ using ::rtl::OString; using ::rtl::OStringBuffer; -#ifdef SAL_UNX -#define SEPARATOR '/' -#else -#define SEPARATOR '\\' -#endif Options::Options(char const * progname) : m_program(progname), m_stdin(false), m_verbose(false), m_quiet(false) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index ac9f59d79986..5111de0ca94d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -41,7 +41,6 @@ #define USE_ACCESSIBILITY_FILE "useatjava.txt" #endif -#define UNO_JAVA_JFW_JREHOME "UNO_JAVA_JFW_JREHOME" namespace { static bool g_bEnabledSwitchedOn = false; diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 5a6693de7b92..79bf2d5fb7e0 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -37,9 +37,6 @@ using ::rtl::OUStringBuffer; using ::rtl::OString; using ::rtl::OUStringToOString; using ::rtl::OStringToOUString; -#define JAVASETTINGS "javasettings" -#define JAVASETTINGS_XML "javasettings.xml" -#define VENDORSETTINGS "javavendors.xml" #define UNO_JAVA_JFW_PARAMETER "UNO_JAVA_JFW_PARAMETER_" #define UNO_JAVA_JFW_JREHOME "UNO_JAVA_JFW_JREHOME" @@ -47,7 +44,6 @@ using ::rtl::OStringToOUString; #define UNO_JAVA_JFW_CLASSPATH "UNO_JAVA_JFW_CLASSPATH" #define UNO_JAVA_JFW_ENV_CLASSPATH "UNO_JAVA_JFW_ENV_CLASSPATH" #define UNO_JAVA_JFW_CLASSPATH_URLS "UNO_JAVA_JFW_CLASSPATH_URLS" -#define UNO_JAVA_JFW_PARAMETERS "UNO_JAVA_JFW_PARAMETERS" #define UNO_JAVA_JFW_VENDOR_SETTINGS "UNO_JAVA_JFW_VENDOR_SETTINGS" #define UNO_JAVA_JFW_USER_DATA "UNO_JAVA_JFW_USER_DATA" #define UNO_JAVA_JFW_SHARED_DATA "UNO_JAVA_JFW_SHARED_DATA" diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 0071f0600910..912f80b4c392 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -1183,7 +1183,6 @@ void Export::CleanValue( rtl::OString &rValue ) } } -#define TXT_STATE_NON 0x000 #define TXT_STATE_TEXT 0x001 #define TXT_STATE_MACRO 0x002 diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 4c6891148966..9e69db245a47 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -35,8 +35,6 @@ #define STATE_NON 0x0001 #define STATE_INPUT 0x0002 #define STATE_OUTPUT 0x0003 -#define STATE_PRJ 0x0004 -#define STATE_ROOT 0x0005 #define STATE_MERGESRC 0x0006 #define STATE_LANGUAGES 0x0007 diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index af9bf440f921..9acc3dbd397b 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -51,11 +51,6 @@ #include "altstrfunc.hxx" #include "simpleguesser.hxx" -#ifndef _UTF8_ -#define _UTF8_ -#endif - - using namespace std; diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index dc76fef505e2..c2eabfe9f7af 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -134,14 +134,6 @@ struct AutoFormatEntry #define AUTOFORMAT_COLOR( first, last, themed_style, color_token ) \ { first, last, themed_style, color_token, XML_TOKEN_INVALID, 0, 100, 0, false } -#define AUTOFORMAT_ACCENTS( first, themed_style ) \ - AUTOFORMAT_COLOR( first, first, themed_style, XML_accent1 ), \ - AUTOFORMAT_COLOR( first + 1, first + 1, themed_style, XML_accent2 ), \ - AUTOFORMAT_COLOR( first + 2, first + 2, themed_style, XML_accent3 ), \ - AUTOFORMAT_COLOR( first + 3, first + 3, themed_style, XML_accent4 ), \ - AUTOFORMAT_COLOR( first + 4, first + 4, themed_style, XML_accent5 ), \ - AUTOFORMAT_COLOR( first + 5, first + 5, themed_style, XML_accent6 ) - #define AUTOFORMAT_COLORMOD( first, last, themed_style, color_token, mod_token, mod_value ) \ { first, last, themed_style, color_token, mod_token, mod_value, 100, 0, false } @@ -401,7 +393,6 @@ static const AutoFormatEntry spUpDownBarEffects[] = }; #undef AUTOFORMAT_COLOR -#undef AUTOFORMAT_ACCENTS #undef AUTOFORMAT_COLORMOD #undef AUTOFORMAT_ACCENTSMOD #undef AUTOFORMAT_PATTERN diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 4f4b83d53b49..000859d9ef70 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -105,20 +105,8 @@ using ::sax_fastparser::FSHelperPtr; DBG(extern void dump_pset(Reference< XPropertySet > rXPropSet)); -#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr() - namespace oox { namespace drawingml { -#define GETA(propName) \ - GetProperty( rXPropSet, String( #propName ) ) - -#define GETAD(propName) \ - ( GetPropertyAndState( rXPropSet, rXPropState, String( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) - -#define GET(variable, propName) \ - if ( GETA(propName) ) \ - mAny >>= variable; - class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { public: diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index f4b9b11186d7..1cdf563dc956 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -25,7 +25,6 @@ # include <com/sun/star/style/LineSpacing.hpp> # include <com/sun/star/style/LineSpacingMode.hpp> # include <com/sun/star/text/WritingMode.hpp> -# define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() using ::com::sun::star::style::LineSpacing; using ::com::sun::star::text::WritingMode; #endif diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 0da4c337ef60..1237b26f17a8 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -47,8 +47,6 @@ #include <CRC32.hxx> -#define AES_CBC_BLOCK_SIZE 16 - using namespace com::sun::star; using namespace com::sun::star::io; using namespace com::sun::star::uno; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 8c714a38e1ed..db247486a29e 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -97,8 +97,6 @@ using namespace com::sun::star::packages::zip; using namespace com::sun::star::packages::manifest; using namespace com::sun::star::packages::zip::ZipConstants; -#define LOGFILE_AUTHOR "mg115289" - //=========================================================================== class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer > @@ -582,7 +580,7 @@ void ZipPackage::getZipFileContents() void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) throw( Exception, RuntimeException ) { - RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::initialize" ); + RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "{ ZipPackage::initialize" ); sal_Bool bHaveZipFile = sal_True; uno::Reference< XProgressHandler > xProgressHandler; beans::NamedValue aNamedValue; @@ -788,7 +786,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) } } - RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::initialize" ); + RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "} ZipPackage::initialize" ); } //-------------------------------------------------------- @@ -1374,7 +1372,7 @@ void SAL_CALL ZipPackage::commitChanges() static_cast < OWeakObject * > ( this ), makeAny ( aException ) ); } - RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::commitChanges" ); + RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "{ ZipPackage::commitChanges" ); // first the writeTempFile is called, if it returns a stream the stream should be written to the target // if no stream was returned, the file was written directly, nothing should be done @@ -1530,7 +1528,7 @@ void SAL_CALL ZipPackage::commitChanges() // after successful storing it can be set to false m_bMediaTypeFallbackUsed = sal_False; - RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::commitChanges" ); + RTL_LOGFILE_TRACE_AUTHOR ( "package", "mg115289", "} ZipPackage::commitChanges" ); } //-------------------------------------------------------- diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 5b2e5b556515..69c5631fa2e5 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -45,8 +45,6 @@ using namespace com::sun::star::ui::dialogs; using ::rtl::OUString; using ::rtl::OUStringBuffer; -#define MAX_PATH 1024 - /* * PaResId */ diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 25fbef6e50c0..7e3242de6cd9 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -52,41 +52,14 @@ static sal_Unicode NULL_WSTRING[1] = { 0 }; #define BLOP_OFFSET_MINOR (BLOP_OFFSET_SIZE + sizeof(sal_uInt32)) #define BLOP_OFFSET_MAJOR (BLOP_OFFSET_MINOR + sizeof(sal_uInt16)) #define BLOP_OFFSET_N_ENTRIES (BLOP_OFFSET_MAJOR + sizeof(sal_uInt16)) -#define BLOP_OFFSET_TYPE_SOURCE (BLOP_OFFSET_N_ENTRIES + sizeof(sal_uInt16)) -#define BLOP_OFFSET_TYPE_CLASS (BLOP_OFFSET_TYPE_SOURCE + sizeof(sal_uInt16)) -#define BLOP_OFFSET_THIS (BLOP_OFFSET_TYPE_CLASS + sizeof(sal_uInt16)) -#define BLOP_OFFSET_UIK (BLOP_OFFSET_THIS + sizeof(sal_uInt16)) -#define BLOP_OFFSET_DOKU (BLOP_OFFSET_UIK + sizeof(sal_uInt16)) -#define BLOP_OFFSET_FILENAME (BLOP_OFFSET_DOKU + sizeof(sal_uInt16)) #define BLOP_HEADER_N_ENTRIES 6 -#define BLOP_OFFSET_N_SUPERTYPES 0 -#define BLOP_OFFSET_SUPERTYPES (BLOP_OFFSET_N_SUPERTYPES + sizeof(sal_uInt16)) - -#define BLOP_FIELD_ENTRY_ACCESS 0 -#define BLOP_FIELD_ENTRY_NAME (BLOP_FIELD_ENTRY_ACCESS + sizeof(sal_uInt16)) -#define BLOP_FIELD_ENTRY_TYPE (BLOP_FIELD_ENTRY_NAME + sizeof(sal_uInt16)) -#define BLOP_FIELD_ENTRY_VALUE (BLOP_FIELD_ENTRY_TYPE + sizeof(sal_uInt16)) -#define BLOP_FIELD_ENTRY_DOKU (BLOP_FIELD_ENTRY_VALUE + sizeof(sal_uInt16)) -#define BLOP_FIELD_ENTRY_FILENAME (BLOP_FIELD_ENTRY_DOKU + sizeof(sal_uInt16)) #define BLOP_FIELD_N_ENTRIES 6 -#define BLOP_METHOD_SIZE 0 -#define BLOP_METHOD_MODE (BLOP_METHOD_SIZE + sizeof(sal_uInt16)) -#define BLOP_METHOD_NAME (BLOP_METHOD_MODE + sizeof(sal_uInt16)) -#define BLOP_METHOD_RETURN (BLOP_METHOD_NAME + sizeof(sal_uInt16)) -#define BLOP_METHOD_DOKU (BLOP_METHOD_RETURN + sizeof(sal_uInt16)) #define BLOP_METHOD_N_ENTRIES 5 -#define BLOP_PARAM_TYPE 0 -#define BLOP_PARAM_MODE (BLOP_PARAM_TYPE + sizeof(sal_uInt16)) -#define BLOP_PARAM_NAME (BLOP_PARAM_MODE + sizeof(sal_uInt16)) #define BLOP_PARAM_N_ENTRIES 3 -#define BLOP_REFERENCE_TYPE 0 -#define BLOP_REFERENCE_NAME (BLOP_REFERENCE_TYPE + sizeof(sal_uInt16)) -#define BLOP_REFERENCE_DOKU (BLOP_REFERENCE_NAME + sizeof(sal_uInt16)) -#define BLOP_REFERENCE_ACCESS (BLOP_REFERENCE_DOKU + sizeof(sal_uInt16)) #define BLOP_REFERENCE_N_ENTRIES 4 sal_uInt32 UINT16StringLen(const sal_uInt8* wstring) diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 437cafe348ef..973086fd7722 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// #define TRACE(x) OSL_TRACE(x) -#define TRACE(x) - #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <cppuhelper/factory.hxx> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6c923518e435..c6dc7eef15e4 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -126,7 +126,6 @@ #define MAP_LEN(x) x, sizeof(x) - 1 #define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) // page styles -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" #define SC_UNO_PAGE_LEFTBORDER "LeftBorder" #define SC_UNO_PAGE_RIGHTBORDER "RightBorder" #define SC_UNO_PAGE_BOTTBORDER "BottomBorder" @@ -142,13 +141,6 @@ #define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" #define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" #define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" #define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index aa117162f885..375722dc0851 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -28,7 +28,6 @@ #include <tools/debug.hxx> #include <svl/solar.hrc> -#define EXPAND_PROTOCOL "vnd.sun.star.expand:" #define ENTER_MOD_METHOD() \ ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ ensureImpl() diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 98cba0dc2d45..6908639f648a 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -27,10 +27,6 @@ #include "UndoEnv.hxx" #include "ReportUndoFactory.hxx" #include "ReportDefinition.hxx" -#define ITEMID_COLOR 1 -#define ITEMID_BRUSH 2 -#define ITEMID_FONT 3 -#define ITEMID_FONTHEIGHT 4 #include <svx/tbcontrl.hxx> #include "rptui_slotid.hrc" diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index efced521fd80..1aec99ae2cb6 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -104,13 +104,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII_T( name, prefix, token, type, context ) { name, sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_C( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010} diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 61a6f1741257..2d6ad039369a 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -35,8 +35,6 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/ui/ImageType.hpp> -#define ITEMID_COLOR -#define ITEMID_BRUSH #include <svx/tbcontrl.hxx> #include <svx/svxids.hrc> #include <svx/xtable.hxx> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 6a3bdca05eee..e1d18fd0af77 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -76,10 +76,6 @@ #include "metadata.hxx" #include <svl/itempool.hxx> #include <svl/itemset.hxx> - -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/xdef.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> @@ -95,12 +91,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlineit0.hxx> #include <svx/svxids.hrc> - -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/drawitem.hxx> -#define ITEMID_BRUSH SID_ATTR_BRUSH #include <editeng/brushitem.hxx> #include <sfx2/docfilt.hxx> diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 783cdb04c665..d9f12f309b65 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -88,15 +88,6 @@ namespace rptui #define DEF_INFO_2( ident, uinameres, helpid, flag1, flag2 ) \ DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 ) -#define DEF_INFO_3( ident, uinameres, helpid, flag1, flag2, flag3 ) \ - DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 ) - -#define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \ - DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 ) - -#define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \ - DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 ) - sal_uInt16 OPropertyInfoService::s_nCount = 0; OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; //------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 36b143b0182b..598d0db94ba3 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -34,10 +34,7 @@ #include <svtools/menuoptions.hxx> #include <osl/mutex.hxx> #include <svx/svxids.hrc> -#define ITEMID_COLOR 1 -#define ITEMID_BRUSH 2 #define ITEMID_FONT 3 -#define ITEMID_FONTHEIGHT 4 #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <svx/tbcontrl.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 3f6f77262ca4..360967886093 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -27,13 +27,6 @@ #define RPTUI_ID_BRUSH 8 #define RPTUI_ID_METRIC 9 -#define ITEMID_LRSPACE RPTUI_ID_LRSPACE -#define ITEMID_ULSPACE RPTUI_ID_ULSPACE -#define ITEMID_SIZE RPTUI_ID_SIZE -#define ITEMID_PAGE RPTUI_ID_PAGE -#define ITEMID_BRUSH RPTUI_ID_BRUSH - - #include "ReportController.hxx" #include "ReportDefinition.hxx" #include "CondFormat.hxx" @@ -2402,7 +2395,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ new SfxAllEnumItem(RPTUI_ID_PAGE_MODE,SVX_PAGE_MODE_STANDARD), new SfxAllEnumItem(RPTUI_ID_START,PAPER_A4), new SfxAllEnumItem(RPTUI_ID_END,PAPER_E), - new SvxBrushItem(ITEMID_BRUSH), + new SvxBrushItem(RPTUI_ID_BRUSH), new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<sal_uInt16>(eUserMetric)) }; @@ -2423,7 +2416,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ SAL_WNODEPRECATED_DECLARATIONS_POP // fill it if ( _xSection.is() ) - pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),ITEMID_BRUSH)); + pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),RPTUI_ID_BRUSH)); else { pDescriptor->Put(SvxSizeItem(RPTUI_ID_SIZE,VCLSize(getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE)))); diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 742f58b42581..8373ec602231 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -242,9 +242,6 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) //#define YYDEBUG 1 -#define TYPE_Atom 0 -#define TYPE_RESID 1 - #ifdef UNX #define YYMAXDEPTH 2000 #else diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index 167983d0c0d1..8da4100c8be7 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -53,7 +53,6 @@ #define L_pragma ('p' + ('a' << 1)) #define L_undef ('u' + ('d' << 1)) #define L_error ('e' + ('r' << 1)) /* BP 5.3.92, #error */ -#define MAXLINE 80 /* BP 5.3.92, #error */ #if OSL_DEBUG_LEVEL > 1 #define L_debug ('d' + ('b' << 1)) /* #debug */ #define L_nodebug ('n' + ('d' << 1)) /* #nodebug */ diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index e7e78b45d3aa..37b2c115d903 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -94,16 +94,8 @@ register int op; { return (op >= FIRST_BINOP && op <= LAST_BINOP); } - -FILE_LOCAL int -isunary(op) -register int op; -{ - return (op >= FIRST_UNOP && op <= LAST_UNOP); -} #else #define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) -#define isunary(op) (op >= FIRST_UNOP && op <= LAST_UNOP) #endif /* diff --git a/sal/osl/unx/diagnose.cxx b/sal/osl/unx/diagnose.cxx index b712576daf2e..99cb9e94e639 100644 --- a/sal/osl/unx/diagnose.cxx +++ b/sal/osl/unx/diagnose.cxx @@ -38,15 +38,8 @@ #endif /* HAVE_DLFCN_H */ -#ifndef INCLUDED_PTHREAD_H #include <pthread.h> -#define INCLUDED_PTHREAD_H -#endif - -#ifndef INCLUDED_STDDEF_H #include <stddef.h> -#define INCLUDED_STDDEF_H -#endif /************************************************************************/ /* Internal data structures and functions */ diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 008c61e67f2c..c6f55dc16c02 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -55,10 +55,8 @@ #ifdef DEBUG_OSL_FILE # define OSL_FILE_TRACE osl_trace -# define PERROR( a, b ) perror( a ); fprintf( stderr, b ) #else # define OSL_FILE_TRACE(fmt, ...) -# define PERROR( a, b ) #endif diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c index f0720ec3fa80..f0f91da98edc 100644 --- a/sal/osl/unx/pipe.c +++ b/sal/osl/unx/pipe.c @@ -94,7 +94,6 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType) /* macros */ -#define ERROR_TO_NATIVE(x) osl_NativeFromPipeError(x) #define ERROR_FROM_NATIVE(y) osl_PipeErrorFromNative(y) diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c index 4af99904c43d..d27dda765463 100644 --- a/sal/osl/unx/profile.c +++ b/sal/osl/unx/profile.c @@ -35,13 +35,6 @@ #define ENTRIES_INI 5 #define ENTRIES_ADD 3 - -#define STR_INI_EXTENSION "rc" -#define STR_INI_METAHOME "?~" -#define STR_INI_METASYS "?$" -#define STR_INI_METACFG "?^" -#define STR_INI_METAINS "?#" - #define STR_INI_BOOLYES "yes" #define STR_INI_BOOLON "on" #define STR_INI_BOOLONE "1" @@ -53,22 +46,8 @@ #define FLG_AUTOOPEN 0x0100 #define FLG_MODIFIED 0x0200 -#define SVERSION_LOCATION STR_INI_METACFG -#define SVERSION_FALLBACK STR_INI_METASYS -#define SVERSION_NAME "sversion" -#define SVERSION_SECTION "Versions" -#define SVERSION_SOFFICE "StarOffice" -#define SVERSION_PROFILE "sofficerc" -#define SVERSION_OPTION "userid:" -#define SVERSION_DIRS { "bin", "program" } -#define SVERSION_USER "user" - #define DEFAULT_PMODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) -#define _BUILD_STR_(n) # n -#define BUILD_STR(n) _BUILD_STR_(n) - - /*#define DEBUG_OSL_PROFILE*/ /*#define TRACE_OSL_PROFILE*/ diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index a9f3fc07192f..3ed3dc86f212 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -153,7 +153,6 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType) */ /* macros */ -#define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y) #define PROTOCOL_TO_NATIVE(x) ProtocolMap[x] @@ -236,8 +235,6 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType) */ /* macros */ #define OPTION_TO_NATIVE(x) OptionMap[x] -#define OPTION_FROM_NATIVE(y) osl_SocketOptionFromNative(y) - /*****************************************************************************/ /* enum oslSocketOptionLevel */ @@ -267,7 +264,6 @@ static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeTyp */ /* macros */ #define OPTION_LEVEL_TO_NATIVE(x) OptionLevelMap[x] -#define OPTION_LEVEL_FROM_NATIVE(y) osl_SocketOptionLevelFromNative(y) /*****************************************************************************/ /* enum oslSocketMsgFlag */ @@ -301,8 +297,6 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType) /* macros */ #define MSG_FLAG_TO_NATIVE(x) SocketMsgFlagMap[x] -#define MSG_FLAG_FROM_NATIVE(y) osl_SocketMsgFlagFromNative(y) - /*****************************************************************************/ /* enum oslSocketDirection */ @@ -334,7 +328,6 @@ static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType) /* macros */ #define DIRECTION_TO_NATIVE(x) SocketDirection[x] -#define DIRECTION_FROM_NATIVE(y) osl_SocketDirectionFromNative(y) /*****************************************************************************/ /* enum oslSocketError */ @@ -406,7 +399,6 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType) } /* macros */ -#define ERROR_TO_NATIVE(x) osl_NativeFromSocketError(x) #define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y) /*****************************************************************************/ @@ -797,7 +789,6 @@ static struct hostent* _osl_gethostbyname_r ( static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName) { -# define DOMAINNAME_LENGTH 512 struct hostent aHostByName; struct hostent *pHostByName; sal_Char pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ]; diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 094cb2d6cb9a..fae1280c3e69 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -47,7 +47,6 @@ static const sal_Char* gpsPC = "pc"; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; -#define XML_NULLDATE "NullDate" /** convert string to measure using optional min and max values*/ bool Converter::convertMeasure( sal_Int32& rValue, diff --git a/sc/source/core/data/bigrange.cxx b/sc/source/core/data/bigrange.cxx index a48e02052b85..089e801b545e 100644 --- a/sc/source/core/data/bigrange.cxx +++ b/sc/source/core/data/bigrange.cxx @@ -7,9 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SC_BIGRANGE_CXX__ -#define __SC_BIGRANGE_CXX__ - #include "bigrange.hxx" #include "document.hxx" @@ -25,6 +22,4 @@ bool ScBigAddress::IsValid( const ScDocument* pDoc ) const ; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 8680726ecdf3..bef099b008c7 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -58,8 +58,6 @@ using ::rtl::OUStringBuffer; using ::rtl::OUStringHash; using ::std::auto_ptr; -#define SC_DPSAVEMODE_NO 0 -#define SC_DPSAVEMODE_YES 1 #define SC_DPSAVEMODE_DONTKNOW 2 static void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 70901270e433..b333155fb1b4 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -34,8 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; using ::rtl::OUString; - // STATIC DATA ----------------------------------------------------------- -#define SC_VERSION ((sal_uInt16)304) //======================================================================== // ScAppOptions - Applikations-Optionen diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 65ea618e8119..24a7b6b4016f 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -38,8 +38,6 @@ using ::rtl::OUString; //------------------------------------------------------------------------ -#define SC_VERSION ((sal_uInt16)251) - TYPEINIT1(ScTpCalcItem, SfxPoolItem); //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 9e535d25a757..eb12f797abda 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -33,12 +33,6 @@ using namespace com::sun::star::uno; using ::rtl::OUString; -//------------------------------------------------------------------ - -// version from which on the item is compatible -#define SC_VERSION ((sal_uInt16)351) - - //======================================================================== // ScInputOptions - input options //======================================================================== diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 202100ef344f..bb87e617e69c 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -40,7 +40,6 @@ using namespace formula; // STATIC DATA ----------------------------------------------------------- -#define SCdEpsilon 1.0E-7 #define MAX_ANZ_DOUBLE_FOR_SORT 100000 const double ScInterpreter::fMaxGammaArgument = 171.624376956302; // found experimental diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 6f0093d57e97..af2fb6e1fdee 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define SC_RANGELST_CXX //fuer ICC - #include <stdlib.h> // qsort #include <comphelper/string.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 69b8cacabd8d..114b7ab18563 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -40,9 +40,6 @@ using ::rtl::OUString; TYPEINIT1(ScTpViewItem, SfxPoolItem); -#define SC_VERSION ((sal_uInt16)302) - - //======================================================================== // class ScGridOptions //======================================================================== diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 5c11ee546687..d4bdc8643a11 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -47,7 +47,6 @@ const sal_uInt8 A = EXC_TOKCLASS_ARR; // abbreviations for parameter infos #define RO { EXC_PARAM_REGULAR, EXC_PARAMCONV_ORG, false } -#define RV { EXC_PARAM_REGULAR, EXC_PARAMCONV_VAL, false } #define RA { EXC_PARAM_REGULAR, EXC_PARAMCONV_ARR, false } #define RR { EXC_PARAM_REGULAR, EXC_PARAMCONV_RPT, false } #define RX { EXC_PARAM_REGULAR, EXC_PARAMCONV_RPX, false } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 83ea5bfd9cb4..5510241440ae 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -21,7 +21,6 @@ #include <boost/shared_ptr.hpp> #include <comphelper/string.hxx> -#define SC_HTMLPARS_CXX #include "scitems.hxx" #include <editeng/eeitem.hxx> diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 3adbfdbd3ac4..1a12a2e659cc 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -265,7 +265,6 @@ const sal_uInt8 A = BIFF_TOKCLASS_ARR; // abbreviations for parameter infos #define RO { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ORG, false } -#define RV { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_VAL, false } #define RA { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ARR, false } #define RR { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPT, false } #define RX { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPX, false } diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index d48984391808..01f0ba78bf8e 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -22,8 +22,6 @@ #include "scitems.hxx" #include <editeng/memberids.hrc> -#define ITEMID_DBTYPE 0 - #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/slstitm.hxx> @@ -94,7 +92,6 @@ #define SvxDrawToolItem SfxAllEnumItem #define SvxDrawAlignItem SfxAllEnumItem -#define SvxChooseControlItem SfxEnumItem #define avmedia_MediaItem ::avmedia::MediaItem #if defined(IOS) diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index eb36cc92780e..89617f743608 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star; // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 -#define DP_TYPELIST_SQL 2 #define DP_TYPELIST_SQLNAT 3 //------------------------------------------------------------------------- diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index d4744c454ef1..78e19fd81d4d 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -39,7 +39,6 @@ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D #define ABS_DREF3D ABS_DREF | SCA_TAB_3D //---------------------------------------------------------------------------- diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 30997924df94..62dbcf369043 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -28,13 +28,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> -// Pixelabstand zum Schliessen von Freihand-Zeichnungen -#ifndef CLOSE_PIXDIST -#define CLOSE_PIXDIST 5 -#endif - -//------------------------------------------------------------------------ - /************************************************************************* |* |* Konstruktor diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index b7994fb5c4c4..55bf00d1ca8b 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -17,63 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// TOOLS -#define _BIGINT_HXX -#define _CACHESTR_HXX -#define _SVMEMPOOL_HXX -#define _CACHESTR_HXX -#define _SV_MULTISEL_HXX - -//SV -#define _CONFIG_HXX -#define _CURSOR_HXX -#define _HELP_HXX -#define _SPIN_HXX -#define _STATUS_HXX -#define _SOUND_HXX - -//svtools -#define _SCRWIN_HXX -#define _RULER_HXX -#define _STDMENU_HXX -#define _CTRLTOOL_HXX - -//SVTOOLS -#define _FILTER_HXX -#define _SVTABBX_HXX - -//sfxcore.hxx -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -#define _SFXDOCINF_HXX - -// SFX -#define _SFXMSGPOOL_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - -//sfxdlg.hxx -#define _SFX_DINFDLG_HXX -#define _SFX_MGETEMPL_HXX -#define _SFX_TPLPITEM_HXX -#define _NEWSTYLE_HXX - -//sfxitems.hxx -#define _SFXFLAGITEM_HXX -#define _SFXPTITEM_HXX -#define _SFXRECTITEM_HXX -#define _SFXITEMITER_HXX -#define _SFX_WHITER_HXX -#define _SFXPOOLCACH_HXX -#define _SFXRNGITEM_HXX - -//------------------------------------------------------------------------ - #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <svx/svdetc.hxx> diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index edc9445f7dd4..5364d5cd1cfe 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -37,8 +37,6 @@ #define ScGraphicShell #include "scslots.hxx" -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - class ScExternalToolEdit : public ExternalToolEdit { FmFormView* m_pView; diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 2a4b9d744165..79185a965e31 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -35,9 +35,6 @@ #define ScMediaShell #include "scslots.hxx" -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() - - SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) ) { SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR) ); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 84155409ec26..9345776aabe3 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -46,11 +46,8 @@ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute(); - #define RD_SPECIAL_NONE 0 #define RD_SPECIAL_CONTENT 1 #define RD_SPECIAL_VISCONTENT 2 diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 752bf7089a4e..58012cfc7862 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -35,13 +35,8 @@ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D #define ABS_DREF3D ABS_DREF | SCA_TAB_3D - - -#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute(); - //============================================================================ // class ScHighlightChgDlg diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 60bc8eaf1c7b..4468198a75ae 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -35,14 +35,8 @@ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -//---------------------------------------------------------------------------- - -#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() -#define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() - //============================================================================ // class ScSimpleRefDlg diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 67758d5d8801..3270ad9e23e1 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -47,7 +47,6 @@ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D #define ABS_DREF3D ABS_DREF | SCA_TAB_3D ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 85e8c44f44eb..d7506379aea1 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -61,7 +61,6 @@ using ::rtl::OUString; #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString( nId ) ).Execute() -#define SWAP(x1,x2) { int n=x1; x1=x2; x2=n; } // globale Funktionen (->am Ende der Datei): diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 0ae46f3a905f..be48bf0464e2 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _TPHFEDIT_CXX #include "scitems.hxx" #include <editeng/eeitem.hxx> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index bc33f4f28630..b0e20cfeaf5a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -94,7 +94,6 @@ #include "scresid.hxx" using namespace com::sun::star; -#define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ? // #i111553# provides the name of the VBA constant for this document type (e.g. 'ThisExcelDoc' for Calc) #define SC_UNO_VBAGLOBNAME "VBAGlobalConstantName" diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index fb90a9659411..3a826749a48c 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -40,10 +40,6 @@ // (selection left/right must be first because the continuous lines // are partly overwritten later) -#define SC_HDRPAINT_SEL_RIGHT 0 -#define SC_HDRPAINT_SEL_LEFT 1 -#define SC_HDRPAINT_TOP 2 -#define SC_HDRPAINT_SEL_TOP 3 #define SC_HDRPAINT_SEL_BOTTOM 4 #define SC_HDRPAINT_BOTTOM 5 #define SC_HDRPAINT_TEXT 6 diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 071d8de31eba..4417e9467e42 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -17,80 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _BIGINT_HXX -#define _CACHESTR_HXX -#define _CONFIG_HXX -#define _CURSOR_HXX -#define _CTRLTOOL_HXX -#define _MACRODLG_HXX -#define _OUTLINER_HXX -#define _PASSWD_HXX -#define _PRNDLG_HXX -#define _RULER_HXX -#define _SCRWIN_HXX -#define _STDMENU_HXX -#define _TABBAR_HXX - -//sfx -#define _SFXCTRLITEM -#define _SFXDISPATCH_HXX -#define _SFXIMGMGR_HXX -#define _SFX_MINFITEM_HXX - -//sfxcore.hxx -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -#define _SFXDOCINF_HXX - -// SFX -#define _SFXMSGPOOL_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - -//sfxdlg.hxx -#define _SFX_DINFDLG_HXX -#define _SFX_MGETEMPL_HXX -#define _SFX_TPLPITEM_HXX -#define _NEWSTYLE_HXX - -//sfxitems.hxx -#define _SFXFLAGITEM_HXX -#define _SFXPTITEM_HXX -#define _SFXRECTITEM_HXX -#define _SFXITEMITER_HXX -#define _SFX_WHITER_HXX -#define _SFXPOOLCACH_HXX -#define _SFXRNGITEM_HXX - -#define _SFXBASIC_HXX -#define _SFX_TEMPLDLG_HXX -#define _SFXIMGMGR_HXX -#define _SFXMNUITEM_HXX -#define _SFXMNUMGR_HXX -#define _SFXSTBITEM_HXX -#define _SFXTBXCTRL_HXX -#define _SFXREQUEST_HXX -#define _SFXOBJFACE_HXX -#define _SFXMSGPOOL_HXX -#define _SFXMSG_HXX -#define _SFX_PRNMON_HXX - -#define _SVTABBX_HXX - -#define _SVX_HYPHEN_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_THESDLG_HXX - #include <sfx2/childwin.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index e30ba687a60f..c8e408418605 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -17,69 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// TOOLS -#define _BIGINT_HXX -#define _CACHESTR_HXX -#define _SVMEMPOOL_HXX -#define _CACHESTR_HXX - -//SV -#define _CONFIG_HXX -#define _CURSOR_HXX -#define _HELP_HXX -#define _SPIN_HXX -#define _SOUND_HXX - -//svtools -#define _SCRWIN_HXX -#define _RULER_HXX -#define _STDMENU_HXX -#define _CTRLTOOL_HXX - -//SVTOOLS -#define _FILTER_HXX -#define _SVTABBX_HXX - -//sfxcore.hxx -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -#define _SFXDOCINF_HXX - -// SFX -#define _SFXMSGPOOL_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - -//sfxdlg.hxx -#define _SFX_DINFDLG_HXX -#define _SFX_MGETEMPL_HXX -#define _SFX_TPLPITEM_HXX -#define _NEWSTYLE_HXX -#define _SFXDOCKWIN_HXX - -//sfxitems.hxx -#define _SFXFLAGITEM_HXX -#define _SFXPTITEM_HXX -#define _SFXRECTITEM_HXX -#define _SFXITEMITER_HXX -#define _SFX_WHITER_HXX -#define _SFXPOOLCACH_HXX -#define _SFXRNGITEM_HXX - -#define _SVX_HYPHEN_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_THESDLG_HXX - #include <svx/svdmodel.hxx> #include <svl/smplhint.hxx> diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index d991b12e4ded..6f44a531248f 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -31,7 +31,9 @@ #include "tabprotection.hxx" #include "markdata.hxx" +#if defined WNT #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65 +#endif extern sal_uInt16 nScFillModeMouseModifier; // global.cxx diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 52ef47bd0fb6..0f94f9bed8bd 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -27,8 +27,6 @@ ////////////////////// Umsetzen der Standard-Defines ////////////////////// -#define _SVDPAGE_HXX // SdrPage - #ifdef _SDR_NOGRAFOBJ #undef _SDR_NOGRAFOBJ #define _SVDOGRAF_HXX diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 28481eefaccf..ac26088950e1 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -17,50 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _BIGINT_HXX -#define _CACHESTR_HXX -#define _CONFIG_HXX -#define _CURSOR_HXX -#define _CTRLTOOL_HXX -#define _MACRODLG_HXX #define _OUTLINER_HXX -#define _RULER_HXX -#define _SCRWIN_HXX -#define _STDCTRL_HXX -#define _STDMENU_HXX -#define _TABBAR_HXX -#define _VALUESET_HXX - -#define _PASSWD_HXX - -#define _SFX_PRNMON_HXX -#define _SFX_RESMGR_HXX -#define _SFX_TEMPLDLG_HXX -#define _SFXBASIC_HXX -#define _SFXCTRLITEM -#define _SFXMNUITEM_HXX -#define _SFXMNUMGR_HXX -#define _SFXMSGPOOL_HXX -#define _SFX_MINFITEM_HXX -#define _SFXOBJFACE_HXX -#define _SFXSTBITEM_HXX -#define _SFXTBXCTRL_HXX - -#define _SVTABBX_HXX -#define _SVTREEBOX_HXX -#define _SVTREELIST_HXX - -#define _SVX_HYPHEN_HXX -#define _SVX_LAYCTRL_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SELCTRL_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_STDDLG_HXX -#define _SVX_THESDLG_HXX #include "scitems.hxx" #include <svx/svdetc.hxx> diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 8ec1bab06428..378db18cb192 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -93,7 +93,6 @@ ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : //------------------------------------------------------------------ #define UNIQUE sal_False // function name does not exist in Calc -#define DOUBLE sal_True // function name exists in Calc #define STDPAR sal_False // all parameters are described #define INTPAR sal_True // first parameter is internal diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 8d6bf00e81f0..2d7a8c8ca7f8 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -100,10 +100,8 @@ ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : //------------------------------------------------------------------ #define UNIQUE sal_False // function name does not exist in Calc -#define DOUBLE sal_True // function name exists in Calc #define STDPAR sal_False // all parameters are described -#define INTPAR sal_True // first parameter is internal #define FUNCDATA( FuncName, ParamCount, Category, Double, IntPar ) \ { "get" #FuncName, PRICING_FUNCNAME_##FuncName, PRICING_FUNCDESC_##FuncName, PRICING_DEFFUNCNAME_##FuncName, ParamCount, Category, Double, IntPar } diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 0784fc962bd7..a20b24b84d96 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -27,7 +27,9 @@ ************************************************************************/ #undef LANGUAGE_NONE +#if defined SAL_W32 #define WINAPI __stdcall +#endif #define LoadInverseLib FALSE #define LoadLanguageLib FALSE #ifdef SYSTEM_LPSOLVE diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 13677d1f24be..6aebc6d9269d 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -23,8 +23,6 @@ #include <rtl/ustrbuf.hxx> #include "URIHelper.hxx" -#define PRTSTR(x) ::rtl::OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer - namespace func_provider { diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 69704ddfd9b0..446be74e343f 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -86,30 +86,6 @@ #include <svl/lckbitem.hxx> - -#define CharSetItem SfxUInt16Item -#define FontFamilyItem SfxUInt16Item -#define FontPitchItem SfxUInt16Item -#define FontAlignItem SfxUInt16Item -#define FontWeightItem SfxUInt16Item -#define FontUnderlineItem SfxUInt16Item -#define FontStrikeoutItem SfxUInt16Item -#define FontItalicItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -#define SvxLineSpaceItem SfxUInt16Item -#define SvxInterLineSpaceItem SfxUInt16Item -#define SvxBreakItem SfxUInt16Item -#define BrushStyleItem SfxUInt16Item -#define SvxNumTypeItem SfxUInt16Item -#define SvxShadowLocationItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -#define SvxDrawToolEnumItem SfxUInt16Item -#define SvxChooseControlItem SfxEnumItem -#define SvxDrawToolItem SfxUInt16Item -#define SvxCellHorJustifyEnumItem SfxUInt16Item -#define SvxCellVerJustifyEnumItem SfxUInt16Item -#define SvxCellOrientationEnumItem SfxUInt16Item -#define SvxLanguage SfxUInt16Item #define avmedia_MediaItem ::avmedia::MediaItem #include <sfx2/tplpitem.hxx> #include <svl/ptitem.hxx> diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 24a3d6d9bdc8..6ebd25fe4b54 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -31,15 +31,10 @@ #include "sdcgmfilter.hxx" #define CGM_IMPORT_CGM 0x00000001 -#define CGM_IMPORT_IM 0x00000002 #define CGM_EXPORT_IMPRESS 0x00000100 -#define CGM_EXPORT_META 0x00000200 -#define CGM_EXPORT_COMMENT 0x00000400 -#define CGM_NO_PAD_BYTE 0x00010000 #define CGM_BIG_ENDIAN 0x00020000 -#define CGM_LITTLE_ENDIAN 0x00040000 using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 5dfa305ebb29..aa10f3325868 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1355,10 +1355,7 @@ void PPTWriter::ImplWriteOLE( ) sal_Bool PPTWriter::ImplWriteAtomEnding() { -#define EPP_LastViewTypeNone 0 #define EPP_LastViewTypeSlideView 1 -#define EPP_LastViewTypeOutlineView 2 -#define EPP_LastViewTypeNotes 3 sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell(); sal_uInt32 nPersistEntrys = 0; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f543cdee6687..4965de7ba382 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -88,7 +88,6 @@ using namespace ::com::sun::star; //////////////////////////////////////////////////////////////////////////////////////////////////// /* Font Families */ -#define FF_DONTCARE 0x00 #define FF_ROMAN 0x10 #define FF_SWISS 0x20 #define FF_MODERN 0x30 @@ -99,7 +98,6 @@ using namespace ::com::sun::star; #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 -#define VARIABLE_PITCH 0x02 // --------------------------------------------------------------------------------------------- diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 85c3725d899b..7260f27467db 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -405,22 +405,6 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert pFS->endElementNS( XML_p, XML_bg ); } -#define MINIMAL_SPTREE "<p:spTree>\ - <p:nvGrpSpPr>\ - <p:cNvPr id=\"1\" name=\"\"/>\ - <p:cNvGrpSpPr/>\ - <p:nvPr/>\ - </p:nvGrpSpPr>\ - <p:grpSpPr>\ - <a:xfrm>\ - <a:off x=\"0\" y=\"0\"/>\ - <a:ext cx=\"0\" cy=\"0\"/>\ - <a:chOff x=\"0\" y=\"0\"/>\ - <a:chExt cx=\"0\" cy=\"0\"/>\ - </a:xfrm>\ - </p:grpSpPr>\ - </p:spTree>" - #define MAIN_GROUP \ "<p:nvGrpSpPr>\ <p:cNvPr id=\"1\" name=\"\"/>\ diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 034583e175fd..706b199745bb 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -91,12 +91,9 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -#define KEY_QUALITY "JPG-EXPORT-QUALITY" - // get parameter from Itemset #define RESTOHTML( res ) StringToHTMLString(String(SdResId(res))) -#define S2H( str ) StringToHTMLString( str ) const char *pButtonNames[] = { diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 25d39955425e..bc175b42711b 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -56,7 +56,6 @@ #include "sddll.hxx" #include "sdmod.hxx" -#define _SD_DIACTRL_CXX #include "diactrl.hxx" #include "gluectrl.hxx" #include "tbx_ww.hxx" diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 98eebefd9ee9..2587f2a41944 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -44,9 +44,6 @@ namespace sd { -#define SWITCH_TIMEOUT 20 - - /** * default constructor */ diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index cbad03b29d65..5040a9614d41 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -31,8 +31,6 @@ namespace sd { //===== LeftImpressPaneShell ================================================== -#define ShellClass LeftImpressPaneShell - SFX_SLOTMAP(LeftImpressPaneShell) { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } @@ -66,9 +64,6 @@ LeftImpressPaneShell::~LeftImpressPaneShell (void) //===== LeftDrawPaneShell ===================================================== -#undef ShellClass -#define ShellClass LeftDrawPaneShell - SFX_SLOTMAP(LeftDrawPaneShell) { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } @@ -102,9 +97,6 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void) //===== ToolPanelPaneShell ======================================================== -#undef ShellClass -#define ShellClass ToolPanelPaneShell - SFX_SLOTMAP( ToolPanelPaneShell ) { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 2694218cdf2d..bc9b508feed2 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -27,10 +27,6 @@ #include "com/sun/star/deployment/DependencyException.hpp" #include "com/sun/star/deployment/DeploymentException.hpp" -#define USER_PACKAGE_MANAGER "user" -#define SHARED_PACKAGE_MANAGER "shared" -#define BUNDLED_PACKAGE_MANAGER "bundled" - using namespace ::com::sun::star; namespace sd { diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 0b2213cf2521..069dd4213b3a 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -24,7 +24,6 @@ #include "sdattr.hxx" #include "strings.hrc" -#define _SD_DIACTRL_CXX #include "diactrl.hxx" #include "sdresid.hxx" diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index efe9a3f29f09..531ecda3225f 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -35,9 +35,6 @@ namespace sd { -#define BITMAP_WIDTH 32 -#define BITMAP_HEIGHT 12 - TYPEINIT1( FuLineEnd, FuPoor ); diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index a6c11e5215b3..167f2f752122 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -20,8 +20,6 @@ #include "ViewTabBar.hxx" -#define USE_TAB_CONTROL - #include "ViewShell.hxx" #include "ViewShellBase.hxx" #include "DrawViewShell.hxx" diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index f7fcb2a5df9f..a732e475ca5e 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -45,9 +45,6 @@ namespace sd { -#define TABCONTROL_INITIAL_SIZE 500 - - sal_Bool DrawViewShell::GotoBookmark(const String& rBookmark) { sal_Bool bRet = sal_False; diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index c64484fa5dd3..245d687fb5df 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -53,10 +53,6 @@ using namespace ::com::sun::star; namespace sd { -#define ATTR_MISSING 0 // Attribut nicht verfuegbar -#define ATTR_MIXED 1 // Attribut uneindeutig (bei Mehrfachselektion) -#define ATTR_SET 2 // Attribut eindeutig - #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() /** diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 9cfcea5dc629..5e926d349435 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -45,8 +45,6 @@ namespace sd { -#define SWITCH_TIMEOUT 20 - // ----------------------------------------- // - SdTabControl::SdPageObjsTransferable - // ----------------------------------------- diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 16ae3c4717ca..1c72b4476201 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -71,13 +71,10 @@ #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> -#define ITEMID_SEARCH SID_SEARCH_ITEM - #include <svl/srchitem.hxx> #include <osl/socket.hxx> #define SFX_TYPEMAP -#define Selection #include "sfxslots.hxx" using namespace ::com::sun::star; diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index d726fd60150b..a3a23f5122e9 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SDINTERN_HXX - #include <stdio.h> #include <svtools/ehdl.hxx> #include <svl/itempool.hxx> diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 3c1dc236a823..686ca3c28092 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -47,7 +47,6 @@ #define DDELINK_ERROR_APP 1 #define DDELINK_ERROR_DATA 2 -#define DDELINK_ERROR_LINK 3 using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index df962be1b124..8f2378bf4a4f 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -141,7 +141,6 @@ using namespace ::comphelper; #define TBI_SEARCHDIALOG 1008 #define TBI_SOURCEVIEW 1009 #define TBI_SELECTIONMODE 1010 -#define TBI_ONSTARTUP 1011 #define CONFIGNAME_HELPWIN "OfficeHelp" #define CONFIGNAME_INDEXWIN "OfficeHelpIndex" diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 09345fe94626..9a49a1aa20c4 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -72,7 +72,6 @@ struct SfxProgress_Impl //======================================================================== -#define Progress #include "sfxslots.hxx" //======================================================================== diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 95ee15d4a524..00d48491362e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -958,10 +958,6 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) //-------------------------------------------------------------------- -#ifndef SFX_USE_BINDINGS -#define SFX_USE_BINDINGS 0x8000 -#endif - const SfxSlot* SfxDispatcher::GetSlot( const String& rCommand ) { // Count the number of Shells on the linked Dispatcher diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index b9f04fa1fe44..8faa60a8cbc7 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -103,7 +103,6 @@ using ::std::advance; #define TITLE "Title" #define TARGET_URL "TargetURL" -#define TARGET_DIR_URL "TargetDirURL" #define COMMAND_TRANSFER "transfer" //======================================================================== diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index b067332248da..9d2b6b2d4d3d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -96,7 +96,6 @@ #define TARGET_DIR_URL "TargetDirURL" #define COMMAND_DELETE "delete" -#define COMMAND_TRANSFER "transfer" #define STANDARD_FOLDER "standard" diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index d0f02acd2450..e1834b3c809c 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -105,7 +105,6 @@ #define STATUS_SAVE 1 #define STATUS_SAVEAS 2 #define STATUS_SAVEAS_STANDARDNAME 3 -#define STATUS_SAVEACOPY 4 const char aFilterNameString[] = "FilterName"; const char aFilterOptionsString[] = "FilterOptions"; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index f6c84109ade5..e0de9eec5799 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -39,12 +39,6 @@ #include <sfx2/printer.hxx> #include <vcl/waitobj.hxx> -// Draw modes -#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) -#define OUTPUT_DRAWMODE_GRAYSCALE (DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT) -#define OUTPUT_DRAWMODE_BLACKWHITE (DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT) -#define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) - //======================================================================== #define MORE_BTN(x) pMoreBt->x diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 4614bb2372ec..13fe2b654166 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -81,13 +81,8 @@ #define OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper #define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper -#define XCLOSELISTENER ::com::sun::star::util::XCloseListener #define FRAMEACTIONEVENT ::com::sun::star::frame::FrameActionEvent #define EVENTOBJECT ::com::sun::star::lang::EventObject -#define OTYPECOLLECTION ::cppu::OTypeCollection -#define OIMPLEMENTATIONID ::cppu::OImplementationId -#define XCOMPONENT ::com::sun::star::lang::XComponent -#define XINTERFACE ::com::sun::star::uno::XInterface #define XKEYHANDLER ::com::sun::star::awt::XKeyHandler #define TIMEOUT_START_RESCHEDULE 10L /* 10th s */ diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 34aa138f10a7..b0cc1778be32 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -33,8 +33,11 @@ #include "gconfaccess.hxx" #define GCONF_PROXY_MODE_KEY "/system/proxy/mode" + +#ifdef ENABLE_LOCKDOWN #define GCONF_AUTO_SAVE_KEY "/apps/openoffice/auto_save" #define GCONF_USER_AUTO_SAVE_KEY "/apps/openoffice/user_auto_save" +#endif namespace gconfaccess { diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 83868cdd763e..707dbe5a403c 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -42,8 +42,6 @@ typedef unsigned short WORD; #define SUBLANG_SPANISH 0x01 #endif -#define VCL_NEED_BASETSD - #include "cmdline.hxx" #include <comphelper/string.hxx> diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 299fbe26ed77..5d44f1f8a437 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -339,8 +339,6 @@ struct hash * * The changes from the original are mostly cosmetic */ -#define hashsize(n) (1<<(n)) -#define hashmask(n) (hashsize(n)-1) #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c index 3abab5eff4b5..f8157a87db7f 100644 --- a/soltools/cpp/_lex.c +++ b/soltools/cpp/_lex.c @@ -51,11 +51,9 @@ #define GETACT(st) ((st>>7)&0x1ff) /* character classes */ -#define C_WS 1 -#define C_ALPH 2 -#define C_NUM 3 -#define C_EOF 4 -#define C_XX 5 +#define C_ALPH 1 +#define C_NUM 2 +#define C_XX 3 enum state { diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 4dda8717978e..1561204e1e3e 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -31,8 +31,6 @@ #include "stgdir.hxx" #include "stgio.hxx" -#define __HUGE - ///////////////////////////// class StgFAT /////////////////////////////// // The FAT class performs FAT operations on an underlying storage stream. diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 124dd255dd09..b03c9629036c 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -310,7 +310,6 @@ TYPEINIT1( UCBStorage, BaseStorage ); #define COMMIT_RESULT_SUCCESS 2 #define min( x, y ) (( x < y ) ? x : y) -#define max( x, y ) (( x > y ) ? x : y) sal_Int32 GetFormatId_Impl( SvGlobalName aName ) { diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index f9f7351e68e9..29c0328239a4 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - -#define SMDLL 1 #include "tools/rcid.h" #include <comphelper/string.hxx> #include <svl/eitem.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 4e4172349e13..9d9e1641cba3 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -25,11 +25,6 @@ #include "starmath.hrc" -#define ITEMID_FONT 1 -#define ITEMID_FONTHEIGHT 2 -#define ITEMID_LRSPACE 3 -#define ITEMID_WEIGHT 4 - #include <vcl/menu.hxx> #include <editeng/editview.hxx> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index b05345d47ebd..3f358f5dc78e 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -19,8 +19,6 @@ #include <stdio.h> -#define SMDLL 1 - #include <com/sun/star/i18n/UnicodeType.hpp> #include <i18npool/lang.h> #include <unotools/charclass.hxx> diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index 05524bb7a640..c53224d1efc3 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -17,29 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define CharSetItem SfxVoidItem -#define FontFamilyItem SfxVoidItem -#define FontPitchItem SfxVoidItem -#define FontAlignItem SfxVoidItem -#define FontWeightItem SfxVoidItem -#define FontUnderlineItem SfxVoidItem -#define FontStrikeoutItem SfxVoidItem -#define FontItalicItem SfxVoidItem -#define SvxDbTypeItem SfxVoidItem -#define SvxLineSpaceItem SfxVoidItem -#define SvxInterLineSpaceItem SfxVoidItem -#define SvxBreakItem SfxVoidItem -#define BrushStyleItem SfxVoidItem -#define SvxNumTypeItem SfxVoidItem -#define SvxShadowLocationItem SfxVoidItem -#define SvxLanguage SfxVoidItem -#define SvxChooseControlEnumItem SfxVoidItem -#define SvxDrawToolEnumItem SfxVoidItem -#define SvxChooseControlItem SfxVoidItem -#define SvxDrawToolItem SfxVoidItem -#define SvxCellHorJustifyEnumItem SfxVoidItem -#define SvxCellVerJustifyEnumItem SfxVoidItem -#define SvxCellOrientationEnumItem SfxVoidItem #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 86c32c170b12..e40ca2f4f139 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -84,18 +84,9 @@ // Properties of the javavm can be put // as a komma separated list in this // environment variable -#define PROPERTIES_ENV "OO_JAVA_PROPERTIES" #ifdef UNIX -#define INI_FILE "javarc" -#ifdef MACOSX -#define DEF_JAVALIB "JavaVM.framework" -#else -#define DEF_JAVALIB "libjvm.so" -#endif #define TIMEZONE "MEZ" #else -#define INI_FILE "java.ini" -#define DEF_JAVALIB "jvm.dll" #define TIMEZONE "MET" #endif diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index a0f9581c8bf4..5906a03cd4fd 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -48,8 +48,6 @@ using namespace ::com::sun::star; #define PROPERTYNAME_VISIBLE_DRAWVIEW OUString("DrawView") #define PROPERTYHANDLE_VISIBLE_DRAWVIEW 5 -#define PROPERTYCOUNT 6 - class SvtSlideSorterBarOptions_Impl : public ConfigItem { Sequence< OUString > m_seqPropertyNames; diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 339e1556c48e..8f92b94a323b 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star; #define PROPERTYNAME_VISIBLE_SLIDESORTERVIEW OUString("SlideSorterView") #define PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW 4 -#define PROPERTYCOUNT 5 - class SvtToolPanelOptions_Impl : public ConfigItem { private: diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index e499cfd93e1e..2c27933710d8 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -93,8 +93,6 @@ using namespace svtools; #define aSeparatorStr "----------------------------------" -#define SPLITSET_ID 0 -#define COLSET_ID 1 #define ICONWIN_ID 2 #define FILEWIN_ID 3 #define FRAMEWIN_ID 4 diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx index adf7b3151608..06ba46349cf2 100644 --- a/svtools/source/contnr/viewdataentry.cxx +++ b/svtools/source/contnr/viewdataentry.cxx @@ -21,13 +21,6 @@ #include "tools/debug.hxx" -// Entryflags that are attached to the View -#define SVLISTENTRYFLAG_SELECTED 0x0001 -#define SVLISTENTRYFLAG_EXPANDED 0x0002 -#define SVLISTENTRYFLAG_FOCUSED 0x0004 -#define SVLISTENTRYFLAG_CURSORED 0x0008 -#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010 - DBG_NAME(SvViewDataEntry); SvViewDataEntry::SvViewDataEntry() : diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 7628d36e7871..d0601b5d514f 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -54,11 +54,9 @@ #define WEEKNUMBER_HEIGHT 85 #define CALENDAR_HITTEST_DAY ((sal_uInt16)0x0001) -#define CALENDAR_HITTEST_WEEK ((sal_uInt16)0x0002) #define CALENDAR_HITTEST_MONTHTITLE ((sal_uInt16)0x0004) #define CALENDAR_HITTEST_PREV ((sal_uInt16)0x0008) #define CALENDAR_HITTEST_NEXT ((sal_uInt16)0x0010) -#define CALENDAR_HITTEST_OUTSIDE ((sal_uInt16)0x1000) #define MENU_YEAR_COUNT 3 diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index fed037566803..82dad150d8c1 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -52,7 +52,6 @@ public: #define HEADERBAR_ARROWOFF 5 #define HEADERBAR_SPLITOFF 3 -#define HEADERBAR_DRAGOFF 4 #define HEADERBAR_DRAGOUTOFF 15 #define HEAD_HITTEST_ITEM ((sal_uInt16)0x0001) diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 285ede4014c0..d82b959d686a 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -305,7 +305,6 @@ MergedCellIterator& MergedCellIterator::operator++() #define DBG_FRAME_CHECK_COL( col, funcname ) DBG_FRAME_CHECK( (col) < GetColCount(), funcname, "invalid column index" ) #define DBG_FRAME_CHECK_ROW( row, funcname ) DBG_FRAME_CHECK( (row) < GetRowCount(), funcname, "invalid row index" ) #define DBG_FRAME_CHECK_COLROW( col, row, funcname ) DBG_FRAME_CHECK( ((col) < GetColCount()) && ((row) < GetRowCount()), funcname, "invalid cell index" ) -#define DBG_FRAME_CHECK_INDEX( index, funcname ) DBG_FRAME_CHECK( (index) < GetCellCount(), funcname, "invalid cell index" ) #define DBG_FRAME_CHECK_COL_1( col, funcname ) DBG_FRAME_CHECK( (col) <= GetColCount(), funcname, "invalid column index" ) #define DBG_FRAME_CHECK_ROW_1( row, funcname ) DBG_FRAME_CHECK( (row) <= GetRowCount(), funcname, "invalid row index" ) @@ -1269,7 +1268,6 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const #undef DBG_FRAME_CHECK_ROW_1 #undef DBG_FRAME_CHECK_COL_1 -#undef DBG_FRAME_CHECK_INDEX #undef DBG_FRAME_CHECK_COLROW #undef DBG_FRAME_CHECK_ROW #undef DBG_FRAME_CHECK_COL diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 5ef415f8a526..3d5a1fdce671 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -54,9 +54,6 @@ #include <svx/svxitems.hrc> #include "srchdlg.hrc" - -#define ITEMID_SETITEM 0 - #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> #include "srchctrl.hxx" diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 6897df78b92a..421a32bcee41 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -23,10 +23,6 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svl/itemset.hxx> -#ifndef ITEMID_GRF_CROP -#define ITEMID_GRF_CROP 0 -#endif - #include <svx/sdgcpitm.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 550e599ecebc..d11fea1ed665 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -59,14 +59,8 @@ #include <svx/xlineit0.hxx> #include <svx/svx3ditems.hxx> -#define ITEMID_BOX SDRATTR_TABLE_BORDER -#define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER #include "editeng/boxitem.hxx" - -#define ITEMID_SHADOW SDRATTR_TABLE_BORDER_SHADOW #include "editeng/shaditem.hxx" - -#define ITEMID_LINE 0 #include "editeng/lineitem.hxx" using namespace ::rtl; diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 563573e282ca..c3365460d045 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT - #include "svx/svdotext.hxx" #include "svx/svdetc.hxx" #include "editeng/outlobj.hxx" diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index d6f68a7f5dd9..7c368f557cb8 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define ITEMID_BOX SDRATTR_TABLE_BORDER -#define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER - #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 4976fb1555df..5c492667ca36 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -135,13 +135,9 @@ TYPEINIT1(SwRedlineHint, SfxHint); } } - #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc ); - - #else #define _CHECK_REDLINE( pDoc ) - #define _DEBUG_REDLINE( pDoc ) #endif diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index e08bc421f2b3..f6e6c5a370f7 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -64,7 +64,6 @@ #undef DEL_ONLY_EMPTY_LINES #undef DEL_EMPTY_BOXES_AT_START_AND_END -#define DEL_ALL_EMPTY_BOXES struct _CmpLPt { diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 79f8f561eef4..8e189e38165c 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -98,13 +98,6 @@ static void BreakPoint() return; } -#define CHECKPAGE \ - { if ( IsAgain() ) \ - { BreakPoint(); \ - return; \ - } \ - } - #define XCHECKPAGE \ { if ( IsAgain() ) \ { BreakPoint(); \ @@ -114,11 +107,6 @@ static void BreakPoint() } \ } #else -#define CHECKPAGE \ - { if ( IsAgain() ) \ - return; \ - } - #define XCHECKPAGE \ { if ( IsAgain() ) \ { \ diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx index ca6b62294234..d0a47bd0a5d3 100644 --- a/sw/source/core/sw3io/sw3convert.cxx +++ b/sw/source/core/sw3io/sw3convert.cxx @@ -50,7 +50,6 @@ //really used ids from old sw3ids.hxx #define SWG_INETBROWSER 0x000e // URL-Grf-Nodes, Browse-Flag, Format-Ums. #define SWG_NEWFIELDS 0x0200 // Felder mit Numberformatter-Zahlenformat -#define SWG_EXPORT40 0x0110 // Version fuer 4.0-Export ab 5.0 using namespace nsSwDocInfoSubType; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index f8759ae859f7..0d3b03a23e1f 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -41,9 +41,6 @@ #include <SwXMLBlockExport.hxx> #include <swerror.h> -#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ) -#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE ) - using namespace ::com::sun::star; diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index bcb26b4a01f5..1b6ef4ea75c3 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -39,10 +39,6 @@ #include <swevent.hxx> #include <swerror.h> - -#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ) -#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE ) - const char XMLN_BLOCKLIST[] = "BlockList.xml"; using namespace ::com::sun::star; diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index 8ff53f1d5d3d..5c17981a20fe 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -44,8 +44,6 @@ #include "pormulti.hxx" #include "ndhints.hxx" -#define CONSTCHAR( name, string ) static const sal_Char name[] = string - SvStream &operator<<( SvStream &rOs, const SwpHints & ) //$ ostream { rOs << " {HINTS:"; @@ -126,6 +124,8 @@ const char *GetPrepName( const PrepareHint ) #include "swtypes.hxx" // ZTCCONST #include "swfont.hxx" // SwDropPortion +#define CONSTCHAR( name, string ) static const sal_Char name[] = string + CONSTCHAR( pClose, "} " ); /************************************************************************* diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 78be1234eef2..dcc7563bd671 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -588,12 +588,6 @@ lcl_ExportSoftPageBreak( } } -#define REDLINE_PORTION_START_REMOVE 0//removed redlines are visible -#define REDLINE_PORTION_END_REMOVE 1//removed redlines are visible -#define REDLINE_PORTION_REMOVE 2//removed redlines are NOT visible -#define REDLINE_PORTION_INSERT_START 3 -#define REDLINE_PORTION_INSERT_END 4 - struct SwXRedlinePortion_Impl { const SwRedline* m_pRedline; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 4319c938183b..3ddb9cba052d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SVX_PARAITEM_HXX -#define _SVX_TEXTITEM_HXX - #include <com/sun/star/accessibility/XAccessible.hpp> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index ff387574ea63..f68174316935 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -25,11 +25,7 @@ #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> #include <editeng/eeitem.hxx> - -#ifndef _OUTLINER_HXX //autogen -#define _EEITEMID_HXX #include <editeng/outliner.hxx> -#endif #include <svx/xfillit.hxx> #include <editeng/colritem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 876f33e73a6f..01dd8bd51ef1 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -108,7 +108,6 @@ #define HTML_ESC_SUPER DFLT_ESC_SUPER #define HTML_ESC_SUB DFLT_ESC_SUB -#define HTML_SPTYPE_NONE 0 #define HTML_SPTYPE_BLOCK 1 #define HTML_SPTYPE_HORI 2 #define HTML_SPTYPE_VERT 3 diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 9474dd1772c3..3e48044e8b27 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -73,7 +73,6 @@ #include <svx/svdograf.hxx> #include <sfx2/docfilt.hxx> // #i70748# #include <istyleaccess.hxx> -#define LOGFILE_AUTHOR "mb93740" #include <sfx2/DocumentMetadataAccess.hxx> @@ -142,7 +141,7 @@ sal_Int32 ReadThroughComponent( OSL_ENSURE(rFactory.is(), "factory missing"); OSL_ENSURE(NULL != pFilterName,"I need a service name for the component!"); - RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sw", LOGFILE_AUTHOR, "ReadThroughComponent" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sw", "mb93740", "ReadThroughComponent" ); // prepare ParserInputSrouce xml::sax::InputSource aParserInput; @@ -175,7 +174,7 @@ sal_Int32 ReadThroughComponent( // if we do profiling, we want to know the stream rtl::OString aString(rtl::OUStringToOString(rStreamName, RTL_TEXTENCODING_ASCII_US)); - RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR, + RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740", "ReadThroughComponent : parsing \"%s\"", aString.getStr() ); #endif diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 0d2abe0cee99..11ccee0b9bb8 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -61,8 +61,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#define LOGFILE_AUTHOR "mb93740" - SwXMLWriter::SwXMLWriter( const String& rBaseURL ) { SetBaseURL( rBaseURL ); @@ -506,7 +504,7 @@ bool SwXMLWriter::WriteThroughComponent( OSL_ENSURE( NULL != pStreamName, "Need stream name!" ); OSL_ENSURE( NULL != pServiceName, "Need service name!" ); - RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR, + RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740", "SwXMLWriter::WriteThroughComponent : stream %s", pStreamName ); @@ -574,7 +572,7 @@ bool SwXMLWriter::WriteThroughComponent( OSL_ENSURE( xComponent.is(), "Need component!" ); OSL_ENSURE( NULL != pServiceName, "Need component name!" ); - RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", LOGFILE_AUTHOR, + RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", "mb93740", "SwXMLWriter::WriteThroughComponent" ); // get component diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index c456d72e2c6c..cefbc1435064 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -107,8 +107,6 @@ using namespace ::com::sun::star; // here are the SlotID's being included // see Idl-file #define SwModule -#define ViewSettings -#define PrintSettings #include <sfx2/msg.hxx> #include "swslots.hxx" #include <cfgid.h> diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 8e416d74c4c1..b9207bb3cf7f 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star; #define VERSION_30B ((sal_uInt16)250) #define VERSION_31B ((sal_uInt16)326) #define VERSION_40A ((sal_uInt16)364) -#define VERSION_50A ((sal_uInt16)373) #define VERSION_53A ((sal_uInt16)596) #define ACT_NUM_VERSION VERSION_53A diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index f9831bc717e3..f0069317db12 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -64,7 +64,6 @@ #define POS_CONTENT 0 #define POS_INDEX 1 -#define POS_USER 2 static sal_uInt16 nTypePos = 1; // TOX_INDEX as standard static sal_uInt16 nKey1Pos = USHRT_MAX; diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 47508fffb587..a41fc0bcf5d3 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -30,10 +30,8 @@ #define CONTROL_LEFT_OFFSET 6 #define CONTROL_RIGHT_OFFSET 3 #define CONTROL_TOP_OFFSET 4 -#define CONTROL_BOTTOM_OFFSET 4 #define CONTROL_TRIANGLE_WIDTH 4 -#define CONTROL_TRIANGLE_HEIGHT 7 #define CONTROL_TRIANGLE_PAD 3 // Constructor diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 3123b4fa53db..c36def954fff 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -123,7 +123,6 @@ static sal_uInt8 nHeaderPos; static sal_uInt8 nFooterPos; #define SwBaseShell -#define Shadow #include <sfx2/msg.hxx> #include "swslots.hxx" diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index a8c365f92798..b05002af8604 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -125,7 +125,6 @@ #define SvxDrawToolItem SfxAllEnumItem #define SvxDrawAlignItem SfxAllEnumItem -#define SvxDrawBezierItem SfxAllEnumItem #define avmedia_MediaItem ::avmedia::MediaItem #define SFX_TYPEMAP diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 26f6e02963bf..b106ceb1fdea 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - -#define _SW_FRMVALID_HXX #include <hintids.hxx> #include <comphelper/string.hxx> #include <svl/globalnameitem.hxx> @@ -99,10 +96,6 @@ #include <chartins.hxx> #define SwTextShell -#define Paragraph -#define HyphenZone -#define TextFont -#define DropCap #include <sfx2/msg.hxx> #include <swslots.hxx> #include <SwRewriter.hxx> diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 4a82653125a0..d43bece4d415 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -54,18 +54,9 @@ #include "wview.hxx" #include "shells.hrc" -#define OLEObjects #define SwView -#define Frames -#define Graphics -#define Tables -#define Controls #define GlobalContents #define Text -#define Frame -#define Graphic -#define Object -#define Draw #define TextDrawText #define TextInTable #define ListInText @@ -73,7 +64,6 @@ #define WebTextInTable #define WebListInText #define WebListInTable -#define TextPage #include <sfx2/msg.hxx> #include "swslots.hxx" #include <PostItMgr.hxx> diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 918b11efe1d4..88cf4786edb0 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -44,16 +44,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; using ::rtl::OUString; -// #TODO is this defined somewhere else? -#if ( defined UNX ) -#define FILE_PATH_SEPERATOR "/" -#else // windows -#define FILE_PATH_SEPERATOR "\\" -#endif - -#define EXCELVERSION "11.0" - - SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext ) { } diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index d433a6e9965b..00ce8a75a814 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -38,10 +38,6 @@ // STATIC DATA #define SwWebTextShell -#define Paragraph -#define HyphenZone -#define TextFont -#define DropCap #include <sfx2/msg.hxx> #include "swslots.hxx" diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 072d92aa89ed..68df58e95b88 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -59,20 +59,10 @@ #include <shells.hrc> #define SwWebView -#define Frames -#define Graphics -#define OLEObjects -#define Controls #define Text -#define Frame -#define Graphic -#define Object -#define Draw -#define DrawText #define TextInTable #define ListInText #define ListInTable -#define Page #include <swslots.hxx> diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index c539fbdaab06..ba26d0225f3b 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -88,11 +88,7 @@ struct ImplPropertyInfo ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 ) #define DECL_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 ) -#define DECL_PROP_4( asciiname, id, type, attrib1, attrib2, attrib3, attrib4 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 | ::com::sun::star::beans::PropertyAttribute::attrib4 ) -#define DECL_DEP_PROP_1( asciiname, id, type, attrib1 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1, sal_True ) #define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \ ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, sal_True ) #define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 535e0aeb9b74..104353be1bd1 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -255,7 +255,6 @@ static sal_uIntPtr ImplGetPerfTime() typedef FILE* FILETYPE; #define FileOpen fopen #define FileRead fread -#define FileWrite fwrite #define FilePrintF fprintf #define FileClose fclose diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 5c392e0690e9..be2899512e4e 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -40,14 +40,9 @@ #include <tools/debug.hxx> #include "comdep.hxx" #include <tools/fsys.hxx> -#define _TOOLS_HXX #include <tools/urlobj.hxx> #include <vector> -#ifdef UNX -#define _MAX_PATH 260 -#endif - #include <tools/stream.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 4efbefc0c655..d2496322004c 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -34,7 +34,7 @@ #define PZSTREAM ((z_stream*) mpsC_Stream) /* gzip flag byte */ -#define GZ_ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +// GZ_ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ #define GZ_HEAD_CRC 0x02 /* bit 1 set: header CRC present */ #define GZ_EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ #define GZ_ORIG_NAME 0x08 /* bit 3 set: original file name present */ diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 9d8b504fabaa..04a44d1ef6d9 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -18,8 +18,6 @@ #include "cmis_content.hxx" #include "cmis_provider.hxx" -#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) - using namespace com::sun::star; using namespace std; diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index db7f613201a8..565962144d8b 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -34,9 +34,6 @@ using namespace std; -#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) - - namespace cmis { URL::URL( rtl::OUString const & urlStr ) diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 0274b1f4c647..871242849308 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -67,11 +67,6 @@ #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <tools/diagnose_ex.h> - -#ifndef OOVBA_DLLIMPLEMENTATION -#define OOVBA_DLLIMPLEMENTATION -#endif - #include <vbahelper/vbahelper.hxx> using namespace ::com::sun::star; diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index e970f19fe851..c3cb145722e2 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -89,8 +89,6 @@ #define lineterm EOL /* line terminating character */ #define normalEOF 1 /* return code from parsing routines used only */ /* in this module */ -#define Space "space" /* used in string comparison to look for the width */ -/* of the space character to init the widths array */ #define False "false" /* used in string comparison to check the value of */ /* boolean keys (e.g. IsFixedPitch) */ diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 9678da6a52b4..903b1457f7d3 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - // Header files // diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 04f99bfd030f..000d8212c6b7 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SV_PRGSBAR_CXX - #include <tools/debug.hxx> #include <vcl/status.hxx> #include <vcl/prgsbar.hxx> diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index a29952486095..6977ed2ca197 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -29,6 +29,8 @@ #include "sgvspln.hxx" #include <unotools/ucbstreamhelper.hxx> +#if defined OSL_BIGENDIAN + #define SWAPPOINT(p) { \ p.x=OSL_SWAPWORD(p.x); \ p.y=OSL_SWAPWORD(p.y); } @@ -79,6 +81,7 @@ SWAPPOINT(t.ShdVers); \ SWAPAREA(t.BackF); } +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 2449b743ce11..a648ac264a33 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -58,19 +58,8 @@ extern "C" { /* MACH_EPS ist die kleinste positive, auf der Maschine darstellbare Zahl x, die der Bedingung genuegt: 1.0 + x > 1.0 */ -#define EPSQUAD 4.930380657631324e-032 -#define EPSROOT 1.490116119384766e-008 - -#define POSMAX 8.98846567431158e+307 /* groesste positive Zahl */ -#define POSMIN 5.56268464626800e-309 /* kleinste positive Zahl */ #define MAXROOT 9.48075190810918e+153 -#define BASIS 2 /* Basis der Zahlendarst. */ -#ifndef PI -#define PI 3.141592653589793e+000 -#endif -#define EXP_1 2.718281828459045e+000 - #else /*------------------ sonst -----------------------*/ double exp (double); @@ -110,29 +99,18 @@ short basis() /* BASIS maschinenunabhaengig bestimmen */ #define MACH_EPS masch() -#define EPSQUAD MACH_EPS * MACH_EPS -#define EPSROOT sqrt(MACH_EPS) #define POSMAX pow ((double) BASIS, MAXEXPON) -#define POSMIN pow ((double) BASIS, MINEXPON) #define MAXROOT sqrt(POSMAX) -#define PI 4.0 * atan (1.0) -#define EXP_1 exp(1.0) - #endif /*-------------- ENDE ifdef ----------------------*/ - -#define NEGMAX -POSMIN /* groesste negative Zahl */ -#define NEGMIN -POSMAX /* kleinste negative Zahl */ - /* Definition von Funktionsmakros: */ #define abs(X) ((X) >= 0 ? (X) : -(X)) /* Absolutbetrag von X */ #define sign(X, Y) (Y < 0 ? -abs(X) : abs(X)) /* Vorzeichen von */ /* Y mal abs(X) */ -#define sqr(X) ((X) * (X)) /* Quadrat von X */ /*------------------- ENDE FILE u_const.h --------------------------*/ diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e73c517d45af..db9bd3b68407 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -47,26 +47,13 @@ extern SgfFontLst* pSgfFonts; ///////////////////////////////////////////////////////////////////////////////// // AbsBase.Pas -// die folgenden Werte sind in % vom maximalen Schriftgrad der Zeile */ -#define UndlSpace 5 /* Untersteichungsabstand von der Baseline */ -#define UndlWidth 6 /* Untersteichungsdicke */ -#define UndlSpac2 7 /* Zwischenraum bei doppelter Unterstreichung */ -#define StrkSpace 25 /* Abstand der Durchstreichlinie von der Baseline*/ -#define StrkWidth 5 /* Durchstreichungsliniendicke */ -#define StrkSpac2 7 /* Zwischenraum bei doppelter Durchstreichung */ -#define OutlWidth 2 /* Strichstaerke ist 2% vom Schriftgrad */ - // vvv Sonderzeichen im TextBuffer vvv #define TextEnd 0 /* ^@ Ende der Zeichenkette */ #define HardSpace 6 /* ^F Hartspace (wird nicht umbrochen) ,' ' */ -#define GrafText 7 /* ^G Im Text eingebundene Grafik (future) */ -#define Tabulator 9 /* ^I Tabulatorzeichen, Pfeil */ -#define LineFeed 10 /* ^J Neue Zeile */ #define SoftTrennK 11 /* ^K Zeichen fuer k-c-Austausch bei Trennung, 'k' */ #define AbsatzEnd 13 /* ^M Neuer Absatz =CR */ #define HardTrenn 16 /* ^P Hartes Trennzeichen (wird nicht umbrochen), '-' */ #define SoftTrennAdd 19 /* ^S Zusatz-Zeichen Trennung von z.b."Schiff-fahrt" */ -#define Paragraf 21 /* ^U Zeichen welches fuer Paragraf-Zeichen */ #define Escape 27 /* ^[ Escapesequenz einleiten */ #define SoftTrenn 31 /* ^_ Weiches Trennzeichen, '-' nur Zeilenende */ #define MaxEscValLen 8 @@ -148,7 +135,6 @@ extern SgfFontLst* pSgfFonts; //============================================================================== -#define GradDiv 2 #define CharTopToBase 100 /* wegen Apostrophe und Umlaute mehr als 75% */ #define CharTopToBtm 120 /* Zeilenhoehe ist groesser als Schriftgrad */ // bei Avanti-Bold 'ue' eigentlich sogar 130% @@ -179,7 +165,6 @@ extern SgfFontLst* pSgfFonts; #define TextSh3DBit 0x0800 /* 3D-Schatten 2.0 */ #define TextSh4DBit 0x1000 /* 4D-Schatten 2.0 */ #define TextShEbBit 0x2000 /* Embossed-Schatten 2.0 */ -#define FontAtrBits (TextBoldBit | TextRSlnBit) #define THJustLeft 0x00 #define THJustCenter 0x01 @@ -187,10 +172,6 @@ extern SgfFontLst* pSgfFonts; #define THJustBlock 0x03 #define THJustDrvOut 0x04 /* Austreibend Formatiert */ #define THJustLocked 0x05 /* A l s S p e r r s c h r i f t */ -#define TVJustTop 0x00 /* Future */ -#define TVJustCenter 0x10 /* Future */ -#define TVJustBottom 0x20 /* Future */ -#define TVJustBlock 0x30 /* Future */ #define MaxCharSlant 4200 /* Maximal 42deg kursiv ! */ @@ -529,7 +510,6 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT ///////////////////////////////////////////////////////////////////////////////// // iFont.Pas -#define DefaultSlant 1500 /* Default: Italic ist 15deg */ #define SuperSubFact 60 /* SuperScript/SubScript: 60% vom Schriftgrad */ #define DefaultSpace 40 /* Default: Space ist 40% vom SchriftGrad */ diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ae495945fac8..beed2a3b9471 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -24,111 +24,50 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vcl/lineinfo.hxx> -#define WIN_EMR_HEADER 1 -#define WIN_EMR_POLYBEZIER 2 #define WIN_EMR_POLYGON 3 #define WIN_EMR_POLYLINE 4 #define WIN_EMR_POLYBEZIERTO 5 #define WIN_EMR_POLYLINETO 6 -#define WIN_EMR_POLYPOLYLINE 7 #define WIN_EMR_POLYPOLYGON 8 #define WIN_EMR_SETWINDOWEXTEX 9 #define WIN_EMR_SETWINDOWORGEX 10 #define WIN_EMR_SETVIEWPORTEXTEX 11 #define WIN_EMR_SETVIEWPORTORGEX 12 -#define WIN_EMR_SETBRUSHORGEX 13 #define WIN_EMR_EOF 14 #define WIN_EMR_SETPIXELV 15 -#define WIN_EMR_SETMAPPERFLAGS 16 #define WIN_EMR_SETMAPMODE 17 #define WIN_EMR_SETBKMODE 18 -#define WIN_EMR_SETPOLYFILLMODE 19 #define WIN_EMR_SETROP2 20 -#define WIN_EMR_SETSTRETCHBLTMODE 21 #define WIN_EMR_SETTEXTALIGN 22 -#define WIN_EMR_SETCOLORADJUSTMENT 23 #define WIN_EMR_SETTEXTCOLOR 24 -#define WIN_EMR_SETBKCOLOR 25 -#define WIN_EMR_OFFSETCLIPRGN 26 #define WIN_EMR_MOVETOEX 27 -#define WIN_EMR_SETMETARGN 28 -#define WIN_EMR_EXCLUDECLIPRECT 29 #define WIN_EMR_INTERSECTCLIPRECT 30 -#define WIN_EMR_SCALEVIEWPORTEXTEX 31 -#define WIN_EMR_SCALEWINDOWEXTEX 32 #define WIN_EMR_SAVEDC 33 #define WIN_EMR_RESTOREDC 34 -#define WIN_EMR_SETWORLDTRANSFORM 35 -#define WIN_EMR_MODIFYWORLDTRANSFORM 36 #define WIN_EMR_SELECTOBJECT 37 #define WIN_EMR_CREATEPEN 38 #define WIN_EMR_CREATEBRUSHINDIRECT 39 #define WIN_EMR_DELETEOBJECT 40 -#define WIN_EMR_ANGLEARC 41 #define WIN_EMR_ELLIPSE 42 #define WIN_EMR_RECTANGLE 43 #define WIN_EMR_ROUNDRECT 44 -#define WIN_EMR_ARC 45 -#define WIN_EMR_CHORD 46 -#define WIN_EMR_PIE 47 -#define WIN_EMR_SELECTPALETTE 48 -#define WIN_EMR_CREATEPALETTE 49 -#define WIN_EMR_SETPALETTEENTRIES 50 -#define WIN_EMR_RESIZEPALETTE 51 -#define WIN_EMR_REALIZEPALETTE 52 -#define WIN_EMR_EXTFLOODFILL 53 #define WIN_EMR_LINETO 54 -#define WIN_EMR_ARCTO 55 -#define WIN_EMR_POLYDRAW 56 -#define WIN_EMR_SETARCDIRECTION 57 -#define WIN_EMR_SETMITERLIMIT 58 #define WIN_EMR_BEGINPATH 59 #define WIN_EMR_ENDPATH 60 #define WIN_EMR_CLOSEFIGURE 61 #define WIN_EMR_FILLPATH 62 -#define WIN_EMR_STROKEANDFILLPATH 63 #define WIN_EMR_STROKEPATH 64 -#define WIN_EMR_FLATTENPATH 65 -#define WIN_EMR_WIDENPATH 66 -#define WIN_EMR_SELECTCLIPPATH 67 -#define WIN_EMR_ABORTPATH 68 #define WIN_EMR_GDICOMMENT 70 -#define WIN_EMR_FILLRGN 71 -#define WIN_EMR_FRAMERGN 72 -#define WIN_EMR_INVERTRGN 73 -#define WIN_EMR_PAINTRGN 74 -#define WIN_EMR_EXTSELECTCLIPRGN 75 -#define WIN_EMR_BITBLT 76 -#define WIN_EMR_STRETCHBLT 77 -#define WIN_EMR_MASKBLT 78 -#define WIN_EMR_PLGBLT 79 -#define WIN_EMR_SETDIBITSTODEVICE 80 #define WIN_EMR_STRETCHDIBITS 81 #define WIN_EMR_EXTCREATEFONTINDIRECTW 82 -#define WIN_EMR_EXTTEXTOUTA 83 #define WIN_EMR_EXTTEXTOUTW 84 -#define WIN_EMR_POLYBEZIER16 85 -#define WIN_EMR_POLYGON16 86 -#define WIN_EMR_POLYLINE16 87 -#define WIN_EMR_POLYBEZIERTO16 88 -#define WIN_EMR_POLYLINETO16 89 -#define WIN_EMR_POLYPOLYLINE16 90 -#define WIN_EMR_POLYPOLYGON16 91 -#define WIN_EMR_POLYDRAW16 92 -#define WIN_EMR_CREATEMONOBRUSH 93 -#define WIN_EMR_CREATEDIBPATTERNBRUSHPT 94 -#define WIN_EMR_EXTCREATEPEN 95 -#define WIN_EMR_POLYTEXTOUTA 96 -#define WIN_EMR_POLYTEXTOUTW 97 #define WIN_SRCCOPY 0x00CC0020L #define WIN_SRCPAINT 0x00EE0086L #define WIN_SRCAND 0x008800C6L #define WIN_SRCINVERT 0x00660046L -#define WIN_EMR_COMMENT_EMFSPOOL 0x00000000L #define WIN_EMR_COMMENT_EMFPLUS 0x2B464D45L -#define WIN_EMR_COMMENT_PUBLIC 0x43494447L #define HANDLE_INVALID 0xffffffff #define MAXHANDLES 65000 @@ -138,18 +77,12 @@ #define TEXT_SELECT 0x00000004 /* Text Alignment Options */ -#define TA_NOUPDATECP 0 -#define TA_UPDATECP 1 - -#define TA_LEFT 0 #define TA_RIGHT 2 -#define TA_CENTER 6 #define TA_TOP 0 #define TA_BOTTOM 8 #define TA_BASELINE 24 #define TA_RTLREADING 256 -#define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) #define MM_ANISOTROPIC 8 diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index c9baef6b36f5..4f10ee17828e 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -34,110 +34,48 @@ //====================== MS-Windows-defines =============================== -#define W_META_SETBKCOLOR 0x0201 #define W_META_SETBKMODE 0x0102 -#define W_META_SETMAPMODE 0x0103 #define W_META_SETROP2 0x0104 -#define W_META_SETRELABS 0x0105 -#define W_META_SETPOLYFILLMODE 0x0106 #define W_META_SETSTRETCHBLTMODE 0x0107 -#define W_META_SETTEXTCHAREXTRA 0x0108 #define W_META_SETTEXTCOLOR 0x0209 -#define W_META_SETTEXTJUSTIFICATION 0x020A #define W_META_SETWINDOWORG 0x020B #define W_META_SETWINDOWEXT 0x020C -#define W_META_SETVIEWPORTORG 0x020D -#define W_META_SETVIEWPORTEXT 0x020E -#define W_META_OFFSETWINDOWORG 0x020F -#define W_META_SCALEWINDOWEXT 0x0410 -#define W_META_OFFSETVIEWPORTORG 0x0211 -#define W_META_SCALEVIEWPORTEXT 0x0412 #define W_META_LINETO 0x0213 #define W_META_MOVETO 0x0214 -#define W_META_EXCLUDECLIPRECT 0x0415 #define W_META_INTERSECTCLIPRECT 0x0416 #define W_META_ARC 0x0817 #define W_META_ELLIPSE 0x0418 -#define W_META_FLOODFILL 0x0419 #define W_META_PIE 0x081A #define W_META_RECTANGLE 0x041B #define W_META_ROUNDRECT 0x061C -#define W_META_PATBLT 0x061D #define W_META_SAVEDC 0x001E #define W_META_SETPIXEL 0x041F -#define W_META_OFFSETCLIPRGN 0x0220 #define W_META_TEXTOUT 0x0521 -#define W_META_BITBLT 0x0922 -#define W_META_STRETCHBLT 0x0B23 #define W_META_POLYGON 0x0324 #define W_META_POLYLINE 0x0325 #define W_META_ESCAPE 0x0626 #define W_META_RESTOREDC 0x0127 -#define W_META_FILLREGION 0x0228 -#define W_META_FRAMEREGION 0x0429 -#define W_META_INVERTREGION 0x012A -#define W_META_PAINTREGION 0x012B -#define W_META_SELECTCLIPREGION 0x012C #define W_META_SELECTOBJECT 0x012D #define W_META_SETTEXTALIGN 0x012E -#define W_META_DRAWTEXT 0x062F #define W_META_CHORD 0x0830 -#define W_META_SETMAPPERFLAGS 0x0231 #define W_META_EXTTEXTOUT 0x0a32 -#define W_META_SETDIBTODEV 0x0d33 -#define W_META_SELECTPALETTE 0x0234 -#define W_META_REALIZEPALETTE 0x0035 -#define W_META_ANIMATEPALETTE 0x0436 -#define W_META_SETPALENTRIES 0x0037 #define W_META_POLYPOLYGON 0x0538 -#define W_META_RESIZEPALETTE 0x0139 -#define W_META_DIBBITBLT 0x0940 -#define W_META_DIBSTRETCHBLT 0x0b41 -#define W_META_DIBCREATEPATTERNBRUSH 0x0142 #define W_META_STRETCHDIB 0x0f43 -#define W_META_EXTFLOODFILL 0x0548 -#define W_META_RESETDC 0x014C -#define W_META_STARTDOC 0x014D -#define W_META_STARTPAGE 0x004F -#define W_META_ENDPAGE 0x0050 -#define W_META_ABORTDOC 0x0052 -#define W_META_ENDDOC 0x005E #define W_META_DELETEOBJECT 0x01f0 -#define W_META_CREATEPALETTE 0x00f7 -#define W_META_CREATEBRUSH 0x00F8 -#define W_META_CREATEPATTERNBRUSH 0x01F9 #define W_META_CREATEPENINDIRECT 0x02FA #define W_META_CREATEFONTINDIRECT 0x02FB #define W_META_CREATEBRUSHINDIRECT 0x02FC -#define W_META_CREATEBITMAPINDIRECT 0x02FD -#define W_META_CREATEBITMAP 0x06FE -#define W_META_CREATEREGION 0x06FF #define W_TRANSPARENT 1 #define W_OPAQUE 2 -#define W_R2_BLACK 1 -#define W_R2_NOTMERGEPEN 2 -#define W_R2_MASKNOTPEN 3 -#define W_R2_NOTCOPYPEN 4 -#define W_R2_MASKPENNOT 5 #define W_R2_NOT 6 #define W_R2_XORPEN 7 -#define W_R2_NOTMASKPEN 8 -#define W_R2_MASKPEN 9 -#define W_R2_NOTXORPEN 10 -#define W_R2_NOP 11 -#define W_R2_MERGENOTPEN 12 #define W_R2_COPYPEN 13 -#define W_R2_MERGEPENNOT 14 -#define W_R2_MERGEPEN 15 -#define W_R2_WHITE 16 #define W_TA_NOUPDATECP 0x0000 -#define W_TA_UPDATECP 0x0001 #define W_TA_LEFT 0x0000 #define W_TA_RIGHT 0x0002 -#define W_TA_CENTER 0x0006 #define W_TA_TOP 0x0000 #define W_TA_BOTTOM 0x0008 #define W_TA_BASELINE 0x0018 @@ -147,17 +85,7 @@ #define W_SRCPAINT 0x00EE0086L #define W_SRCAND 0x008800C6L #define W_SRCINVERT 0x00660046L -#define W_SRCERASE 0x00440328L -#define W_NOTSRCCOPY 0x00330008L -#define W_NOTSRCERASE 0x001100A6L -#define W_MERGECOPY 0x00C000CAL -#define W_MERGEPAINT 0x00BB0226L -#define W_PATCOPY 0x00F00021L -#define W_PATPAINT 0x00FB0A09L -#define W_PATINVERT 0x005A0049L #define W_DSTINVERT 0x00550009L -#define W_BLACKNESS 0x00000042L -#define W_WHITENESS 0x00FF0062L #define W_PS_SOLID 0 #define W_PS_DASH 1 @@ -165,30 +93,10 @@ #define W_PS_DASHDOT 3 #define W_PS_DASHDOTDOT 4 #define W_PS_NULL 5 -#define W_PS_INSIDEFRAME 6 #define W_LF_FACESIZE 32 #define W_ANSI_CHARSET 0 -#define W_DEFAULT_CHARSET 1 -#define W_SYMBOL_CHARSET 2 -#define W_SHIFTJIS_CHARSET 128 -#define W_HANGEUL_CHARSET 129 -#define W_GB2312_CHARSET 134 -#define W_CHINESEBIG5_CHARSET 136 -#define W_OEM_CHARSET 255 -/*WINVER >= 0x0400*/ -#define W_JOHAB_CHARSET 130 -#define W_HEBREW_CHARSET 177 -#define W_ARABIC_CHARSET 178 -#define W_GREEK_CHARSET 161 -#define W_TURKISH_CHARSET 162 -#define W_VIETNAMESE_CHARSET 163 -#define W_THAI_CHARSET 222 -#define W_EASTEUROPE_CHARSET 238 -#define W_RUSSIAN_CHARSET 204 -#define W_MAC_CHARSET 77 -#define W_BALTIC_CHARSET 186 #define W_DEFAULT_PITCH 0x00 #define W_FIXED_PITCH 0x01 @@ -203,33 +111,17 @@ #define W_FW_DONTCARE 0 #define W_FW_THIN 100 -#define W_FW_EXTRALIGHT 200 #define W_FW_LIGHT 300 #define W_FW_NORMAL 400 #define W_FW_MEDIUM 500 #define W_FW_SEMIBOLD 600 #define W_FW_BOLD 700 -#define W_FW_EXTRABOLD 800 -#define W_FW_HEAVY 900 #define W_FW_ULTRALIGHT 200 -#define W_FW_REGULAR 400 -#define W_FW_DEMIBOLD 600 #define W_FW_ULTRABOLD 800 #define W_FW_BLACK 900 #define W_BS_SOLID 0 #define W_BS_HOLLOW 1 -#define W_BS_HATCHED 2 -#define W_BS_PATTERN 3 -#define W_BS_INDEXED 4 -#define W_BS_DIBPATTERN 5 - -#define W_HS_HORIZONTAL 0 -#define W_HS_VERTICAL 1 -#define W_HS_FDIAGONAL 2 -#define W_HS_BDIAGONAL 3 -#define W_HS_CROSS 4 -#define W_HS_DIAGCROSS 5 #define W_MFCOMMENT 15 diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index d4ada5421213..2e069c382745 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -58,12 +58,7 @@ namespace vcl #define T_hhea 0x68686561 #define T_hmtx 0x686D7478 #define T_cmap 0x636D6170 -#define T_vhea 0x76686561 -#define T_vmtx 0x766D7478 -#define T_OS2 0x4F532F32 #define T_post 0x706F7374 -#define T_kern 0x6B65726E -#define T_cvt 0x63767420 typedef struct { sal_uInt32 tag; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index dd72bf874cdd..9b9b960c5cba 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -27,7 +27,6 @@ DBG_NAME( JobSetup ) -#define JOBSET_FILEFORMAT2 3780 #define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF) #define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE) @@ -326,6 +325,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" ); // We do not have a new FileFormat at this point in time + // #define JOBSET_FILEFORMAT2 3780 // if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 ) { sal_uInt16 nLen = 0; diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 8d204efd5445..8d9a9929ba56 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -37,8 +37,6 @@ #define PNGCHUNK_PLTE 0x504c5445 #define PNGCHUNK_IDAT 0x49444154 #define PNGCHUNK_IEND 0x49454e44 -#define PNGCHUNK_bKGD 0x624b4744 -#define PNGCHUNK_gAMA 0x67414d41 #define PNGCHUNK_pHYs 0x70485973 #define PNGCHUNK_tRNS 0x74524e53 diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 6bebcf260273..8b19c31eeec7 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -20,10 +20,6 @@ // Description: An implementation of the SalLayout interface that uses the // Graphite engine. - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - // Enable lots of debug info #if OSL_DEBUG_LEVEL > 1 #include <cstdio> diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index c89a9f02a2ff..df4e93d91bac 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef LAZYDELETE_CXX -#define LAZYDELETE_CXX - #include "vcl/window.hxx" #include "vcl/menu.hxx" #include "vcl/lazydelete.hxx" @@ -113,6 +110,4 @@ void DeleteOnDeinitBase::ImplDeleteOnDeInit() } // namespace vcl -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index 2f32c78d467e..85fe63c1736f 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define THREADEX_IMPLEMENTATION #include <vcl/threadex.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 87b48468eccd..0662899dba6e 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -863,7 +863,6 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const break; #if !defined (SunXK_Undo) - #define SunXK_Stop 0x0000FF69 // XK_Cancel #define SunXK_Props 0x1005FF70 #define SunXK_Front 0x1005FF71 #define SunXK_Copy 0x1005FF72 @@ -1116,7 +1115,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const break; // - - - - - Sun X-Server keyboard ??? - - - - - - - - - - - - case XK_L1: // XK_F11: - nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop, + nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop = 0x0000FF69 (XK_Cancel), // but VCL doesn't have a key defintion for that break; case XK_L2: // XK_F12: diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 1e621f18c2ae..de65253f3f2a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -264,7 +264,9 @@ using ::rtl::OUString; using ::rtl::OStringBuffer; using ::rtl::OUStringHash; +#if OSL_DEBUG_LEVEL > 2 #define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() ) +#endif namespace { diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index afc609a3bc7f..23738f9009b9 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -161,7 +161,6 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList, } #define get_bool_value( list, index ) get_value( list, index, Bool2String ) -#define get_short_value( list, index ) get_value( list, index, Short2String ) #define get_height_value( list, index ) get_value( list, index, Float2String ) #define get_justification_value( list, index ) get_value( list, index, Adjust2Justification ) #define get_cmm_value( list, index ) get_value( list, index, CMM2UnitString ) diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index b7fd592cef3e..f2effd7fccc8 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -23,8 +23,6 @@ #define G_TYPE_LO_ACTION (g_lo_action_get_type ()) #define G_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_LO_ACTION, GLOAction)) -#define G_IS_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ - G_TYPE_LO_ACTION)) struct _GLOAction { diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 5151350b72e2..4eb00ffe25be 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -46,14 +46,6 @@ #include <config_vclplug.h> -#if ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "TDE" -#define THIS_DESKENV_NAME_LOW "tde" -#else // ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "KDE" -#define THIS_DESKENV_NAME_LOW "kde" -#endif // ENABLE_TDE - /* #i59042# override KApplications method for session management * since it will interfere badly with our own. */ diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 86357af2fc78..bb1f204993eb 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -42,56 +42,6 @@ const sal_Int16 API_LINE_DASHED = 2; #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) -//line definitions in 1/100 mm -#define LINE_WIDTH_0 2 -#define LINE_WIDTH_1 36 -#define LINE_WIDTH_2 89 -#define LINE_WIDTH_3 142 - -#define DOUBLE_LINE0_OUT LINE_WIDTH_0 -#define DOUBLE_LINE0_IN LINE_WIDTH_0 -#define DOUBLE_LINE0_DIST LINE_WIDTH_1 - -#define DOUBLE_LINE1_OUT LINE_WIDTH_1 -#define DOUBLE_LINE1_IN LINE_WIDTH_1 -#define DOUBLE_LINE1_DIST LINE_WIDTH_1 - -#define DOUBLE_LINE2_OUT LINE_WIDTH_2 -#define DOUBLE_LINE2_IN LINE_WIDTH_2 -#define DOUBLE_LINE2_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE3_OUT LINE_WIDTH_2 -#define DOUBLE_LINE3_IN LINE_WIDTH_1 -#define DOUBLE_LINE3_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE4_OUT LINE_WIDTH_1 -#define DOUBLE_LINE4_IN LINE_WIDTH_2 -#define DOUBLE_LINE4_DIST LINE_WIDTH_1 - -#define DOUBLE_LINE5_OUT LINE_WIDTH_3 -#define DOUBLE_LINE5_IN LINE_WIDTH_2 -#define DOUBLE_LINE5_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE6_OUT LINE_WIDTH_2 -#define DOUBLE_LINE6_IN LINE_WIDTH_3 -#define DOUBLE_LINE6_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE7_OUT LINE_WIDTH_0 -#define DOUBLE_LINE7_IN LINE_WIDTH_0 -#define DOUBLE_LINE7_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE8_OUT LINE_WIDTH_1 -#define DOUBLE_LINE8_IN LINE_WIDTH_0 -#define DOUBLE_LINE8_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE9_OUT LINE_WIDTH_2 -#define DOUBLE_LINE9_IN LINE_WIDTH_0 -#define DOUBLE_LINE9_DIST LINE_WIDTH_2 - -#define DOUBLE_LINE10_OUT LINE_WIDTH_3 -#define DOUBLE_LINE10_IN LINE_WIDTH_0 -#define DOUBLE_LINE10_DIST LINE_WIDTH_2 - sal_Int32 MakeBorderLine( sal_Int32 nSprmValue, table::BorderLine2& rToFill ) { //TODO: Lines are always solid diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/filter/DocumentElement.cxx index a640d1773bac..a396950973c3 100644 --- a/writerperfect/source/filter/DocumentElement.cxx +++ b/writerperfect/source/filter/DocumentElement.cxx @@ -12,8 +12,6 @@ #include "FilterInternal.hxx" #include <string.h> -#define ASCII_SPACE 0x0020 - void TagElement::print() const { WRITER_DEBUG_MSG(("%s\n", msTagName.cstr())); diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 08357dbdf865..8cbebdd55778 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -36,8 +36,6 @@ using namespace ::com::sun::star; // Interface implementation // -------------------------------------------------------------------- -#define IMPL ((AttrContainerImpl*)mpData) - uno::Reference< uno::XInterface > SvUnoAttributeContainer_CreateInstance() { return *(new SvUnoAttributeContainer); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c578286c0b7a..c82a6809ff3d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -108,8 +108,6 @@ sal_Char const sXML_1_2[] = "1.2"; // #i115030#: the XSLT is not finished, and not available via HTTP const sal_Char s_grddl_xsl[] = "http://FIXME"; -#define LOGFILE_AUTHOR "mb93740" - #define XML_MODEL_SERVICE_WRITER "com.sun.star.text.TextDocument" #define XML_MODEL_SERVICE_CALC "com.sun.star.sheet.SpreadsheetDocument" #define XML_MODEL_SERVICE_DRAW "com.sun.star.drawing.DrawingDocument" @@ -803,7 +801,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen // XFilter sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw(uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", LOGFILE_AUTHOR, + RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", "mb93740", "SvXMLExport::filter" ); // check for xHandler first... should have been supplied in initialize diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 04f7a51081af..07c1f4c8298b 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -60,8 +60,6 @@ #include <com/sun/star/rdf/XRepositorySupplier.hpp> #include "RDFaImportHelper.hxx" -#define LOGFILE_AUTHOR "unknown" - using ::com::sun::star::beans::XPropertySetInfo; using ::rtl::OUString; @@ -479,7 +477,7 @@ sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& r void SAL_CALL SvXMLImport::startDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException ) { - RTL_LOGFILE_TRACE_AUTHOR( "xmloff", LOGFILE_AUTHOR, "{ SvXMLImport::startDocument" ); + RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "{ SvXMLImport::startDocument" ); if( !mxGraphicResolver.is() || !mxEmbeddedResolver.is() ) { @@ -516,7 +514,7 @@ void SAL_CALL SvXMLImport::startDocument( void ) void SAL_CALL SvXMLImport::endDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException) { - RTL_LOGFILE_TRACE_AUTHOR( "xmloff", LOGFILE_AUTHOR, "} SvXMLImport::startDocument" ); + RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "} SvXMLImport::startDocument" ); // #i9518# All the stuff that accesses the document has to be done here, not in the dtor, // because the SvXMLImport dtor might not be called until after the document has been closed. @@ -692,7 +690,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, // If we do profiling, we want a trace message for the first element // in order to identify the stream. rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", LOGFILE_AUTHOR, + RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown", "SvXMLImport::StartElement( \"%s\", ... )", aString.getStr() ); #endif diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 44d40d233011..b748383a158f 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -67,7 +67,6 @@ struct SdXMLDataStyleNumber // date -#define DATA_STYLE_NUMBER_END 0 #define DATA_STYLE_NUMBER_DAY 1 // <number:day/> #define DATA_STYLE_NUMBER_DAY_LONG 2 // <number:day number:style="long"/> #define DATA_STYLE_NUMBER_MONTH_LONG 3 // <number:month number:style="long"/> diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index b41ef3c4dc93..36bf6bb36609 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -33,11 +33,6 @@ using ::rtl::OUStringBuffer; using namespace ::com::sun::star; -// this is a copy of defines in svx/inc/escpitem.hxx -#define DFLT_ESC_PROP 58 -#define DFLT_ESC_AUTO_SUPER 101 -#define DFLT_ESC_AUTO_SUB -101 - /////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index 763f35f534a9..486fe1d85a78 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -30,11 +30,6 @@ using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; -// this is a copy of defines in svx/inc/escpitem.hxx -#define DFLT_ESC_PROP 58 -#define DFLT_ESC_AUTO_SUPER 101 -#define DFLT_ESC_AUTO_SUB -101 - /////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index ed8a3f45ca3d..78373198f18d 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -33,11 +33,6 @@ using namespace ::com::sun::star; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_CASEMAP_NORMAL; -// this is a copy of defines in svx/inc/escpitem.hxx -#define DFLT_ESC_PROP 58 -#define DFLT_ESC_AUTO_SUPER 101 -#define DFLT_ESC_AUTO_SUB -101 - /////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index ef9758ae9147..871a2e2e2bb3 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -33,7 +33,6 @@ #define XML_LINE_RIGHT 1 #define XML_LINE_TOP 2 #define XML_LINE_BOTTOM 3 -#define MIN_BORDER_DIST 49 using ::rtl::OUString; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 59a558d6ab40..fc351f51fdd6 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -74,9 +74,6 @@ enum XMLUserDefinedTransformerAction #define ENTRY2( n, l, a, p1, p2 ) \ ENTRY3( n, l, a, p1, p2, 0 ) -#define ENTRY2QQ( n, l, a, n1, l1, n2, l2 ) \ - ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), \ - XMLTransformerActionInit::QNameParam( n2, l2 ) ) #define ENTRY2QN( n, l, a, n1, l1, p2 ) \ ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), p2 ) diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index f1e2095df340..ea698e99588a 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -83,9 +83,6 @@ enum XMLUserDefinedTransformerAction #define ENTRY2( n, l, a, p1, p2 ) \ ENTRY3( n, l, a, p1, p2, 0 ) -#define ENTRY2QQ( n, l, a, n1, l1, n2, l2 ) \ - ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), \ - XMLTransformerActionInit::QNameParam( n2, l2 ) ) #define ENTRY2QN( n, l, a, n1, l1, p2 ) \ ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), p2 ) diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 56f4df3e838f..340f7bda7f7d 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -47,9 +47,6 @@ const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; /* xml security framework components */ #define SAXEVENTKEEPER_COMPONENT "com.sun.star.xml.crypto.sax.SAXEventKeeper" -/* string for package protocol */ -#define PACKAGEPROTOCOL "vnd.sun.star.Package:" - XSecController::XSecController( const cssu::Reference<cssu::XComponentContext>& rxCtx ) :mxCtx(rxCtx), m_nNextSecurityId(1), |