[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - i18npool/inc i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/inc/calendarImpl.hxx             |    2 +-
 i18npool/source/calendar/calendarImpl.cxx |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c1638c1012593f6d6336a9d94c73fb074fed6a47
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Jun 11 19:04:18 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 16 15:15:50 2020 +0200

    tdf#133898: get a context in default ctr (i18npool/calendarImpl)
    
    See bt here:
    https://bugs.documentfoundation.org/attachment.cgi?id=161882
    
    Change-Id: If5a6c5e2b52af9ef97af9522296aaa58352cfa69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96161
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 56e2183b4916888fa104b62411151401932d8f92)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96179
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 0634b66805f0f4bc3f45a44b1f6a984f17ff8a09)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96421

diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 299bfe79bae2..927bf42935aa 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -40,7 +40,7 @@ class CalendarImpl : public cppu::WeakImplHelper
 public:
 
     // Constructors
-    CalendarImpl() {};
+    CalendarImpl();
     CalendarImpl(const css::uno::Reference < css::uno::XComponentContext >& rxContext);
 
     /**
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 2cb659560489..8a288bcb6c31 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -20,6 +20,7 @@
 #include <calendarImpl.hxx>
 #include <calendar_gregorian.hxx>
 #include <localedata.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -32,8 +33,14 @@ namespace i18npool {
 
 #define ERROR RuntimeException()
 
+CalendarImpl::CalendarImpl() : m_xContext(comphelper::getProcessComponentContext())
+{
+}
+
 CalendarImpl::CalendarImpl(const Reference< XComponentContext > &rxContext) : m_xContext(rxContext)
 {
+    if (!m_xContext.is())
+        throw ERROR;
 }
 
 CalendarImpl::~CalendarImpl()