diff options
72 files changed, 1 insertions, 168 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index f753a0cfa549..d674fd1f719c 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _BASIC_TEXTPORTIONS - #include "helpid.hrc" #include "baside2.hrc" diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index 7ba9d112bebf..171fa00f51c7 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _BASIDE_POPUPWINDOWTBX - #include <svl/solar.hrc> #include <svx/svxids.hrc> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 676ef53d48b5..ca780f8230f3 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -28,7 +28,6 @@ #include <stdio.h> -#define _CUI_CHARMAP_CXX_ #include <tools/shl.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index bdaef5fc86c6..3374d13b5a3f 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -30,7 +30,6 @@ #include <vcl/msgbox.hxx> #include <vcl/help.hxx> #include <sfx2/sfxsids.hrc> -#define _ANIMATION #include "macroass.hxx" #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 20ac4751c228..fdc01a936287 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -32,7 +32,6 @@ #include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> -#define _CUI_SRCHDLG_CXX #include "cuisrchdlg.hxx" #include <cuires.hrc> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index d96ad0dfb8b9..98b00b6a95c9 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -40,8 +40,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svtools/unitconv.hxx> - -#define _SVX_CHARDLG_CXX #include <svl/languageoptions.hxx> #include "chardlg.hrc" diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index c080460ca9a1..d2f9a3cc5199 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -64,9 +64,6 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <svtools/filter.hxx> - -#define _SVX_FRMITEMS_CXX - #include <editeng/editids.hrc> #include <editeng/editrids.hrc> #include <editeng/pbinitem.hxx> diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 382f9bd839fa..e306b893aac3 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -38,13 +38,9 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <tools/rtti.hxx> - -#define _SVX_PARAITEM_CXX #include <svl/itempool.hxx> - #include <svl/memberid.hrc> #include <editeng/editrids.hrc> - #include <editeng/lspcitem.hxx> #include <editeng/adjitem.hxx> #include <editeng/orphitem.hxx> diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 6d658822bea6..4319cd6949bc 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -32,9 +32,6 @@ #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> #include <com/sun/star/i18n/KCharacterType.hpp> - -#define _SVX_SVXFONT_CXX - #include <editeng/svxfont.hxx> #include <editeng/escpitem.hxx> diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx index 9a5c07792d6b..048acec6c111 100644 --- a/filter/source/config/cache/macros.hxx +++ b/filter/source/config/cache/macros.hxx @@ -50,7 +50,6 @@ #define _FILTER_CONFIG_LOG_(TEXT) #define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1) #define _FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2) -#define _FILTER_CONFIG_LOG_3_(FORMAT, ARG1, ARG2, ARG3) #endif // _FILTER_CONFIG_MACROS_HXX_ diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index 52e9653d408a..71789ddeb3a9 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -22,7 +22,6 @@ //_______________________________________________ -//#define _FILTER_CONFIG_Q_ // final Q code base #define _FILTER_CONFIG_MIGRATION_Q_ // usefull for migration time, to support some old functionality temp. :-) #endif // _FILTER_CONFIG_VERSIONS_HXX_ diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h index c42ee50848e2..ba5a6aeb53c4 100644 --- a/l10ntools/inc/tokens.h +++ b/l10ntools/inc/tokens.h @@ -59,7 +59,6 @@ #define _LISTTEXT 521 /* { "Text" ... } */ #define TEXTREFID 522 /* Text = 12345 */ #define LISTRESID 523 /* < 12345; ... > */ -#define _LISTRESID 523 /* { 12345; ... } */ #define NORMDEFINE 524 /* #define ... */ /*------------------------------------------------------ */ /*------------------------------------------------------ */ diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx index 4dc517193fdd..7a57ac0e9d4a 100644 --- a/sal/rtl/source/cipher.cxx +++ b/sal/rtl/source/cipher.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#define _RTL_CIPHER_C_ - #include <sal/types.h> #include <rtl/alloc.h> #include <rtl/memory.h> diff --git a/sal/rtl/source/crc.cxx b/sal/rtl/source/crc.cxx index 942bff7026c6..a75ba36470d8 100644 --- a/sal/rtl/source/crc.cxx +++ b/sal/rtl/source/crc.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#define _RTL_CRC_C_ - #include <sal/types.h> #include <rtl/crc.h> diff --git a/sal/rtl/source/digest.cxx b/sal/rtl/source/digest.cxx index 1bcc1509867c..feec3b4b832f 100644 --- a/sal/rtl/source/digest.cxx +++ b/sal/rtl/source/digest.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#define _RTL_DIGEST_C_ - #include <sal/types.h> #include <sal/macros.h> #include <osl/endian.h> diff --git a/sal/rtl/source/random.cxx b/sal/rtl/source/random.cxx index da1ddda07700..8e1e06ba83a5 100644 --- a/sal/rtl/source/random.cxx +++ b/sal/rtl/source/random.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#define _RTL_RANDOM_C_ - #include <sal/types.h> #include <osl/thread.h> #include <osl/time.h> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 42b4076fdc2c..51b2679a9a2f 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -65,9 +65,7 @@ #include <svtools/transfer.hxx> #include <svl/stritem.hxx> -#define _EDITSH_CXX #include "editsh.hxx" - #include "scresid.hxx" #include "global.hxx" #include "sc.hrc" diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index be53af694ed5..d2de7c2a8425 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -28,12 +28,7 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> - -#define _ANIMATION //animation freischalten - -#define _SV_BITMAPEX #include <svx/xoutbmp.hxx> - #include <time.h> #include <svl/eitem.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc index 469614d85cf1..cb6c4d039d83 100644 --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -29,7 +29,6 @@ #define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20 #define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22 diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 99b2bc50e5ea..69164b07eff3 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _SOT_EXCHANGE_CXX -#define SOT_STRING_LIST #define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS #include <tools/debug.hxx> #include <tools/solar.h> diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 17440b357402..783568308912 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SOT_FACTORY_CXX -#define SOT_STRING_LIST - #include <sot/factory.hxx> #include <tools/debug.hxx> #include <tools/string.hxx> diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index a4670c5a3fa5..3264015d21f6 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SOT_OBJECT_CXX - #include <sot/object.hxx> #include <sot/factory.hxx> diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx index 6e7bc63af7ce..db613833e027 100644 --- a/store/workben/t_store.cxx +++ b/store/workben/t_store.cxx @@ -48,7 +48,6 @@ using rtl::OUString; #define _DEMOSTOR_LOOPS 1000 /* 1000, 2000 */ #define _DEMOSTOR_REMOVE 0 -#define _DEMOSTOR_REBUILD 0 enum Options { diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 8d06d45e98df..6a8f87854361 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#define _DATETIMEITEM_CXX #include <svl/dateitem.hxx> #include <svl/svl.hrc> diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 6936c654fead..8319a44c4e84 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -26,17 +26,12 @@ * ************************************************************************/ - -#define _LCKBITEM_CXX #include <svl/lckbitem.hxx> #include <svl/poolitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/cachestr.hxx> -// STATIC DATA ----------------------------------------------------------- - - // ----------------------------------------------------------------------- TYPEINIT1_AUTOFACTORY(SfxLockBytesItem, SfxPoolItem); diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index 3d01bea9aec1..f2883292dc93 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -#define _SVSTDARR_STRINGSDTOR -#define _SVSTDARR_STRINGSSORTDTOR - #include <svl/svstdarr.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 7f702b5b4f01..5af9c8037f35 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SV_FIELCTRL_CXX #include <svtools/svtresid.hxx> #include <svtools/filectrl.hxx> #include <filectrl.hrc> diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index d657893d51ea..460b183cea84 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - -#define _INSDLG_CXX - -// include --------------------------------------------------------------- - #include <svtools/insdlg.hxx> #include <svtools/sores.hxx> #include <svtools/svtresid.hxx> diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 6cf3619cb0d1..8fee2c1165be 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -73,7 +73,6 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#define _SVX_USE_UNOGLOBALS_ #include <svx/unoprov.hxx> #include <editeng/unoprnms.hxx> #include <svx/unomid.hxx> diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index f9bc34b59d6b..936748b79d7c 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -30,7 +30,6 @@ #include <vcl/msgbox.hxx> #include <vcl/help.hxx> #include <sfx2/sfxsids.hrc> // SID_ATTR_MACROITEM -#define _ANIMATION #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 5773bb38bbe7..3341c2170460 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -29,9 +29,6 @@ #include <comphelper/string.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> - -#define _SVX_PASSWD_CXX - #include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 247ef7ca1c99..cec06ced6034 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#define _SVX_HLNKITEM_CXX - #include <svx/svxids.hrc> #include <tools/stream.hxx> #include <svl/memberid.hrc> diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 9401e002d44f..721c165d154c 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _SVX_NUMINF_CXX - #include <svx/numinf.hxx> // ----------------------------------------------------------------------- diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index c925ee25f491..1685a74e598b 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#define _SVX_POSTATTR_CXX #include "svx/postattr.hxx" #include <editeng/itemtype.hxx> #include <svx/svxitems.hrc> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 8b09cb2cf2a6..c52c63ed1cae 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -39,7 +39,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <svl/intitem.hxx> -#define _SVX_PSZCTRL_CXX #include "svx/pszctrl.hxx" diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d82f72cda713..75f71f6302ff 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _ANIMATION #include <unotools/streamwrap.hxx> #include <sfx2/lnkbase.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 4ad989c82ff1..014d48344c31 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -54,17 +54,13 @@ #include <sfx2/viewfrm.hxx> #include <unotools/fontoptions.hxx> #include <vcl/mnemonic.hxx> - #include <vcl/svapp.hxx> #include <svl/smplhint.hxx> - -#define _SVX_TBCONTRL_CXX #include <svtools/colorcfg.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> - #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> #include "helpid.hrc" diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 736038ea6441..47c96c889917 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/drawing/XShape.hpp> diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index eaafdff4e0cb..4aef2c5bc0a9 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 41a813c48757..7e99ef6918bc 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ - #include <sal/macros.h> - -#define _SVX_USE_UNOGLOBALS_ - #include <com/sun/star/table/XTable.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 07bc6c4e54b0..93f8e18f32a4 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 0a9339d887da..72246c057f61 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SVX_USE_UNOGLOBALS_ #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/Direction3D.hpp> diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 3fe75fc23e55..ab308e5d40a2 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#define _SVX_USE_UNOGLOBALS_ - #include <vcl/virdev.hxx> #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8194e821f04d..ce1315f6f4ad 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SVX_USE_UNOGLOBALS_ #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 98eeccf89b2c..45702965b387 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -123,8 +123,6 @@ using namespace ::com::sun::star; #define ViewSettings #define WebViewSettings #define PrintSettings -#define _ExecAddress ExecOther -#define _StateAddress StateOther #include <sfx2/msg.hxx> #include "swslots.hxx" #include <cfgid.h> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index a59932199334..0172e05684b6 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -32,9 +32,6 @@ #undef SW_DLLIMPLEMENTATION #endif - -#define _CHANGEDB_CXX - #include <svtools/stdctrl.hxx> #include <vcl/msgbox.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index e3d99725761e..1b17447944fe 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define _FLDUI_SRC + #include "index.hrc" #include "fldui.hrc" #include "helpid.h" diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 60d957a50c1e..5f893dadbbad 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -31,14 +31,8 @@ #undef SW_DLLIMPLEMENTATION #endif -// include --------------------------------------------------------------- - - #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> - -#define _JAVAEDIT_CXX #include <hintids.hxx> - #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 61618863517f..df8c355bc450 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -39,10 +39,7 @@ #include <wrtsh.hxx> #include <view.hxx> #include <swmodule.hxx> -#ifndef _REDLNDLG_HXX -#define _REDLNACCEPTDLG #include <redlndlg.hxx> -#endif #include <swwait.hxx> #include <uitool.hxx> diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 4cf670169111..53444dd5398a 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -52,10 +52,7 @@ #include <shells.hrc> #include <vector> -#ifndef _REDLNDLG_HXX -#define _REDLNACCEPTDLG #include <redlndlg.hxx> -#endif #include "swmodalredlineacceptdlg.hxx" #include <unomid.h> diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index 40e4be543d12..cfe82cd74770 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SWLIB_CXX #include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 4a377e2b226e..0aa82ad5d41f 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _TOOLS_TIME_CXX - #if defined( WNT ) #include <windows.h> #elif defined UNX diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index b3dae60ead65..5c1dfa3489c4 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _TOOLS_DEBUG_CXX - #if defined (UNX) || defined (GCC) #include <unistd.h> #else diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index 32c81e8d231b..5b9073efaeae 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _LINE_CXX #include <tools/link.hxx> #include <tools/line.hxx> #include <tools/debug.hxx> diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index bbc50d642fdf..7f2afcac7661 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ - -#define _SV_POLY_CXX #include <osl/endian.h> #include <tools/bigint.hxx> #include <tools/debug.hxx> diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 089c7150d996..8f4438503938 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _SV_POLY2_CXX - #define POLY_CLIP_INT 0 #define POLY_CLIP_UNION 1 #define POLY_CLIP_DIFF 2 diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 00f2a7a90cca..316135720727 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _TOOLS_RC_CXX - #include <string.h> #include <tools/date.hxx> #include <tools/time.hxx> diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx index d2264452246a..cdf04f7fe362 100644 --- a/tools/source/rc/resary.cxx +++ b/tools/source/rc/resary.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _TOOLS_RESARY_CXX #include <tools/resmgr.hxx> #include <tools/resary.hxx> #include <tools/rcid.h> diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx index 599d7198c666..fc9dc1789781 100644 --- a/tools/source/stream/vcompat.cxx +++ b/tools/source/stream/vcompat.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _VCOMPAT_CXX #include <tools/stream.hxx> #include <tools/vcompat.hxx> diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 0ae610fa2e06..fa9fe0f71c9a 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -26,10 +26,8 @@ * ************************************************************************/ - #include <comphelper/string.hxx> #include <sot/object.hxx> -#define _TOOLS_BIGINT #include <sot/factory.hxx> #include <tools/debug.hxx> #include <tools/bigint.hxx> diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index c0303aac0f1f..cad485f867d6 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -25,8 +25,6 @@ * ************************************************************************/ -#define _SV_BTNTEXT_SRC - #include <svids.hrc> String SV_BUTTONTEXT_OK diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src index d794fad00bb2..573c1b638f71 100644 --- a/vcl/source/src/helptext.src +++ b/vcl/source/src/helptext.src @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _SV_HELPTEXT_SRC - #include <svids.hrc> String SV_HELPTEXT_CLOSE diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 2dcaac6b5606..f0b58f4d82d1 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -25,8 +25,6 @@ * ************************************************************************/ -#define _SV_IMAGES_SRC - #include <svids.hrc> // ======================================================================= diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src index cbc6181fd3f3..efb9831647bd 100644 --- a/vcl/source/src/menu.src +++ b/vcl/source/src/menu.src @@ -15,7 +15,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _SV_MENU_SRC #include <svids.hrc> diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src index 53d4fb5306b4..ffe5ac16e2f2 100644 --- a/vcl/source/src/stdtext.src +++ b/vcl/source/src/stdtext.src @@ -25,8 +25,6 @@ * ************************************************************************/ -#define _SV_STDTEXT_SRC - #include <svids.hrc> String SV_STDTEXT_SERVICENOTAVAILABLE diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src index 24023569aaeb..342c1085030e 100644 --- a/vcl/source/src/units.src +++ b/vcl/source/src/units.src @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define _SV_UNITS_SRC #include <svids.hrc> diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 07beaccc5be7..8f3151cef2c6 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -26,11 +26,6 @@ * ************************************************************************/ - -#define _SV_SALDATA_CXX - -// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - #include <unistd.h> #include <fcntl.h> diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 195915bc6e39..e4b1092c2810 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _SV_SALDATA_CXX - #include <shell/kde_headers.h> #include <unistd.h> diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 0a5f79f5282d..e9e4d65a7a1f 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _SV_SALNATIVEWIDGETS_KDE_CXX - #include <shell/kde_headers.h> #include "UnxFilePicker.hxx" diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 80c38ec38db3..c7980a11a9b5 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -#define _SV_SALNATIVEWIDGETS_KDE_CXX - #define Region QtXRegion #include <QStyle> diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index b8abaee6e5b9..ca63b70d0358 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -40,8 +40,6 @@ // Drawing in non-client area (general DWM-related info): // http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx -#define _SV_SALNATIVEWIDGETS_CXX - #include "rtl/ustring.h" #include "osl/module.h" diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h index fa0f582f54d2..31a6e227bb7b 100644 --- a/xml2cmp/source/inc/precomp.h +++ b/xml2cmp/source/inc/precomp.h @@ -20,8 +20,6 @@ #ifndef CPV_PRECOMP_H #define CPV_PRECOMP_H -#define _NO_BOOL_TYPE_ - typedef short Bool; #define True 1 #define False 0 |