diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
tree | c8b168e8e0619c387d30f206848ec30ca7238a00 /sfx2 | |
parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/appl/appmain.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/appl/impldde.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/bastyp/progress.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/doctempl.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 5 |
11 files changed, 0 insertions, 27 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 16ae3c4717ca..1c72b4476201 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -71,13 +71,10 @@ #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> -#define ITEMID_SEARCH SID_SEARCH_ITEM - #include <svl/srchitem.hxx> #include <osl/socket.hxx> #define SFX_TYPEMAP -#define Selection #include "sfxslots.hxx" using namespace ::com::sun::star; diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index d726fd60150b..a3a23f5122e9 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SDINTERN_HXX - #include <stdio.h> #include <svtools/ehdl.hxx> #include <svl/itempool.hxx> diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 3c1dc236a823..686ca3c28092 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -47,7 +47,6 @@ #define DDELINK_ERROR_APP 1 #define DDELINK_ERROR_DATA 2 -#define DDELINK_ERROR_LINK 3 using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index df962be1b124..8f2378bf4a4f 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -141,7 +141,6 @@ using namespace ::comphelper; #define TBI_SEARCHDIALOG 1008 #define TBI_SOURCEVIEW 1009 #define TBI_SELECTIONMODE 1010 -#define TBI_ONSTARTUP 1011 #define CONFIGNAME_HELPWIN "OfficeHelp" #define CONFIGNAME_INDEXWIN "OfficeHelpIndex" diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 09345fe94626..9a49a1aa20c4 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -72,7 +72,6 @@ struct SfxProgress_Impl //======================================================================== -#define Progress #include "sfxslots.hxx" //======================================================================== diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 95ee15d4a524..00d48491362e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -958,10 +958,6 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) //-------------------------------------------------------------------- -#ifndef SFX_USE_BINDINGS -#define SFX_USE_BINDINGS 0x8000 -#endif - const SfxSlot* SfxDispatcher::GetSlot( const String& rCommand ) { // Count the number of Shells on the linked Dispatcher diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index b9f04fa1fe44..8faa60a8cbc7 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -103,7 +103,6 @@ using ::std::advance; #define TITLE "Title" #define TARGET_URL "TargetURL" -#define TARGET_DIR_URL "TargetDirURL" #define COMMAND_TRANSFER "transfer" //======================================================================== diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index b067332248da..9d2b6b2d4d3d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -96,7 +96,6 @@ #define TARGET_DIR_URL "TargetDirURL" #define COMMAND_DELETE "delete" -#define COMMAND_TRANSFER "transfer" #define STANDARD_FOLDER "standard" diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index d0f02acd2450..e1834b3c809c 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -105,7 +105,6 @@ #define STATUS_SAVE 1 #define STATUS_SAVEAS 2 #define STATUS_SAVEAS_STANDARDNAME 3 -#define STATUS_SAVEACOPY 4 const char aFilterNameString[] = "FilterName"; const char aFilterOptionsString[] = "FilterOptions"; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index f6c84109ade5..e0de9eec5799 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -39,12 +39,6 @@ #include <sfx2/printer.hxx> #include <vcl/waitobj.hxx> -// Draw modes -#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) -#define OUTPUT_DRAWMODE_GRAYSCALE (DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT) -#define OUTPUT_DRAWMODE_BLACKWHITE (DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT) -#define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) - //======================================================================== #define MORE_BTN(x) pMoreBt->x diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 4614bb2372ec..13fe2b654166 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -81,13 +81,8 @@ #define OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper #define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper -#define XCLOSELISTENER ::com::sun::star::util::XCloseListener #define FRAMEACTIONEVENT ::com::sun::star::frame::FrameActionEvent #define EVENTOBJECT ::com::sun::star::lang::EventObject -#define OTYPECOLLECTION ::cppu::OTypeCollection -#define OIMPLEMENTATIONID ::cppu::OImplementationId -#define XCOMPONENT ::com::sun::star::lang::XComponent -#define XINTERFACE ::com::sun::star::uno::XInterface #define XKEYHANDLER ::com::sun::star::awt::XKeyHandler #define TIMEOUT_START_RESCHEDULE 10L /* 10th s */ |