diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-29 21:23:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-29 23:59:29 +0200 |
| commit | 87331efa9b190793c1719b31a62a2eef6a66f92d (patch) | |
| tree | 41073465922f0bc556c250ec59309c69f4ad7640 /sc/source | |
| parent | 67a9ae4dd80cefe04225d4fe5f7b5ff3ce3bcca8 (diff) | |
sc: fix locking in ScXMLConsolidationContext
Essentially revert commit 4fa05ecc089a027f243e87f76cc9bcd1f70447e4,
plus move the unlock to the dtor for more RAII-ness.
Change-Id: Ie5a9cc183626e3f5b005348606bffa69c4be4f7f
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xml/XMLConsolidationContext.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index e211505ca80b..525aacf97586 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -38,7 +38,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( bLinkToSource( false ), bTargetAddr(false) { - ScXMLImport::MutexGuard aGuard(GetScImport()); + rImport.LockSolarMutex(); if( !xAttrList.is() ) return; sal_Int16 nAttrCount = xAttrList->getLength(); @@ -78,6 +78,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( ScXMLConsolidationContext::~ScXMLConsolidationContext() { + GetScImport().UnlockSolarMutex(); } SvXMLImportContext *ScXMLConsolidationContext::CreateChildContext( @@ -136,7 +137,6 @@ void ScXMLConsolidationContext::EndElement() if( pDoc ) pDoc->SetConsolidateDlgData( &aConsParam ); } - GetScImport().UnlockSolarMutex(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |