patch for building on OS X 10.7 using clang

When building using Mac OS X 10.7.4, the latest Xcode (4.3.3) and the default clang, the build 
fails to build two unit-tests and aborts:
[ build LNK ] CppunitTest/libtest_sw_subsequent_rtftok.dylib
Undefined symbols for architecture i386:
 "typeinfo for cppu::OWeakObject", referenced from:
     typeinfo for cppu::WeakImplHelper32<com::sun::star::text::XTextDocument, 
com::sun::star::text::XLineNumberingProperties, com::sun::star::text::XChapterNumberingSupplier, 
com::sun::star::text::XNumberingRulesSupplier, com::sun::star::text::XFootnotesSupplier, 
com::sun::star::text::XEndnotesSupplier, com::sun::star::util::XReplaceable, 
com::sun::star::text::XPagePrintable, com::sun::star::text::XReferenceMarksSupplier, 
com::sun::star::text::XTextTablesSupplier, com::sun::star::text::XTextFramesSupplier, 
com::sun::star::text::XBookmarksSupplier, com::sun::star::text::XTextSectionsSupplier, 
com::sun::star::text::XTextGraphicObjectsSupplier, 
com::sun::star::text::XTextEmbeddedObjectsSupplier, com::sun::star::text::XTextFieldsSupplier, 
com::sun::star::style::XStyleFamiliesSupplier, com::sun::star::style::XAutoStylesSupplier, 
com::sun::star::lang::XServiceInfo, com::sun::star::drawing::XDrawPageSupplier, 
com::sun::star::text::XDocumentIndexesSupplier, com::sun::star::beans::XPropertySet, 
com::sun::star::beans::XPropertyState, com::sun::star::document::XLinkTargetSupplier, 
com::sun::star::document::XRedlinesSupplier, com::sun::star::util::XRefreshable, 
com::sun::star::util::XLinkUpdate, com::sun::star::view::XRenderable, 
com::sun::star::xforms::XFormsSupplier, com::sun::star::text::XFlatParagraphIteratorProvider, 
com::sun::star::document::XDocumentLanguages, com::sun::star::util::XCloneable> in ooxmltok.o
     typeinfo for comphelper::WeakImplHelper32<com::sun::star::container::XChild, 
com::sun::star::document::XDocumentInfoSupplier, 
com::sun::star::document::XDocumentPropertiesSupplier, 
com::sun::star::rdf::XDocumentMetadataAccess, com::sun::star::document::XDocumentRecovery, 
com::sun::star::document::XUndoManagerSupplier, com::sun::star::document::XEventBroadcaster, 
com::sun::star::document::XDocumentEventBroadcaster, com::sun::star::lang::XEventListener, 
com::sun::star::document::XEventsSupplier, com::sun::star::document::XEmbeddedScripts, 
com::sun::star::document::XScriptInvocationContext, com::sun::star::frame::XModel2, 
com::sun::star::util::XModifiable2, com::sun::star::view::XPrintable, 
com::sun::star::view::XPrintJobBroadcaster, com::sun::star::frame::XStorable2, 
com::sun::star::frame::XLoadable, com::sun::star::script::XStarBasicAccess, 
com::sun::star::document::XViewDataSupplier, com::sun::star::util::XCloseable, 
com::sun::star::datatransfer::XTransferable, com::sun::star::document::XDocumentSubStorageSupplier, 
com::sun::star::document::XStorageBasedDocument, 
com::sun::star::script::provider::XScriptProviderSupplier, 
com::sun::star::ui::XUIConfigurationManagerSupplier, com::sun::star::embed::XVisualObject, 
com::sun::star::lang::XUnoTunnel, com::sun::star::frame::XModule, com::sun::star::frame::XTitle, 
com::sun::star::frame::XTitleChangeBroadcaster, com::sun::star::frame::XUntitledNumbers> in 
ooxmltok.o
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** 
[/Users/ward/Projects/libreoffice/libo/workdir/unxmacxi/LinkTarget/CppunitTest/libtest_sw_subsequent_ooxmltok.dylib]
 Error 1

The below patch (LGPLv3+ / MPL) solves this.

Best regards,

Ward van Wanrooij

====

diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index 4348603..a1683c1 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \

$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
    cppu \
+    cppuhelper \
    sal \
    test \
    unotest \
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index 2207756..15a6851 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \

$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
    cppu \
+    cppuhelper \
    sal \
       sw \
    test \