sc/source/ui/unoobj/viewuno.cxx | 2 ++
sw/source/core/unocore/unostyle.cxx | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 72d6f917aeb011394b4545530605f5f932f6ad8f
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Nov 11 12:40:47 2014 +0100
sc: ~ScViewPaneBase() needs the SolarMutex
Change-Id: Idbda230e8e4e48804b356e35cba3a3488cd4c55c
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index db4769f..769fe67 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -129,6 +129,8 @@ ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh,
sal_uInt16 nP) :
ScViewPaneBase::~ScViewPaneBase()
{
+ SolarMutexGuard g;
+
if (pViewShell)
EndListening(*pViewShell);
}
commit 8863396e7039f891ef23298dd15ce3ed9a9fb782
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Nov 11 11:20:46 2014 +0100
sw: fix misleading log message
Change-Id: Iec87ed441ccdb03646fecaa8102a047c07a9b25d
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index cb9417c..5d61911 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4213,7 +4213,7 @@ uno::Reference< style::XAutoStyle >
SwXAutoStyleFamily::insertStyle(
if (!pEntry)
{
- SAL_WARN("sw.core", "SwXAutoStyleFamily::Modify: Unknown
property: " << rPropName);
+ SAL_WARN("sw.core", "SwXAutoStyleFamily::insertStyle: Unknown
property: " << rPropName);
continue;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
