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 /framework | |
| parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) | |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 3 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 3 |
4 files changed, 1 insertions, 13 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 62c8fab3e19e..853bde68ecc6 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -85,10 +85,7 @@ namespace framework #define SID_SFX_START 5000 #define SID_NEWDOCDIRECT (SID_SFX_START + 537) #define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) #define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) #define SFX_REFERER_USER "private:user" diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index c6689fc20c53..e26f99a55ec1 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -51,8 +51,6 @@ #define STRPOS_NOTFOUND (sal_Int32)-1 -#define SEARCHPATH_DELIMITER ';' - // Variable start/end characters #define SIGN_STARTVARIABLE "$(" #define SIGN_ENDVARIABLE ")" @@ -843,7 +841,7 @@ throw ( NoSuchElementException, RuntimeException ) } // Check preconditions to substitue path variables. - // 1. A path variable can only be substituted if it follows a SEARCHPATH_DELIMITER ';'! + // 1. A path variable can only be substituted if it follows a ';'! // 2. It's located exactly at the start of the string being substituted! if (( aFixedVarTable[ int( nIndex ) ].bAbsPath && (( nPosition == 0 ) || (( nPosition > 0 ) && ( aWorkText[nPosition-1] == ';')))) || ( !aFixedVarTable[ int( nIndex ) ].bAbsPath )) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 5b4b9b3a7b5e..692fb98c07ef 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -59,7 +59,6 @@ #define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) #define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) #define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) -#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) #define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) #define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) #define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) @@ -81,7 +80,6 @@ #define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) #define SID_FM_SCROLLBAR (SID_MORE_FMSLOTS_START + 66) #define SID_FM_SPINBUTTON (SID_MORE_FMSLOTS_START + 67) -#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) #define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) #define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) #define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) @@ -90,8 +88,6 @@ #define SID_FM_EDIT (SID_FMSLOTS_START + 7) #define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) #define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) -#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) -#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) #define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) #define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 06daa6c92989..241f9275daa4 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -139,9 +139,6 @@ namespace framework // special menu ids/command ids for dynamic popup menus #define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) #define SID_MDIWINDOWLIST (SID_SFX_START + 610) #define SID_ADDONLIST (SID_SFX_START + 1677) #define SID_HELPMENU (SID_SFX_START + 410) |