diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-05 12:32:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-05 20:34:33 +0100 |
| commit | 2ef43902dc0d4fec89934e1d90d11d60a648dff6 (patch) | |
| tree | 06c0e746291ce7f1220b15e06f8a979b0b8bccbd | |
| parent | 73c70f28ba41c7a602d7befde84c5b54187694d7 (diff) | |
coverity#704787 Explicit null dereferenced
Change-Id: I8c83648f39c4e8e6aeae06e764820f7677f75288
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 2 | ||||
| -rw-r--r-- | sfx2/sdi/appslots.sdi | 4 | ||||
| -rw-r--r-- | sfx2/sdi/sfx.sdi | 25 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 8 |
4 files changed, 1 insertions, 38 deletions
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 6c67e4c8bdef..8144a574bc88 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -213,7 +213,7 @@ #define SID_OVERWRITE (SID_SFX_START + 1634) #define SID_RENAME (SID_SFX_START + 1653) #define SID_PARTWIN (SID_SFX_START + 1640) -#define SID_CRASH (SID_SFX_START + 1645) + // FREE (was: SID_CRASH) #define SID_FAIL_ON_WARNING (SID_SFX_START + 1646) #define SID_INPUTSTREAM (SID_SFX_START + 1648) #define SID_LOGOUT (SID_SFX_START + 1652) diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 385f795f58eb..442287ec2e28 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -138,10 +138,6 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] - SID_CRASH - [ - ExecMethod = MiscExec_Impl ; - ] SID_UPDATE_CONFIG [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 8487a84bfa2f..4302753318de 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -1197,31 +1197,6 @@ SfxVoidItem Copy SID_COPY ] -SfxVoidItem Crash SID_CRASH -(SfxBoolItem Direct SID_CRASH) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - - SfxVoidItem CreateMacro SID_BASICIDE_CREATEMACRO (SfxMacroInfoItem aMacroInfo SID_BASICIDE_ARG_MACROINFO) [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 50e71ce377d3..e845ab96431f 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -564,14 +564,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; #endif - case SID_CRASH : - { - // Provoke a crash: - char * crash = 0; - *crash = 0; - break; - } - case SID_SHOW_IME_STATUS_WINDOW: if (pAppData_Impl->m_xImeStatusWindow->canToggle()) { |