diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 17:45:34 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 17:46:25 +0200 |
| commit | 278000a28b8eceb8528ebdcf1d601de8192979e8 (patch) | |
| tree | a522e5b53bca5d3e34c8a86d7bbee25a1ad15b3a | |
| parent | 892bb81d17b3351c196661c44fb15b29509c7115 (diff) | |
Remove unused defines
Some of them were commented out for documentation purpose.
Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
105 files changed, 13 insertions, 513 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 9807d601de4e..a08d2d7d7793 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -46,8 +46,6 @@ #include <comphelper/accessibleeventnotifier.hxx> #define ACCESSIBLE_ACTION_COUNT 1 -#define AID_EXPAND 0 -#define AID_COLLAPSE 1 namespace { diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index a275312369bd..e62c779bbb4b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -710,8 +710,6 @@ namespace } -#define MIN_LINE_SIZE 32 - void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const * /*bptr*/, unsigned char const * /*eptr*/) { sysmips(FLUSH_CACHE,0,0,0); diff --git a/cosv/inc/cosv/comfunc.hxx b/cosv/inc/cosv/comfunc.hxx index 65c27290c81a..a294d81f2aae 100644 --- a/cosv/inc/cosv/comfunc.hxx +++ b/cosv/inc/cosv/comfunc.hxx @@ -62,9 +62,6 @@ no_str(const char * str) { return str != 0 ? *str == '\0' : true; } } // namespace csv -#define NON_COPYABLE(xy) \ - private: xy(const xy &); xy & operator=(const xy &) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 79a9f74c8012..7b2e8d79e0c3 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -875,8 +875,6 @@ namespace cppcanvas rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()); #define SET_FILL_COLOR(x) \ rState.fillColor = COLOR(x); -#define SET_LINE_COLOR(x) \ - rState.lineColor = COLOR(x); #define SET_TEXT_COLOR(x) \ rState.textColor = COLOR(x); diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx index 658fd489a094..6e385d25d018 100644 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx @@ -76,8 +76,6 @@ static char g_szStackFile[L_tmpnam] = ""; static char g_szDescriptionFile[2048] = ""; static char g_szReportFile[2048] = ""; -#define PSTACK_CMD "pstack %d" - #ifdef LINUX #define PMAP_CMD "cat /proc/%d/maps" #else diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index cc89339482b1..897aa151430e 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -141,7 +141,6 @@ class SvxBulletPickTabPage : public SfxTabPage /*-------------------------------------------------- TabPage for complete numeration --------------------------------------------------*/ -#define NUMTYPE_MEMBER 4 // number of elements of the FormatString per level #define NUM_VALUSET_COUNT 16 class SvxNumPickTabPage : public SfxTabPage { diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 7e8576152029..d09021ac19c8 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -54,10 +54,6 @@ namespace svx struct OptPath_Impl; class SvxPathTabPage; -// define ---------------------------------------------------------------- - -#define SfxPathTabPage SvxPathTabPage - // class SvxPathTabPage -------------------------------------------------- class SvxPathTabPage : public SfxTabPage diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 63b1ade62032..505b2a9cbdd6 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -581,8 +581,6 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -#define IS_DONT_CARE(a) ((a).GetState() == svx::FRAMESTATE_DONTCARE ) - sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 45b6609394c3..b3bea6567d1f 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -88,7 +88,6 @@ namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode; #define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")) #define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR ")) #define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE ")) -#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ")) #define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")) #define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")) #define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")) diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 341b2dd74cd4..5430a0b50432 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -25,7 +25,6 @@ #include "IClipBoardTest.hxx" #include "TypeInfo.hxx" -#define TABPAGESIZE 70 namespace dbaui { class OTableDesignView; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 2afdb912d3dc..b3b2c9815214 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -34,13 +34,6 @@ namespace connectivity namespace dbaui { - //================================================================== -#define SIZ_NONE 0 -#define SIZ_TOP 1 -#define SIZ_BOTTOM 2 -#define SIZ_LEFT 4 -#define SIZ_RIGHT 8 - #define BROW_FIELD_ROW 0 #define BROW_COLUMNALIAS_ROW 1 #define BROW_TABLE_ROW 2 diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 3d3981d232f4..b08ba4804877 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -99,9 +99,6 @@ struct splash #define PROGRESS_YOFFSET 18 #define PROGRESS_BARSPACE 2 -#define BMP_HEADER_LEN 14 -#define WIN_INFO_LEN 40 - #define UINT8( x ) ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) #define UINT16( x ) ( ( (unsigned int)( ( (uint8_t *)( x ) )[0] ) ) + \ @@ -114,13 +111,6 @@ struct splash #define MAX( x, y ) ( ( (x) > (y) )? (x): (y) ) -#define LOAD_FAILURE( msg ) \ - { \ - fprintf( stderr, "%s: " msg, filename ); \ - close( fd ); \ - return 0; \ - } - /* libpng-1.2.41 */ #ifndef PNG_TRANSFORM_GRAY_TO_RGB # define PNG_TRANSFORM_GRAY_TO_RGB 0x2000 diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 7a7b2173ec51..8e40e53fc5ba 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -37,11 +37,6 @@ // the implementation names #define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator" -// the registry key names -// a key under which this service will be registered, Format: -> "/ImplName/UNO/SERVICES/ServiceName" -// < Implementation-Name ></UNO/SERVICES/>< Service-Name > -#define REGKEY_NAME "/com.sun.star.datatransfer.DataFormatTranslator/UNO/SERVICES/com.sun.star.datatransfer.DataFormatTranslator" - //----------------------------------------------------------------------------------------------------------- // namespace directives //----------------------------------------------------------------------------------------------------------- diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 800794536337..fb6df2ef9c54 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -186,8 +186,6 @@ inline void ParaRange::Adjust() } } -#define OL_ROOTPARENT (Paragraph*)NULL - class EDITENG_DLLPUBLIC OutlinerView { friend class Outliner; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 05bc89956f21..58d0f7a4f21a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -32,8 +32,6 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#define USE_SVXFONT - #include <svtools/ctrltool.hxx> #include <editeng/svxfont.hxx> diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index b0328ab3ed4d..ac5a6de2cb69 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -37,9 +37,6 @@ DBG_NAME( EditUndo ) -#define MAX_UNDOS 100 // From this quantity it may be deleted .... -#define MIN_UNDOS 50 // so much has to be left ... - #define NO_UNDO 0xFFFF #define GROUP_NOTFOUND 0xFFFF diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index 93583505acbe..bd3362123d67 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -33,12 +33,6 @@ #include <editeng/editund2.hxx> #include <editeng/editdata.hxx> -#define UNDO_NOACTION 0 -#define UNDO_NEWUNDO 1 -#define UNDO_UNDOSDELETED 2 -#define UNDO_EMPTYGROUPDELETED 3 -#define UNDO_INVALIDEND 4 - class EditEngine; class EditView; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 5b039dd26f9b..6a42e4bb3716 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -46,9 +46,6 @@ using namespace com::sun::star; -#define FRAME_MARKER (sal_uInt32)0x21981357 -#define CHARSET_MARKER (FRAME_MARKER+1) - SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTextContent) { uno::Reference<beans::XPropertySet> xPropSet(xTextContent, uno::UNO_QUERY); diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index d564006ce90f..8c1c34ccd521 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -90,9 +90,6 @@ void SvxPrepareAutoCorrect( String &rOldText, String &rNewText ) #define SVX_LANG_MISSING 2 #define SVX_LANG_MISSING_DO_WARN 3 -#define SVX_FLAGS_NEW - - struct lt_LanguageType { bool operator()( LanguageType n1, LanguageType n2 ) const diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index d124a4a489e6..7247c63faeec 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -66,8 +66,6 @@ #include <cassert> using ::std::advance; -#define DEFAULT_SCALE 75 - static const sal_uInt16 nDefStyles = 3; // Special treatment for the first 3 levels static const sal_uInt16 nDefBulletIndent = 800; static const sal_uInt16 nDefBulletWidth = 700; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index b036674ff92d..9be49b7596eb 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -97,8 +97,6 @@ using namespace ::ucb; #define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) #define C2S(cChar) String::CreateFromAscii(cChar) -#define MAP_TOKEN ';' -#define PAIR_TOKEN ':' Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index d98bf5bbc577..99b68ad46f25 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -45,7 +45,6 @@ namespace dbp //......................................................................... #define BUTTON_HEIGHT 300 -#define TOP_HEIGHT 300 #define HEIGHT 450 #define OFFSET 300 #define MIN_WIDTH 600 diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index ea1f05015dca..a6ce20f64a78 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -70,8 +70,6 @@ #define PROPERTY_CLICK_HDL RTL_CONSTASCII_STRINGPARAM("MenuClickHDL") #define PROPERTY_SHOW_MENUICON RTL_CONSTASCII_STRINGPARAM("MenuIconVisible") -#define START_TIMER 1 - using namespace ::com::sun::star; //------------------------------------------------------------------------------ diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index bfe7ff22ff52..d052ce799703 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -35,7 +35,7 @@ #define PIECHART 21 /* Standard pie chart file. */ #define ORGCHART 26 /* Standard org chart file. */ #define TTLCHART 31 /* Title chart file. */ -#define BULCHART 32 /* Bullet chart file. */ +// BULCHART 32 /* Bullet chart file. */ #define TABCHART 33 /* Table chart file. */ #define DRWCHART 41 /* Chart with drawings only.*/ #define MLTCHART 42 /* Multiple chart file. */ @@ -44,16 +44,16 @@ #define SYMFILE 47 /* Symbol file. */ /* the following were added although SPC doesn't have a #define */ /* for them... */ -#define AUTOTTLCHT 95 /* Autobuild TTL CHT */ -#define AUTOBULCHT 96 /* Autobuild BUL CHT */ -#define AUTOTABCHT 97 /* Autobuild TAB CHT */ +// AUTOTTLCHT 95 /* Autobuild TTL CHT */ +// AUTOBULCHT 96 /* Autobuild BUL CHT */ +// AUTOTABCHT 97 /* Autobuild TAB CHT */ /* FNC 10/11/93: for the chart stream, ALLCHART was added. */ /* It is used specifically by PPT in its Template to let */ /* us know that the template applies to all charts, not to */ /* one specific chart type. */ #define ALLCHART 127 /* Applies to all chart types */ -#define ALLCHART_TPL 255 /* Applies to all chart types */ +// ALLCHART_TPL 255 /* Applies to all chart types */ #define IOC_CHTTITLE 1 /* Title for any chart. */ #define IOC_CHTFOOTNOTE 2 /* ::com::sun::star::text::Footnote for any chart. */ diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx index 0722375a98c4..a48dc5c0c4db 100644 --- a/filter/source/graphicfilter/icgm/main.hxx +++ b/filter/source/graphicfilter/icgm/main.hxx @@ -24,10 +24,11 @@ // --------------------------------------------------------------- -#define CGM_LEVEL1 0x0001 // VERSION 1 METAFILE -#define CGM_LEVEL2 0x0002 -#define CGM_LEVEL3 0x0003 -#define CGM_GDSF_ONLY 0x00F0 +// CGM_LEVEL1 0x0001 // VERSION 1 METAFILE +// CGM_LEVEL2 0x0002 +// CGM_LEVEL3 0x0003 +// CGM_GDSF_ONLY 0x00F0 +// CGM_GDSF_ONLY 0x00F0 #define CGM_UNKNOWN_LEVEL 0x00F1 #define CGM_UNKNOWN_COMMAND 0x00F2 #define CGM_DESCRIPTION 0x00F3 @@ -38,9 +39,6 @@ // ELEMENT #define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col ) -#define ALIGN2( _nElementSize ) { _nElementSize = ( _nElementSize + 1 ) & ~1; } -#define ALIGN4( _nElementSize ) { _nElementSize = ( _nElementSize + 3 ) & ~3; } -#define ALIGN8( _nElementSize ) { _nElementSize = ( _nElementSize + 7 ) & ~7; } #include <vcl/salbtype.hxx> #include <tools/stream.hxx> diff --git a/filter/source/msfilter/powerpoint/pptcom.hxx b/filter/source/msfilter/powerpoint/pptcom.hxx index 2228b0fdbf1b..f25e6adaab20 100644 --- a/filter/source/msfilter/powerpoint/pptcom.hxx +++ b/filter/source/msfilter/powerpoint/pptcom.hxx @@ -49,7 +49,6 @@ #define NMSP_LANG com::sun::star::lang #define NMSP_IO com::sun::star::io #define NMSP_SAX com::sun::star::xml::sax -#define NMSP_PRES com::sun::star::presentation #define NMSP_REGISTRY com::sun::star::registry #define NMSP_DOCUMENT com::sun::star::document @@ -58,7 +57,6 @@ #define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj > #define ANY NMSP_UNO::Any #define B2UCONST( _def_pChar ) (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar ))) -#define PPT_DTD_STRING B2UCONST( "<!DOCTYPE office:document-styles PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index d0de0a17a673..b2821b649a34 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -63,7 +63,6 @@ #define NMSP_UNO com::sun::star::uno #define NMSP_LANG com::sun::star::lang #define NMSP_SAX com::sun::star::xml::sax -#define NMSP_SVG com::sun::star::svg #define NMSP_REGISTRY com::sun::star::registry diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 6d095219aeee..666750f64857 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -33,9 +33,6 @@ namespace formula #define STRUCT_FOLDER 2 #define STRUCT_ERROR 3 -#define STRUCT_ERR_C1 1 -#define STRUCT_ERR_C2 2 - enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT }; //============================================================================ diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 682509d72d05..91153f429fe7 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -83,8 +83,6 @@ class SvtFileDialogFilter_Impl; #define SFX_EXTRA_SELECTION 0x00000080L #define SFX_EXTRA_IMAGE_TEMPLATE 0x00000100L -#define RET_MANAGER 100 - #define FILEDIALOG_FILTER_ALL "*.*" //***************************************************************************** diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index 63afcbb25d02..cce8a9d1b507 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -37,7 +37,6 @@ namespace framework{ #define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA") -#define XMLNS_ACCEL DECLARE_ASCII("accel") #define XMLNS_XLINK DECLARE_ASCII("xlink") // same items with a name space alias diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 8b128938dd85..27ac1f45e6db 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -47,7 +47,6 @@ #define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" #define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" #define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index cd3d2ca756e3..a53527bdbdcf 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -521,7 +521,6 @@ static sal_Int16 natnum2[] = { static sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2); #define isLang(lang) rLocale.Language.equalsAsciiL(lang, 2) -#define isCtry(ctry) rLocale.Country.equalsAsciiL(ctry, 2) static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) { diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 138846016b02..9fe265639bff 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -136,11 +136,6 @@ sal_Bool MergeData::operator==( ResData *pData ) // class MergeDataFile // -#define FFORMAT_UNKNOWN 0x0000 -#define FFORMAT_NEW 0x0001 -#define FFORMAT_OLD 0x0002 - - MergeDataFile::MergeDataFile( const rtl::OString &rFileName, const rtl::OString &rFile, diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index 9b2885a2419b..f1e0e4565e69 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -34,18 +34,6 @@ # define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #endif -#define OU2A(rtlOUString) \ - ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \ - RTL_TEXTENCODING_ASCII_US).getStr() - -#define OU2UTF8(rtlOUString) \ - ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \ - RTL_TEXTENCODING_UTF8).getStr() - -#define OU2ISO_1(rtlOUString) \ - ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \ - RTL_TEXTENCODING_ISO_8859_1).getStr() - #define OU2ENC(rtlOUString, rtlEncoding) \ ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \ rtlEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr() diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index ee41fe4fd52c..b46cef201041 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -69,7 +69,6 @@ class LocaleDataWrapper; #define SN_LINGU_SERVCICE_MANAGER "com.sun.star.linguistic2.LinguServiceManager" #define SN_LINGU_PROPERTIES "com.sun.star.linguistic2.LinguProperties" #define SN_DICTIONARY_LIST "com.sun.star.linguistic2.DictionaryList" -#define SN_OTHER_LINGU "com.sun.star.linguistic2.OtherLingu" #define SN_DESKTOP "com.sun.star.frame.Desktop" diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx index 9dee58cafc4c..a6b91543ef01 100644 --- a/oox/inc/oox/export/utils.hxx +++ b/oox/inc/oox/export/utils.hxx @@ -33,8 +33,6 @@ #define US(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x )) #define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr() #define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr() -#define H32S(x) rtl::OString::valueOf( (sal_Int32) x, 16 ).getStr() -#define H64S(x) rtl::OString::valueOf( (sal_Int64) x, 16 ).getStr() #define IS(x) rtl::OString::valueOf( x ).getStr() #define USS(x) rtl::OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index bc759ceeb473..d252c17309f3 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -39,8 +39,6 @@ class Config; -#define PSPRINT_PPDDIR "driver" - namespace padmin { class DelMultiListBox : public MultiListBox diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx index 8fdadef2c1f3..004add26f255 100644 --- a/regexp/source/reclass.cxx +++ b/regexp/source/reclass.cxx @@ -174,8 +174,6 @@ /* (Re)Allocate N items of type T using malloc, or fail. */ #define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t))) #define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t))) -#define RETALLOC_IF(addr, n, t) \ - if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t) #define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t))) #define BYTEWIDTH 16 /* In bits (assuming sizeof(sal_Unicode)*8) */ diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index cb9d6c8bf4c1..280b7ece317f 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -75,10 +75,6 @@ #define MAX_ARGS 255 #define MAX_ENVS 255 -#if defined(MACOSX) || defined(IOS) || defined(IORESOURCE_TRANSFER_BSD) || defined(AIX) -#define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(int)) -#endif - /****************************************************************************** * * Data Type Definition diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index 86975221db1a..f3a5f8a928ff 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -85,8 +85,6 @@ # define ACT_ABORT ACT_SYSTEM #endif -#define MAX_PATH_LEN 2048 - #if defined(HAVE_MEMCHECK_H) #include <memcheck.h> #endif diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index 939e6df92f90..15b9a622f234 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -57,11 +57,6 @@ const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS const sal_Char pBuffer_Number[] = "1234567890"; const sal_Char pBuffer_Blank[] = ""; -#define TRUNC_LEN 10; -#define ENLARG_LEN 100; - - - //------------------------------------------------------------------------ // OS dependent/independent definitions/includes // we use FILE_PREFIX for URL prefix, diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index 0ec2fe9600c3..22f05b840bae 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -51,8 +51,6 @@ using namespace osl; using namespace rtl; -#define MAXIMPATH 256 - rtl::OUString root; rtl::OUString dir1; diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 26598db91b80..526c9d5c20b2 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -120,7 +120,6 @@ const SCROW SCROWS64K = 65536; // === old stuff defines ===================================================== #define MAXROW_30 8191 -#define MAXROW_40 31999 #ifdef SC_LIMIT_ROWS #undef MAXROWCOUNT_DEFINE @@ -135,7 +134,6 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1; #define VALIDROW(nRow) (ValidRow(nRow)) #define VALIDTAB(nTab) (ValidTab(nTab)) #define VALIDCOLROW(nCol,nRow) (ValidColRow(nCol,nRow)) -#define VALIDCOLROWTAB(nCol,nRow,nTab) (ValidColRowTab(nCol,nRow,nTab)) // === old stuff defines end ================================================= diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index e969ffb859de..6f776e1cc810 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -68,9 +68,6 @@ class ScFlatBoolRowSegments; struct ScSetStringParam; struct ScColWidthParam; -#define COLUMN_DELTA 4 - - struct ScNeededSizeOptions { const ScPatternAttr* pPattern; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 03451d1e7336..1f29753acf6b 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -115,8 +115,6 @@ const SCSIZE MAXSUBTOTAL = 3; #define POINTS_PER_INCH TEX_POINTS_PER_INCH #endif #define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) -#define INCH_PER_CM (1.0 / CM_PER_INCH) -#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH) #define TWIPS_PER_POINT 20.0 #define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) #define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH) @@ -161,14 +159,6 @@ namespace sc #define SC_SIZE_OPTIMUM 0xFFFF - // update flags -#define UF_SCROLL_LEFT 1 -#define UF_SCROLL_RIGHT 2 -#define UF_SCROLL_UP 4 -#define UF_SCROLL_DOWN 8 -#define UF_ROW 16 -#define UF_VIEW 32 - // repaint flags (for messages) #define PAINT_GRID 1 #define PAINT_TOP 2 @@ -221,8 +211,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); #define PASTE_MUL 3 #define PASTE_DIV 4 -#define PASTE_NONEMPTY 5 - // bits for HasAttr #define HASATTR_LINES 1 #define HASATTR_MERGED 2 @@ -282,11 +270,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); // is bit set in set? #define IS_SET(bit,set)(((set)&(bit))==(bit)) -#define SEL_ALL -1 // input line: select all -#define RES_CANCEL 0 // results of function AutoPilot pages -#define RES_BACKWARD 1 -#define RES_END 2 - enum CellType { CELLTYPE_NONE, diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 8446e78d2a96..a4cee2cb8816 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -53,7 +53,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #define PIVOT_DATA_FIELD (MAXCOLCOUNT) -#define PIVOT_FUNC_REF (MAXCOLCOUNT) #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/sheet/DataPilotFieldReference.hpp> #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp> diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index edaee012d7e3..687f0f339014 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -44,16 +44,6 @@ struct OldSingleRefBools sal_uInt8 bOldFlag3D; // two sal_Bool flags (see further down) }; -#define SR_ABSOLUTE 0 // Absolute value -#define SR_RELABS 1 // Relative value as absolute value (until release 3.1) -#define SR_RELATIVE 2 // Relative value as delta value (after release 3.1) -#define SR_DELETED 3 // Deleted col/row/tab - -#define SRF_3D 0x01 // 3D reference, was the sal_Bool (before build 304a) -#define SRF_RELNAME 0x02 // Reference derived from RangeName with relative values -#define SRF_BITS 0x03 // Mask of possible bits - - struct SC_DLLPUBLIC ScSingleRefData // Single reference (one address) into the sheet { SCsCOL nCol; // Absolute values diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 35f7743cb047..6caa83cd335c 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -490,17 +490,6 @@ struct Sc10ChartSheetData sal_Char Reserved[64]; }; -#define AGPie2D 1 // Pie Chart 2D -#define AGPie3D 2 // Pie Chart 3D -#define AGBar2D 3 // Bar Chart 2D -#define AGBar3D 4 // Bar Chart 3D -#define AGGantt 5 // Gantt Diagramm -#define AGLine 6 // Line Chart -#define AGLogLine 7 // Logarythmic-Coordinate Chart -#define AGArea 8 // Area Chart -#define AGHLC 11 // High-Low-Close Chart -#define AGPolar 10 // Polar-Coordinate Chart - typedef sal_Char Sc10ChartText[30]; struct Sc10ChartTypeData diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 4a08a9d545b4..e567e4c67967 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -36,7 +36,6 @@ // --------------------------------------------------------------------------- -#define SC_SLIDER_SIZE 2 #define SC_SMALL3DSHADOW COL_BLACK #define SC_SIZE_NONE 65535 const SCCOL SC_TABSTART_NONE = SCCOL_MAX; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index e262d6ba164d..bbd195ac4849 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -550,8 +550,6 @@ ScNavigatorSettings::ScNavigatorSettings() : SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) -#define IS_MODE(bit)(((nFlags)&(bit))==(bit)) - ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( Window* pParent, sal_uInt16 nId, diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 22d5060a519d..224b2cf4f168 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -79,12 +79,6 @@ using ::std::auto_ptr; -#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() ) -#define GET_STRING(nid) ((const SfxStringItem&)pReqArgs->Get(nid)).GetValue() -#define GET_UINT16(nid) ((const SfxUInt16Item&)pReqArgs->Get(nid)).GetValue() -#define GET_BOOL(nid) ((const SfxBoolItem&)pReqArgs->Get(nid)).GetValue() -#define RECALC_PAGE(pDocSh) ScPrintFunc( pDocSh, GetPrinter(), nCurTab ).UpdatePages() - //------------------------------------------------------------------ /** Try to parse the given range using Calc-style syntax first, then diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx index 0248e79d4b40..07b18d070577 100644 --- a/scaddins/source/analysis/analysisdefs.hxx +++ b/scaddins/source/analysis/analysisdefs.hxx @@ -36,7 +36,6 @@ #define THROWDEF_RTE_IAE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException) #define THROW_IAE throw ::com::sun::star::lang::IllegalArgumentException() #define THROWDEF_RTE_IAE_NCE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException,::com::sun::star::sheet::NoConvergenceException) -#define THROW_NCE throw ::com::sun::star::sheet::NoConvergenceException() #define CHK_Freq ( nFreq != 1 && nFreq != 2 && nFreq != 4 ) #define CHK_FINITE(d) if( !::rtl::math::isFinite( d ) ) THROW_IAE diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 24ecbd101e1e..bad6e2124dfe 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -43,7 +43,6 @@ class ScaAnyConverter; #define PI 3.1415926535897932 -#define PI_2 (PI/2.0) #define EOL ( ( const sal_Char* ) 1 ) #define EOE ( ( const sal_Char* ) 2 ) diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 1be31fcadb52..e009712df8a7 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -26,10 +26,6 @@ //------------------------------------------------------------------ -#define DIA_SLOW 0 -#define DIA_MEDIUM 1 -#define DIA_FAST 2 - #define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0 #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1 #define SD_IF_SDVIEWSHELL SFX_INTERFACE_SD_START + 2 diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 42c48d3e7815..043907769dd5 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -137,9 +137,6 @@ const char *pButtonNames[NUM_BUTTONS] = #define BTN_MORE 10 #define BTN_LESS 11 -// Fuer Detectfilter -#define CALC_OPTIONS "9,34,SYSTEM" - // ********************************************************************* // Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote // ********************************************************************* diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index cda852dd40a9..9092a09f777f 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -47,12 +47,6 @@ namespace sd { -#define FADE_STEP "FadeSteps" -#define FADE_ATTRIB "FadeAttributes" -#define FADE_ORIENT "FadeOrientation" -#define FADE_TRUE "true" -#define FADE_FALSE "false" - MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) : ModalDialog ( pParent, SdResId( DLG_MORPH ) ), aGrpPreset ( this, SdResId( GRP_PRESET ) ), diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 30768af8131e..0628fe7bcaa1 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -71,8 +71,6 @@ #include "SlideSorter.hxx" #include "controller/SlideSorterController.hxx" -#define RET_DELETE 100 - namespace sd { /************************************************************************* diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 5bb5f17453e9..d11154971b79 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -48,8 +48,6 @@ class SfxObjectShell; class SvxMacroTableDtor; -#define SFX_NO_EVENT USHRT_MAX - struct SFX2_DLLPUBLIC SfxEventName { sal_uInt16 mnId; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 2a6980a6069a..70d3468f2c52 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -196,21 +196,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem 0, 0, 0, 0, 0, 0, 0 \ } -#define SFX_SLOT_ATTR( id, GroupId, Dummy, ExecMethodPtr, StateMethodPtr, Flags, ItemClass ) \ - { id, GroupId, id, Flags, \ - USHRT_MAX, 0, \ - ExecMethodPtr, \ - StateMethodPtr, \ - (const SfxType*) &a##ItemClass##_Impl, \ - 0, 0, 0, 0, 0, 0, 0 \ - } - -#define SFX_SLOT_ENUM( SlaveId, GroupId, MasterId, Value, Flags ) \ - { SlaveId, GroupId, id, Flags, \ - MasterId, Value, 0, 0, \ - (const SfxType*) &aSfxBoolItem_Impl, \ - 0, 0, 0, 0, 0, 0, 0 \ - } #define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext, ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs, Name, Prop, UnoName ) \ { id, GroupId, hid, Flags | Prop, \ USHRT_MAX, 0, \ diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index 48273cdea55c..180b6418d0c4 100644 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -41,10 +41,6 @@ struct SfxPrintProgress_Impl; // ------------------------------------------------------------------------ -#define PAGE_MAX 9999 // max. Number of pages to be printed - -// ------------------------------------------------------------------------ - struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog { diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 444445115d04..3b9cd64f5b2c 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -119,7 +119,6 @@ #define XCOMPONENT ::com::sun::star::lang::XComponent #define XMODEL ::com::sun::star::frame::XModel #define XMODEL2 ::com::sun::star::frame::XModel2 -#define XMODIFIABLE ::com::sun::star::util::XModifiable #define XMODIFIABLE2 ::com::sun::star::util::XModifiable2 #define XMODIFYBROADCASTER ::com::sun::star::util::XModifyBroadcaster #define XMODIFYLISTENER ::com::sun::star::util::XModifyListener @@ -161,7 +160,6 @@ #define MUTEX ::osl::Mutex #define UNOTYPE ::com::sun::star::uno::Type #define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier -#define XINDEXACCESS ::com::sun::star::container::XIndexAccess #define XTRANSFERABLE ::com::sun::star::datatransfer::XTransferable #define DATAFLAVOR ::com::sun::star::datatransfer::DataFlavor diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 09b242d8ce28..2af76a236f98 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -149,7 +149,7 @@ using namespace ::comphelper; #define TBI_SEARCHDIALOG 1008 #define TBI_SOURCEVIEW 1009 #define TBI_SELECTIONMODE 1010 -#define TBI_ONSTARTUP 1011 +// TBI_ONSTARTUP 1011 #define CONFIGNAME_HELPWIN DEFINE_CONST_UNICODE("OfficeHelp") #define CONFIGNAME_INDEXWIN DEFINE_CONST_UNICODE("OfficeHelpIndex") diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx index 48db15ed5369..390d2b722b47 100644 --- a/sfx2/source/inc/doctemplates.hxx +++ b/sfx2/source/inc/doctemplates.hxx @@ -49,7 +49,6 @@ #define XLOCALIZABLE ::com::sun::star::lang::XLocalizable #define XMODEL ::com::sun::star::frame::XModel #define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define XNAMEACCESS ::com::sun::star::container::XNameAccess #define XSERVICEINFO ::com::sun::star::lang::XServiceInfo #define XSTORABLE ::com::sun::star::frame::XStorable diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 4a43c1f88854..63184fe1fb3f 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -70,13 +70,11 @@ namespace comphelper #define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster #define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener #define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier -#define XJOBEXECUTOR ::com::sun::star::task::XJobExecutor #define EVENTOBJECT ::com::sun::star::lang::EventObject #define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException #define WRAPPEDTARGETEXCEPTION ::com::sun::star::lang::WrappedTargetException #define ANY ::com::sun::star::uno::Any #define REFERENCE ::com::sun::star::uno::Reference -#define WEAKREFERENCE ::com::sun::star::uno::WeakReference #define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException #define SEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 980ae1fa9783..4dd20fead15b 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -148,13 +148,6 @@ struct StringList_Impl : private Resource }; -#define SFX_DEL_PTRARR(pArr) \ - { \ - for ( sal_uInt16 n = (pArr)->Count(); n--; ) \ - delete (pArr)->GetObject(n); \ - DELETEX(pArr); \ - } - class SfxBoolResetter { sal_Bool& _rVar; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index f4b1a7d93d13..9848c94cafb2 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -98,9 +98,6 @@ #define EVENTOBJECT ::com::sun::star::lang::EventObject #define OTYPECOLLECTION ::cppu::OTypeCollection #define OIMPLEMENTATIONID ::cppu::OImplementationId -#define MUTEXGUARD ::osl::MutexGuard -#define UNOQUERY ::com::sun::star::uno::UNO_QUERY -#define MAPPING ::com::sun::star::uno::Mapping #define XCOMPONENT ::com::sun::star::lang::XComponent #define XINTERFACE ::com::sun::star::uno::XInterface #define XKEYHANDLER ::com::sun::star::awt::XKeyHandler diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index f2948df173f2..05524bb7a640 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -17,79 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - -#define ITEMID_PTR 0 -#define ITEMID_SHADOW 0 -#define ITEMID_PAGE 0 -#define ITEMID_SETITEM 0 -#define ITEMID_HORJUSTIFY 0 -#define ITEMID_VERJUSTIFY 0 -#define ITEMID_ORIENTATION 0 -#define ITEMID_MARGIN 0 -#define ITEMID_AUTHOR 0 -#define ITEMID_DATE 0 -#define ITEMID_TEXT 0 -#define ITEMID_SPELLCHECK 0 -#define ITEMID_HYPHENREGION 0 -#define ITEMID_FONT 0 -#define ITEMID_FONTHEIGHT 0 -#define ITEMID_BRUSH 0 -#define ITEMID_BOX 0 -#define ITEMID_LINE 0 -#define ITEMID_LINESPACING 0 -#define ITEMID_ADJUST 0 -#define ITEMID_WIDOWS 0 -#define ITEMID_ORPHANS 0 -#define ITEMID_HYPHENZONE 0 -#define ITEMID_TABSTOP 0 -#define ITEMID_FMTSPLIT 0 -#define ITEMID_PAGEMODEL 0 -#define ITEMID_FONTLIST 0 -#define ITEMID_POSTURE 0 -#define ITEMID_WEIGHT 0 -#define ITEMID_FONTWIDTH 0 -#define ITEMID_UNDERLINE 0 -#define ITEMID_CROSSEDOUT 0 -#define ITEMID_SHADOWED 0 -#define ITEMID_AUTOKERN 0 -#define ITEMID_WORDLINEMODE 0 -#define ITEMID_CONTOUR 0 -#define ITEMID_PROPSIZE 0 -#define ITEMID_COLOR 0 -#define ITEMID_CHARSETCOLOR 0 -#define ITEMID_KERNING 0 -#define ITEMID_CASEMAP 0 -#define ITEMID_ESCAPEMENT 0 -#define ITEMID_LANGUAGE 0 -#define ITEMID_NOLINEBREAK 0 -#define ITEMID_NOHYPHENHERE 0 -#define ITEMID_SEARCH 0 -#define ITEMID_COLOR_TABLE 0 -#define ITEMID_GRADIENT_LIST 0 -#define ITEMID_HATCH_LIST 0 -#define ITEMID_BITMAP_LIST 0 -#define ITEMID_DASH_LIST 0 -#define ITEMID_LINEEND_LIST 0 -#define ITEMID_NUMBERINFO 0 -#define ITEMID_CHARTSTYLE 0 -#define ITEMID_CHARTDATADESCR 0 -#define ITEMID_CHARTLEGENDPOS 0 -#define ITEMID_CHARTTEXTORDER 0 -#define ITEMID_CHARTTEXTORIENT 0 -#define ITEMID_DOUBLE 0 -#define ITEMID_PAPERBIN 0 -#define ITEMID_SIZE 0 -#define ITEMID_LRSPACE 0 -#define ITEMID_ULSPACE 0 -#define ITEMID_PRINT 0 -#define ITEMID_OPAQUE 0 -#define ITEMID_PROTECT 0 -#define ITEMID_MACRO 0 -#define ITEMID_BOXINFO 0 -#define ITEMID_FMTBREAK 0 -#define ITEMID_FMTKEEP 0 - #define CharSetItem SfxVoidItem #define FontFamilyItem SfxVoidItem #define FontPitchItem SfxVoidItem diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 2dc4cf2731a3..21257809a4cd 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -74,9 +74,6 @@ class IcnGridMap_Impl; // for the bounding rectangle #define LROFFS_BOUND 2 #define TBOFFS_BOUND 2 -// distance focus rectangle to icon -#define LROFFS_ICON 2 -#define TBOFFS_ICON 2 // distance icon to text #define HOR_DIST_BMP_STRING 3 #define VER_DIST_BMP_STRING 3 diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index 1f07b83a2b49..3f59d6a3e014 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -140,7 +140,6 @@ extern SgfFontLst* pSgfFonts; #define EscReset '\x1f' /* Flag loeschen */ #define EscDeflt '\x11' /* Flag auf default setzen */ #define EscToggl '\x1d' /* Flag Toggeln */ -#define EscRelat '%' #define EscNoFlg 0 #define EscNoVal -2147483647 /* -MaxLongInt */ //============================================================================== @@ -151,7 +150,6 @@ extern SgfFontLst* pSgfFonts; #define ChrXPosArrSize (MaxLineChars+1+1) /* 2k - Beginnt mit 0 im gegensatz zu StarDraw */ #define CharLineSize (MaxLineChars+1+1) -#define EscStr (UCHAR[MaxEscLen+1]); #define MinChar 32 #define MaxChar 255 diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx index a4886908fc86..8e2194c280cb 100644 --- a/svtools/source/filter/wmf/winmtf.hxx +++ b/svtools/source/filter/wmf/winmtf.hxx @@ -78,8 +78,8 @@ #define NULL_PEN 8 #define OEM_FIXED_FONT 10 // ANSI_FIXED_FONT 11 -#define ANSI_VAR_FONT 12 -#define SYSTEM_FONT 13 +// ANSI_VAR_FONT 12 +// SYSTEM_FONT 13 // DEVICE_DEFAULT_FONT 14 // DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index c21bef0631e8..0e85f0f2c8c3 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -186,16 +186,6 @@ private: SVX_DLLPRIVATE void SetAccessibleNames (void); }; -/************************************************************************* -|* -|* Defines -|* -\************************************************************************/ - -#define SVXBMPMASK() ( (SvxBmpMask*) ( SfxViewFrame::Current()->GetChildWindow( \ - SvxBmpMaskChildWindow::GetChildWindowId() )-> \ - GetWindow() ) ) - #endif // _BMPMASK_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index f8fdbeec2540..34233ab30ade 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -101,16 +101,6 @@ public: const sal_uIntPtr nFlags = 0L ); }; -/************************************************************************* -|* -|* Defines -|* -\************************************************************************/ - -#define SVXCONTOURDLG() ( (SvxContourDlg*) ( SfxViewFrame::Current()->GetChildWindow( \ - SvxContourDlgChildWindow::GetChildWindowId() )-> \ - GetWindow() ) ) - #endif // _REDUCED_CONTDLG_HXX_ #endif // _CONTDLG_HXX_ diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx index e334b9c3d5eb..d5d495153a7b 100644 --- a/svx/inc/svx/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -22,10 +22,6 @@ #include <tools/solar.h> -#define E3D_STREAMING - -const double PrecisionLimit = 1.0e-14; - const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ sal_uInt32('3')*0x00000100+ sal_uInt32('D')*0x00010000+ diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index e8d6f2356bca..645e081ab5a8 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -57,9 +57,7 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> - #include <svx/gallery.hxx> -#define GALLERY_THEME "3D" #include <svl/whiter.hxx> #include <svx/float3d.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 8ea566fa592d..078ed6a0f7bb 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -40,7 +40,6 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdouno.hxx> -#define XOR_CREATE_PEN PEN_SOLID #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ce624e0cb435..a71db0bf0fa2 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1798,7 +1798,6 @@ void SdrObject::BurnInStyleSheetAttributes() GetProperties().ForceStyleToHardAttributes(); } -#define Imp2ndKennung (0x434F4D43) SdrObjUserData* SdrObject::ImpGetMacroUserData() const { SdrObjUserData* pData=NULL; diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 91c8158ce036..eb22171228ca 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -50,14 +50,11 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_INSERT (SID_SW_START + 300) #define FN_FORMAT (SID_SW_START + 400) #define FN_EXTRA (SID_SW_START + 600) -#define FN_WINDOW (SID_SW_START + 700) -#define FN_HELP (SID_SW_START + 800) #define FN_SELECTION (SID_SW_START + 900) #define FN_QUERY (SID_SW_START + 1000) #define FN_ENVELP (SID_SW_START + 1050) #define FN_PARAM (SID_SW_START + 1100) #define FN_STAT (SID_SW_START + 1180) -#define FN_PRNOPT (SID_SW_START + 1200) #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_FRAME (SID_SW_START + 1300) #define FN_INSERT2 (SID_SW_START + 1400) @@ -79,52 +76,24 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_UNO_RANGE_BEGIN FN_FORMAT2 #define FN_UNO_RANGE_END (FN_PARAM2 + 199) -#define HELP_OFFSET 1100 -#define CMD_STR_OFFSET 2200 -#define CMDID_END 5500 - /*-------------------------------------------------------------------- Region: File --------------------------------------------------------------------*/ -#define FN_CLOSE_FILE (FN_FILE + 1 ) /* Close */ - #define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Create Global Document */ -#define FN_NEW_FILE (FN_FILE + 5 ) /* New */ #define FN_OPEN_FILE (FN_FILE + 7 ) /* Open */ -#define FN_EDIT_FILE (FN_FILE + 8 ) /* Open or ToTop */ - -#define FN_INETFILE (FN_FILE + 9 ) /* Internet File-Dialog */ - -#define FN_PRINT_FILE (FN_FILE + 10) /* Print */ -#define FN_SAVE_FILE (FN_FILE + 13) /* Save */ -#define FN_EXIT (FN_FILE + 17) /* Close Writer */ - -#define FN_DOC_MGR_DLG (FN_FILE + 32) /* Document-Manager */ - -#define FN_GET_DOCSTAT (FN_FILE + 33) /* Get document statistics */ #define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Send outline to impress */ #define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37) /* Send outline to clipboard */ #define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* Create HTML document */ -#define FN_APP_START (FN_FILE + 98) /* Macro for App.Start */ -#define FN_APP_END (FN_FILE + 99) /* Macro for App.End */ - /*-------------------------------------------------------------------- Region: Edit --------------------------------------------------------------------*/ -#define FN_CLEAR (FN_EDIT + 1 ) /* Clear */ -#define FN_COPY (FN_EDIT + 2 ) /* Copy */ -#define FN_CUT (FN_EDIT + 3 ) /* Cut */ #define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Edit field */ -#define FN_EDIT_LINK (FN_EDIT + 8 ) /* Edit link */ #define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Edit link dialog */ -#define FN_GOTO (FN_EDIT + 11) /* Go to */ -#define FN_PASTE (FN_EDIT + 13) /* Paste */ #define FN_NUMBER_BULLETS (FN_EDIT + 21) /* Bullets */ -#define FN_REPEAT (FN_EDIT + 22) /* Repeat last */ #define FN_EDIT_IDX_ENTRY_DLG (FN_EDIT + 23) /* Edit Index-Entry */ #define FN_UPDATE_FIELDS (FN_EDIT + 26) /* Update fields */ #define FN_EXECUTE_MACROFIELD (FN_EDIT + 27) /* Execute macrofield */ @@ -234,7 +203,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_SET_PAGE (FN_VIEW + 29) /* Set page template to paragraph */ // more Navigator -#define FN_CONTENT_LB (FN_VIEW + 32) /**/ #define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/ #define FN_SHOW_ROOT (FN_VIEW + 34) /**/ #define FN_DROP_REGION (FN_VIEW + 35) /**/ @@ -290,7 +258,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_POSTIT (FN_INSERT + 29) /* Insert/edit PostIt */ #define FN_INSERT_TABLE (FN_INSERT + 30) /* Insert Table */ #define FN_INSERT_STRING (FN_INSERT+31) -#define FN_INSERT_COLS (FN_INSERT + 32) /* Insert Columns */ #define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33) /* Insert interactive frame */ #define FN_INSERT_FRAME (FN_INSERT + 34) /* Insert Frame */ @@ -364,21 +331,13 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* superscript */ #define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* subscript */ -#define FN_SET_CASEMAP (FN_FORMAT + 14) /* CaseMap */ -#define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */ - #define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* mirror horizontally */ #define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* mirror vertically */ -#define FN_SET_ADJUST (FN_FORMAT + 28) /* parametrized alignemnt */ - -#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */ -#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */ #define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */ #define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */ #define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* columns per page */ #define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* background */ -#define FN_FORMAT_PAGE (FN_FORMAT + 51) /* page */ #define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* page */ #define FN_FORMAT_COLUMN (FN_FORMAT + 53) /* columns */ #define FN_FORMAT_DROPCAPS (FN_FORMAT + 54) /* initials */ @@ -499,8 +458,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */ -#define FN_IS_IMAGE (FN_FORMAT2 + 6) /* numbering: with graphic? */ - #define FN_GOTO_NEXT_REGION (FN_FORMAT2 + 9) /* */ #define FN_GOTO_PREV_REGION (FN_FORMAT2 + 10) /* */ @@ -559,21 +516,14 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */ #define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* */ #define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* learn words */ -#define FN_NUMBERING (FN_EXTRA + 9 ) /* numbering/bullets*/ #define FN_NUMBERING_OUTLINE_DLG (FN_EXTRA + 12) /* */ #define FN_SORTING_DLG (FN_EXTRA + 14) /* */ #define FN_CALCULATE (FN_EXTRA + 15) /* */ #define FN_GLOSSARY_DLG (FN_EXTRA + 20) /* text building blocks */ -#define FN_PLAY_MACRO (FN_EXTRA + 23) /* run macro */ #define FN_EXPAND_GLOSSARY (FN_EXTRA + 28) /* expand text building blocks */ -#define FN_CONFIG_MENU (FN_EXTRA + 30) /* configure menu */ -#define FN_CONFIG_KEY (FN_EXTRA + 31) /* configure keyboard */ #define FN_CHANGE_PAGENUM (FN_EXTRA + 34) /* change page numbers*/ -#define FN_MACRO_POPUP (FN_EXTRA + 37) /* all macro functions*/ -#define FN_BULLET (FN_EXTRA + 38) /* bullet list */ - // Region: Glossary #define FN_AUTO_CORRECT (FN_EXTRA + 49 ) /* Autocorrect from Basic */ @@ -584,16 +534,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_NAVIGATION_PI_GOTO_PAGE (FN_EXTRA + 59 ) /* goto page from navigation-PI */ -#define FN_RESERVED_9 (FN_EXTRA + 86) /* place holder */ -#define FN_RESERVED_8 (FN_EXTRA + 87) /* place holder */ -#define FN_RESERVED_7 (FN_EXTRA + 88) /* place holder */ -#define FN_RESERVED_6 (FN_EXTRA + 89) /* place holder */ -#define FN_RESERVED_5 (FN_EXTRA + 90) /* place holder */ -#define FN_RESERVED_4 (FN_EXTRA + 91) /* place holder */ -#define FN_RESERVED_3 (FN_EXTRA + 92) /* place holder */ -#define FN_RESERVED_2 (FN_EXTRA + 93) /* place holder */ -#define FN_RESERVED_1 (FN_EXTRA + 94) /* place holder */ - #define FN_COLL_TYPE (FN_EXTRA + 98) /* type for GlobalDoc-Collection*/ #define FN_COLL_ADD (FN_EXTRA + 99) @@ -824,8 +764,6 @@ included in c-context files, so c++ style stuff will cause problems. QUERY-Block --------------------------------------------------------------------*/ -#define FN_IS_MODIFIED (FN_QUERY +16) /* Was the document modified? */ - #define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */ #define FN_GET_PRINT_AREA (FN_QUERY +32) /* Get attribute for printable area of page */ @@ -845,7 +783,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_ENVELOP (FN_ENVELP ) - #define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1) #define FN_DELETE_ALL_NOTES (FN_NOTES+2) #define FN_HIDE_NOTE (FN_NOTES+3) @@ -872,7 +809,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_MOVE_SELECTION (FN_PARAM+3) #define FN_PARAM_ADDPRINTER (FN_PARAM+18) -#define FN_PARAM_GRID (FN_PARAM+19) #define FN_PARAM_DOCDISP (FN_PARAM+20) #define FN_PARAM_ELEM (FN_PARAM+21) #define FN_PARAM_SWTEST (FN_PARAM+22) @@ -886,10 +822,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_REGION_EDIT_IN_READONLY (FN_PARAM+28) #define FN_PARAM_INSERT_AFTER (FN_PARAM+29) -#define FN_PARAM_WIDTH (FN_PARAM+39) -#define FN_PARAM_DIR (FN_PARAM+41) -#define FN_PARAM_COUNT (FN_PARAM+42) -#define FN_PARAM_COLOR (FN_PARAM+43) #define FN_PARAM_TABLE_NAME (FN_PARAM+44) #define FN_PARAM_TABLE_HEADLINE (FN_PARAM+50) @@ -900,8 +832,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_FIELD_SUBTYPE (FN_PARAM+56) #define FN_PARAM_FIELD_FORMAT (FN_PARAM+57) -#define FN_PARAM_EVENT (FN_PARAM+68) -#define FN_PARAM_URL (FN_PARAM+69) #define FN_PARAM_GRF_REALSIZE (FN_PARAM+70) #define FN_PARAM_GRF_DIALOG (FN_PARAM+71) #define FN_INET_FIELD_MACRO (FN_PARAM+77) /* Id for URL-Field-Macros*/ @@ -918,12 +848,8 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* predefined numbering */ -#define FN_PARAM_DIST (FN_PARAM2+7) /* and width, for metric transformation */ - #define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* for ShadowCursor options */ -#define FN_PARAM_10 (FN_PARAM2+11) - #define FN_TEXT_RANGE (FN_PARAM2+12) /* TextRange Property*/ #define FN_PARAM_CRSR_IN_PROTECTED (FN_PARAM2+13) /* Cursor in protected areas */ @@ -1013,10 +939,6 @@ included in c-context files, so c++ style stuff will cause problems. #define MID_12 0xf9 #define MID_13 0xfa -#ifndef SID_SW_DOCMAN_PATH -#define SID_SW_DOCMAN_PATH (SID_OFASLOTS_START + 6) -#endif - // defines for Event-assignments per Macro #define MAC_EVENT_MOUSEOVER 0x01 // #define MAC_EVENT_MOUSECLICK 0x02 // diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 7d45201616d8..e9e7ab889e06 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -79,8 +79,6 @@ using namespace com::sun::star; -#define DEFTEXTSIZE 12 - extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index fdeb6c9ec58b..b84066f035d1 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -60,10 +60,6 @@ #define ACT_NEXT_SECT 8 #define ACT_PREV_SECT 9 -#define SNAP_LOWER 0x00000001 -#define SNAP_FLYFRAMES 0x00000002 -#define SNAP_TABLECONT 0x00000004 - #ifdef DBG_UTIL #include "swtypes.hxx" diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index e8da527c89bc..fc292b5662c4 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -33,8 +33,6 @@ #include "cntfrm.hxx" #include "ndtxt.hxx" -#define STRSIZE(x) (sizeof(x)-1) - class SwCharRange; class SwTxtNode; class SwTxtFormatter; @@ -56,12 +54,6 @@ class SwScriptInfo; class SwViewOption; class SwWrongList; -#define GRID_ON 0 -#define GRID_HEIGHT 1 -#define RUBY_HEIGHT 2 -#define RUBY_TOP 3 -#define GRID_CELLS 4 - /// Represents the visualization of a paragraph. class SwTxtFrm: public SwCntntFrm { diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 7a6fba1f1e6b..8cf1e079fa91 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -83,8 +83,6 @@ namespace { static bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, xub_StrLen &rPos ); } -#define MAX_TXTPORLEN 300 - inline void ClearFly( SwTxtFormatInfo &rInf ) { delete rInf.GetFly(); diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index ac4fce17a23f..c290254d1e6f 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -80,8 +80,6 @@ #define ENV_NEWDOC RET_OK #define ENV_INSERT RET_USER -#define ENV_CANCEL SHRT_MAX - // Function used for labels and envelopes in applab.cxx and appenv.cxx String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText ) diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index cd5bdece2a91..1ad864386464 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -459,8 +459,6 @@ SwPageGridExample::~SwPageGridExample() delete pGridItem; } -#define MAX_ROWS 10 -#define MAX_LINES 15 void SwPageGridExample::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 4daba7a7d28d..d2aae21d9ef3 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -101,11 +101,6 @@ using namespace ::sfx2; static const sal_Unicode aDeliStart = '['; // for the form static const sal_Unicode aDeliEnd = ']'; // for the form -#define POS_GRF 0 -#define POS_OLE 1 -#define POS_TABLE 2 -#define POS_FRAME 3 - #define IDX_FILE_EXTENSION rtl::OUString("*.sdi") String lcl_CreateAutoMarkFileDlg( const String& rURL, diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index d0f6079f917a..ce57fca0ed5f 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -73,10 +73,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::i18n; -#define SRCH_ATTR_OFF 0 -#define SRCH_ATTR_ON 1 -#define SRCH_ATTR_SET 2 - /*-------------------------------------------------------------------- Beschreibung: Search Parameter --------------------------------------------------------------------*/ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index e8136298ec38..903d6affc852 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -68,18 +68,6 @@ #define PAGE_CHANGE_TIMEOUT 1000 //Timeout fuer Seitenwechsel -#define JUMP_TYPE_TBL 0 -#define JUMP_TYPE_FRM 1 -#define JUMP_TYPE_GRF 2 -#define JUMP_TYPE_REG 3 -#define JUMP_TYPE_BKM 4 - -// Version fuer Konfiguration - -#define NAVI_VERSION0 0 -#define NAVI_VERSION1 1 -#define NAVI_VERSION2 2 // bIsGlobalActive - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index e0e34cd5a207..7633d3a9c72b 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -52,12 +52,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; using ::rtl::OUString; -// Enable our own join detection for Intersection and Union -// should be more efficient than using ScRangeList::Join ( because -// we already are testing the same things ) - -#define OWN_JOIN 1 - // #TODO is this defined somewhere else? #if ( defined UNX ) #define FILE_PATH_SEPERATOR "/" diff --git a/tools/inc/poly.h b/tools/inc/poly.h index 11eaccc30de4..3321eec82894 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -31,8 +31,6 @@ #include <tools/gen.hxx> -#define MAX_64KPOINTS ((((sal_uInt16)0xFFFF)-32)/sizeof(Point)) - // ------------------- // - ImplPolygonData - // ------------------- diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index d15c19ca27e9..e307c0cd6fa2 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -54,7 +54,6 @@ class BigInt; typedef ::std::vector< DirEntry* > DirEntryList; typedef ::std::vector< FileStat* > FileStatList; -#define FSYS_BUFSIZE 1024 #define FSYS_SHORTNAME_DELIMITER '@' // FSysAccess @@ -134,8 +133,6 @@ typedef int FSysAction; // Fuer RFS #define RFS_IDENTIFIER "-rfs-" -#define RFS_LOWER "-rfs-" -#define RFS_UPPER "-RFS-" typedef sal_uIntPtr FSysError; diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx index f53dba883e1a..6c07542b3294 100644 --- a/tools/inc/tools/gen.hxx +++ b/tools/inc/tools/gen.hxx @@ -268,7 +268,6 @@ inline Size::Size( long nWidth, long nHeight ) : // - Range - // --------- -#define RANGE_MIN LONG_MIN #define RANGE_MAX LONG_MAX class Range : public Pair diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index a5c88a68f910..e0082619f0bc 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1664,10 +1664,6 @@ const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const return *pRes; } -#define MAX_EXT_MAX 250 -#define MAX_LEN_MAX 255 -#define INVALID_CHARS_DEF "\\/\"':|^<>?*" - /************************************************************************* |* |* DirEntry::CreatePath() diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx index 627450829333..d36de6a4e9f7 100644 --- a/tools/source/fsys/unx.hxx +++ b/tools/source/fsys/unx.hxx @@ -39,7 +39,6 @@ #define DEFSTYLE FSYS_STYLE_BSD #define CMP_LOWER(s) (s) -#define TEMPNAME() tmpnam(0) #define LOWER(aString) (aString.Lower()) #include <time.h> diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx index 6cda2a120ab7..1e210341d625 100644 --- a/tools/source/fsys/wntmsc.hxx +++ b/tools/source/fsys/wntmsc.hxx @@ -50,8 +50,6 @@ #ifndef S_IFBLK #define S_IFBLK 0x6000 #endif -#define setdrive(n,a) _chdrive(n) -#define GETDRIVE(n) (n = _getdrive()) #define dirent _WIN32_FIND_DATAA #define d_name cFileName @@ -69,8 +67,6 @@ typedef struct #define MKDIR( p ) mkdir( p ) #define CMP_LOWER(s) ( s.toAsciiLowerCase() ) -#define START_DRV 'a' - inline sal_Bool DRIVE_EXISTS(char c) { rtl::OStringBuffer aDriveRoot; diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index aa848f72bbbe..cacafcdabab7 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -267,12 +267,6 @@ SvStream& Color::Write( SvStream& rOStm, sal_Bool bNewFormat ) // ----------------------------------------------------------------------- #define COL_NAME_USER ((sal_uInt16)0x8000) -#define COL_RED_1B ((sal_uInt16)0x0001) -#define COL_RED_2B ((sal_uInt16)0x0002) -#define COL_GREEN_1B ((sal_uInt16)0x0010) -#define COL_GREEN_2B ((sal_uInt16)0x0020) -#define COL_BLUE_1B ((sal_uInt16)0x0100) -#define COL_BLUE_2B ((sal_uInt16)0x0200) // ----------------------------------------------------------------------- diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 78a2f44b71ee..42f7ea23bd82 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -194,8 +194,6 @@ public: #define VBA_LEFT "PositionX" #define VBA_TOP "PositionY" -#define VBA_HEIGHT "Height" -#define VBA_WIDTH "Width" class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes { public: diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 2e41c70a6a1b..fa51e620ec22 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -159,8 +159,6 @@ bool ServerFontLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutAr #ifdef ENABLE_ICU_LAYOUT -#define bool_t signed char - // disable warnings in icu layout headers #if defined __SUNPRO_CC #pragma disable_warn diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 33190d43f989..2c1ab85503d0 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -403,7 +403,6 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, #define COMMAND_MEDIA ((sal_uInt16)17) #define COMMAND_SELECTIONCHANGE ((sal_uInt16)18) #define COMMAND_PREPARERECONVERSION ((sal_uInt16)19) -#define COMMAND_USER ((sal_uInt16)4096) class VCL_DLLPUBLIC CommandEvent { diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index 13f4784284e0..0850024cdceb 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -341,7 +341,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, #define EVENT_INPUTDISABLE 11 #define EVENT_EXECUTEDIALOG 100 #define EVENT_ENDEXECUTEDIALOG 101 -#define EVENT_USER 10000 class VCL_DLLPUBLIC NotifyEvent { diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h index 1579d1f1d5b5..0760b94ee2a5 100644 --- a/vcl/inc/vcl/spin.h +++ b/vcl/inc/vcl/spin.h @@ -25,13 +25,6 @@ class Rectangle; class OutputDevice; -// ----------------------------------------------------------------------- - -#define SPIN_DELAY 280 -#define SPIN_SPEED 60 - -// ----------------------------------------------------------------------- - void ImplDrawSpinButton( OutputDevice* pOutDev, const Rectangle& rUpperRect, const Rectangle& rLowerRect, diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index c61b970328b7..df77041c7ffa 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -55,7 +55,6 @@ class TaskPaneList; #define ICON_DATABASE_DOCUMENT 12 #define ICON_MATH_DOCUMENT 13 #define ICON_MACROLIBRARY 1 -#define ICON_PLAYER 100 #define ICON_SETUP 500 // ------------------- diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 6d73e91356b2..7dbf5706272b 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7950,7 +7950,6 @@ void PDFWriterImpl::drawLine( const Point& rStart, const Point& rStop, const Lin } } -#define WCONV( x ) m_pReferenceDevice->ImplDevicePixelToLogicWidth( x ) #define HCONV( x ) m_pReferenceDevice->ImplDevicePixelToLogicHeight( x ) void PDFWriterImpl::drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ) diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 1ddda4e713ca..8796829b2188 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -46,8 +46,6 @@ const sal_Int16 API_LINE_DASHED = 2; #define LINE_WIDTH_1 36 #define LINE_WIDTH_2 89 #define LINE_WIDTH_3 142 -#define LINE_WIDTH_4 177 -#define LINE_WIDTH_5 18 #define DOUBLE_LINE0_OUT LINE_WIDTH_0 #define DOUBLE_LINE0_IN LINE_WIDTH_0 diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h index 31a6e227bb7b..aa7f115a836a 100644 --- a/xml2cmp/source/inc/precomp.h +++ b/xml2cmp/source/inc/precomp.h @@ -34,7 +34,6 @@ typedef long intt; #define REF( x ) (&(x)) -#define MREF( x ) (&(pThis->x)) #define THIS_ pThis diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index edf8c2d1f79d..118bd1941b74 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -71,14 +71,10 @@ using namespace ::xmloff::token; // section properties #define MS_E( a, p, l, t, c ) \ _M_E( a, p, l, (t|XML_TYPE_PROP_SECTION), c ) -#define MS_ED( a, p, l, t, c ) \ - _M_ED( a, p, l, (t|XML_TYPE_PROP_SECTION), c ) // ruby properties #define MR_E( a, p, l, t, c ) \ _M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c ) -#define MR_ED( a, p, l, t, c ) \ - _M_ED( a, p, l, (t|XML_TYPE_PROP_RUBY), c ) #define M_END() \ { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 } diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 6dc169c0eb8b..80af1e310e54 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -79,8 +79,6 @@ void Main(); #define BUTTONHEIGHT 22 #define BUTTONSPACE 20 -#define LISTBOXHEIGHT 120 - // ----------------------------------------------------------------------- SAL_IMPLEMENT_MAIN() |