sc/qa/extras/macros-test.cxx | 2 +- sw/source/core/unocore/unotbl.cxx | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-)
New commits: commit be6108a861891b2e7060c6e16c47450d0b8b86e6 Author: Michael Meeks <michael.me...@collabora.com> Date: Wed Nov 25 14:22:29 2015 +0000 sw: SwXTextTableCursor needs to take the SolarMutex in release. Change-Id: I1fb5baabd869c4abe8ccf9eeae131efcc697bbee diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 6f93d12..044a514 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -795,6 +795,8 @@ void SAL_CALL SwXCell::acquire( ) throw() void SAL_CALL SwXCell::release( ) throw() { + SolarMutexGuard aGuard; + SwXCellBaseClass::release(); } @@ -1430,7 +1432,27 @@ OUString SwXTextTableCursor::getImplementationName() throw( uno::RuntimeExceptio sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -IMPLEMENT_FORWARD_XINTERFACE2(SwXTextTableCursor,SwXTextTableCursor_Base,OTextCursorHelper) +void SwXTextTableCursor::acquire() throw() +{ + SwXTextTableCursor_Base::release(); +} + +void SwXTextTableCursor::release() throw() +{ + SolarMutexGuard aGuard; + SwXTextTableCursor_Base::release(); +} + +css::uno::Any SAL_CALL +SwXTextTableCursor::queryInterface( const css::uno::Type& _rType ) + throw (css::uno::RuntimeException, std::exception) +{ + css::uno::Any aReturn = SwXTextTableCursor_Base::queryInterface( _rType ); + if ( !aReturn.hasValue() ) + aReturn = OTextCursorHelper::queryInterface( _rType ); + return aReturn; +} + const SwPaM* SwXTextTableCursor::GetPaM() const { return &GetCursor(); } SwPaM* SwXTextTableCursor::GetPaM() { return &GetCursor(); } const SwDoc* SwXTextTableCursor::GetDoc() const { return GetFrameFormat()->GetDoc(); } commit e63938cad10f15d50f27b3e3575069ace7358d07 Author: Michael Meeks <michael.me...@collabora.com> Date: Wed Nov 25 14:19:15 2015 +0000 sc: improve vba macro debugging output. Change-Id: I8c8cd6255b6722d4d46d6e652e9d9d9722fe112e diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index e2a6f32..9243250 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -326,7 +326,7 @@ void ScMacrosTest::testVba() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - SAL_INFO("sc.qa", "about to invoke vba test in " << aFileName); + SAL_INFO("sc.qa", "about to invoke vba test in " << aFileName << " with url " << testInfo[i].sMacroUrl); SfxObjectShell::CallXScript( xComponent, testInfo[i].sMacroUrl, aParams, aRet, aOutParamIndex, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits