[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/svx svx/source

[Libreoffice Gerrit user]

 include/svx/fmgridif.hxx       |    9 +++++----
 svx/source/fmcomp/fmgridif.cxx |    4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit d860e6a138f08343b42f591462e85b85291b6fa8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 14:26:36 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Oct 26 20:30:12 2018 +0200

    ensure m_aMutex ctor called before m_aMutex used
    
    Reviewed-on: https://gerrit.libreoffice.org/62012
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 9f46a103cbc7d3d7f7c1754d1aabfad6260d260f)
    
    Change-Id: I3d05831947b955b63f351180193bcf1585589c25
    Reviewed-on: https://gerrit.libreoffice.org/62076
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index f031f3f15565..9fc562afd695 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -336,6 +336,11 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer:
         css::form::XResetListener,
         css::view::XSelectionSupplier>
 {
+protected:
+    css::uno::Reference< css::uno::XComponentContext >    m_xContext;
+    ::osl::Mutex                                          m_aMutex;
+
+private:
     css::uno::Reference< css::container::XIndexContainer >    m_xColumns;
     css::uno::Reference< css::sdbc::XRowSet >                 m_xCursor;
     ::comphelper::OInterfaceContainerHelper2       m_aModifyListeners,
@@ -362,10 +367,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer:
     friend class GridListenerDelegator;
     std::unique_ptr<GridListenerDelegator>  m_pGridListener;
 
-protected:
-    css::uno::Reference< css::uno::XComponentContext >    m_xContext;
-    ::osl::Mutex                                              m_aMutex;
-
 public:
     FmXGridPeer(const css::uno::Reference< css::uno::XComponentContext >&);
     virtual ~FmXGridPeer() override;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 9dbba769b08f..bdc547a1891d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1030,7 +1030,8 @@ using namespace fmgridif;
 
 
 FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
-            :m_aModifyListeners(m_aMutex)
+            :m_xContext(_rxContext)
+            ,m_aModifyListeners(m_aMutex)
             ,m_aUpdateListeners(m_aMutex)
             ,m_aContainerListeners(m_aMutex)
             ,m_aSelectionListeners(m_aMutex)
@@ -1040,7 +1041,6 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
             ,m_bInterceptingDispatch(false)
             ,m_pStateCache(nullptr)
             ,m_pDispatchers(nullptr)
-            ,m_xContext(_rxContext)
 {
     // Create must be called after this constructor
     m_pGridListener.reset( new GridListenerDelegator( this ) );