sw/source/ui/dbui/mmaddressblockpage.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 574ba5206f1251b09df2ec32f525adf0f985cf6d
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Oct 5 11:28:47 2011 +0100
getStr for OSL_FAIL
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 01c8736..8dbd080 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -195,7 +195,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl,
PushButton*, EMPTYAR
}
catch (const uno::Exception& e)
{
- OSL_FAIL(rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding()));
+ OSL_FAIL(rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding()).getStr());
ErrorBox(this, WB_OK, e.Message).Execute();
}
return 0;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
