reportdesign/source/core/sdr/RptModel.cxx | 2 ++ reportdesign/source/ui/dlg/AddField.cxx | 2 ++ svtools/source/contnr/treelistbox.cxx | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit c63b74d22d360893bb9e1200f59099ffb7943705 Author: Lionel Elie Mamane <[email protected]> Date: Wed Jul 3 21:34:26 2013 +0200 fdo#61725 add SolarMutex until it works Change-Id: I757bbfbc4a548f17d797ac00197588bc6e2907f6 diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 9553291..640018b 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -22,6 +22,7 @@ #include <dbaccess/dbsubcomponentcontroller.hxx> #include <tools/debug.hxx> #include <unotools/pathoptions.hxx> +#include <vcl/svapp.hxx> #include "UndoActions.hxx" #include "UndoEnv.hxx" @@ -111,6 +112,7 @@ SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum) // ----------------------------------------------------------------------------- OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection >& _xSection) { + SolarMutexGuard aSolarGuard; OReportPage* pPage = new OReportPage( *this ,_xSection); InsertPage(pPage); m_pUndoEnv->AddSection(_xSection); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index d849d01..bee9548 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -305,6 +305,8 @@ namespace //----------------------------------------------------------------------- void OAddFieldWindow::Update() { + SolarMutexGuard aSolarGuard; + if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); m_pContainerListener = NULL; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 10c3c65..3f02d6e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3692,6 +3692,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uLong nPos ) { + SolarMutexGuard aSolarGuard; + if( nActionId == LISTACTION_CLEARING ) CancelTextEditing(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
