mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MWERKS etc. are not supported toolchains

Browse Source 
Change-Id: I449fe34be396114529357388c87162aaf8976292
This commit is contained in:
Michael Stahl
2014-10-02 18:46:05 +02:00
parent 9086a4bbd3
commit 72a7450c02
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/workben/testframecontrol.cxx
View File

@@ -208,11 +208,6 @@ private:
FrameControlApplication g_App; FrameControlApplication g_App;
#ifdef __MWERKS__
Application* pApp = &g_App;
#endif
void FrameControlApplication::init() void FrameControlApplication::init()
{ {

6
include/osl/diagnose.h
View File

@@ -121,14 +121,10 @@
* Distributed under the Boost Software License, Version 1.0. (See * Distributed under the Boost Software License, Version 1.0. (See
* accompanying file LICENSE_1_0.txt or copy at * accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) */ * http://www.boost.org/LICENSE_1_0.txt) */
#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) #if defined(__GNUC__)
#define OSL_THIS_FUNC __PRETTY_FUNCTION__
#elif defined(__DMC__) && (__DMC__ >= 0x810)
#define OSL_THIS_FUNC __PRETTY_FUNCTION__ #define OSL_THIS_FUNC __PRETTY_FUNCTION__
#elif defined(__FUNCSIG__) #elif defined(__FUNCSIG__)
#define OSL_THIS_FUNC __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) #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
#define OSL_THIS_FUNC __func__ #define OSL_THIS_FUNC __func__
#else #else

1
sw/source/uibase/app/docshini.cxx
View File

@@ -512,7 +512,6 @@ bool SwDocShell::Load( SfxMedium& rMedium )
case SFX_CREATE_MODE_INTERNAL: case SFX_CREATE_MODE_INTERNAL:
case SFX_CREATE_MODE_EMBEDDED: case SFX_CREATE_MODE_EMBEDDED:
{ {
// for MWERKS (Mac-Compiler): can't cast autonomously
SwTransferable::InitOle( this, *mpDoc ); SwTransferable::InitOle( this, *mpDoc );
} }
// suppress SfxProgress, when we are Embedded // suppress SfxProgress, when we are Embedded