diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 18:46:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:18 +0200 |
| commit | 72a7450c027dd816ff6eaf231f58de7b5ad9c0a8 (patch) | |
| tree | 08929050aaa12b405b2213e5c0ed669804f1a8d3 | |
| parent | 9086a4bbd38b9a5320525392affe495e7772796a (diff) | |
MWERKS etc. are not supported toolchains
Change-Id: I449fe34be396114529357388c87162aaf8976292
| -rw-r--r-- | extensions/workben/testframecontrol.cxx | 5 | ||||
| -rw-r--r-- | include/osl/diagnose.h | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 7e674909e271..bb22d173db05 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -208,11 +208,6 @@ private: FrameControlApplication g_App; -#ifdef __MWERKS__ -Application* pApp = &g_App; -#endif - - void FrameControlApplication::init() { diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index fdae8cc8eba7..31b036d4054d 100644 --- a/include/osl/diagnose.h +++ b/include/osl/diagnose.h @@ -121,14 +121,10 @@ * Distributed under the Boost Software License, Version 1.0. (See * accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) */ -#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) -#define OSL_THIS_FUNC __PRETTY_FUNCTION__ -#elif defined(__DMC__) && (__DMC__ >= 0x810) +#if defined(__GNUC__) #define OSL_THIS_FUNC __PRETTY_FUNCTION__ #elif defined(__FUNCSIG__) #define OSL_THIS_FUNC __FUNCSIG__ -#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500)) -#define OSL_THIS_FUNC __FUNCTION__ #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) #define OSL_THIS_FUNC __func__ #else diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 04013c7ac4a2..3f978cf981fc 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -512,7 +512,6 @@ bool SwDocShell::Load( SfxMedium& rMedium ) case SFX_CREATE_MODE_INTERNAL: case SFX_CREATE_MODE_EMBEDDED: { - // for MWERKS (Mac-Compiler): can't cast autonomously SwTransferable::InitOle( this, *mpDoc ); } // suppress SfxProgress, when we are Embedded |