[Libreoffice-commits] .: ucbhelper/source

[Tor Lillqvist]

 ucbhelper/source/provider/contenthelper.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit f3e10529134029a7853cdca925bc7091a639bc8a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Oct 20 19:56:07 2011 +0300

    Attempt workaround for possible bug in Apple's LLVM g++ 4.2.1

diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index ecc7ad2..7d2dc10 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -795,7 +795,18 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
         }
     }
 
+#if defined(__llvm__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2
+    // No idea if this works... but it compiles, links, and just
+    // "return xParent" causes an undefined symbol:
+
+    // uno::Reference<uno::XInterface>::operator uno::Reference<uno::XInterface> const&() const
+
+    // (com::sun::star:: omitted for brevity)
+
+    return uno::Reference< uno::XInterface >(xParent);
+#else
     return xParent;
+#endif
 }
 
 //=========================================================================