summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-19 14:26:36 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-10-26 20:30:12 +0200
commitd860e6a138f08343b42f591462e85b85291b6fa8 (patch)
treecb76c2de61e066c99e32f5d0d3a12e1db732f8e4 /include
parented0cba9301852feca3243338297121b4231cb0e3 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@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@cib.de>
Diffstat (limited to 'include')
-rw-r--r--include/svx/fmgridif.hxx9
1 files changed, 5 insertions, 4 deletions
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;