bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 9 +++++++++ svx/source/svdraw/svdedxv.cxx | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 53b552518e1feab4a5cc25bb92ea26dc9b2c7e4f Author: Tor Lillqvist <[email protected]> Date: Tue May 28 19:17:52 2013 +0300 WaE: illegal character encoding in string literal Change-Id: Ic1a85b48363b2596ebfe225dc76332068229cb96 diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 6d39a5b..273480f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -877,7 +877,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) } else { - OSL_ENSURE(false, "´Got UndoManager back in SdrEndTextEdit which is NOT the expected document UndoManager (!)"); + OSL_ENSURE(false, "Got UndoManager back in SdrEndTextEdit which is NOT the expected document UndoManager (!)"); delete pOriginal; } } commit c95999782ee393a121ab36d2a46ba21940b40708 Author: Tor Lillqvist <[email protected]> Date: Tue May 28 18:07:48 2013 +0200 Bypass the type_info generation when using libc++ for gcc3_macosx_intel, too (It causes linker errors, type_info destructor not found and a few others. Possibly this is a bug in Apple's libc++abi?) Change-Id: I50bc97c8e061ff47d4ff16f31d37cfe3b4f5a010 diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index f00c0ed..f51cb75 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -51,6 +51,8 @@ using namespace ::__cxxabiv1; namespace CPPU_CURRENT_NAMESPACE { +#ifndef _LIBCPP_VERSION + #if MACOSX_SDK_VERSION >= 1070 // MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined @@ -100,6 +102,8 @@ std::type_info * create_FAKE_si_class_type_info( #endif +#endif + void dummy_can_throw_anything( char const * ) { } @@ -212,6 +216,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) ); if (iFind2 == m_generatedRttis.end()) { +#ifndef _LIBCPP_VERSION // we must generate it ! // symbol and rtti-name is nearly identical, // the symbol is prefixed with _ZTI @@ -247,6 +252,10 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR SAL_WARN_IF( !insertion.second, "bridges", "inserting new generated rtti failed" ); +#else + OSL_FAIL("Cannot generate type_infos with libc++, sigh"); + return NULL; +#endif } else // taking already generated rtti {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
