Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3174
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3174/1
Adapt code to IllegalArgumentException being a RuntimeException
...since 31170413ae3786bf44564e813d7291354e939a77 "API CHANGE:
com.sun.star.lang.IllegalArgumentException." In this case, with an
--enable-dbgutil build,
soffice --headless 'AP - ISS de La Pampa - SGTyDD - REQ 06.docx'
(as attached to fdo#61305 "improper display" as
<https://bugs.freedesktop.org/attachment.cgi?id=75354>) would lead to "terminate
called after throwing an instance of
'com::sun::star::lang::IllegalArgumentException'" when the erroneously leaked
IllegalArgumentException was unexpected in SvxShape::GetBitmap
(svx/source/unodraw/unoshape.cxx).
Change-Id: I849b5cf496cc7dff7b3c17d2d4d54f0194553e27
(cherry picked from commit 67d724e46579462d906477f52cf7919338bab834)
---
M canvas/source/factory/cf_service.cxx
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index b725c95..797a1db 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -25,6 +25,7 @@
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -278,6 +279,10 @@
return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
serviceName, args, xContext);
}
+ catch (css::lang::IllegalArgumentException &)
+ {
+ return Reference<XInterface>();
+ }
catch (const RuntimeException &)
{
throw;
--
To view, visit https://gerrit.libreoffice.org/3174
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I849b5cf496cc7dff7b3c17d2d4d54f0194553e27
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>
Context
- [PATCH libreoffice-4-0] Adapt code to IllegalArgumentException being a RuntimeExcept... · Stephan Bergmann (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.