[Libreoffice-commits] .: 2 commits - basic/source framework/inc framework/source

[Michael Meeks]

 basic/source/runtime/methods.cxx              |    3 +++
 basic/source/runtime/methods1.cxx             |    3 ++-
 framework/inc/dispatch/closedispatcher.hxx    |    1 +
 framework/source/dispatch/closedispatcher.cxx |   11 +++++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit fe4bb3579ad4539034deada1e201aa8d9ed6518f
Author: Michael Meeks <michael.me...@suse.com>
Date:   Mon Mar 5 22:31:43 2012 +0000

    basic: add missing forward declarations for helper functions

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 28ce80f..fa7d7a1 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -122,6 +122,9 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 
 #ifndef DISABLE_SCRIPTING
 
+// forward decl.
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, 
double& rdRet );
+
 // from source/classes/sbxmod.cxx
 Reference< XModel > getDocumentModel( StarBASIC* );
 
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 91c739f..51f73d1 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -70,6 +70,7 @@ using namespace com::sun::star::i18n;
 
 void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
 Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, 
com::sun::star::beans::Property* pUnoProperty = NULL );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 
nFirstDay = 0 );
 
 static Reference< XCalendar3 > getLocaleCalendar( void )
 {
@@ -3210,7 +3211,7 @@ RTLFUNC(Me)
 
 #endif
 
-sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 
nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16 
nFirstDay )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long) aDate;
commit 5b2cb23c429e1be1099008473770c634ce96c969
Author: Michael Meeks <michael.me...@suse.com>
Date:   Mon Mar 5 21:18:00 2012 +0000

    attempt fix of hang on base close, due to solarmutex deadlock on join

diff --git a/framework/inc/dispatch/closedispatcher.hxx 
b/framework/inc/dispatch/closedispatcher.hxx
index 81d8842..eabad8c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -206,6 +206,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     during they call us ...
         */
         DECL_LINK( impl_asyncCallback, void* );
+        void doClose();
 
         //---------------------------------------
         /** @short  prepare m_xCloseFrame so it should be closeable without 
problems.
diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index 01523d2..0b670eb 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -268,6 +268,13 @@ void SAL_CALL 
CloseDispatcher::dispatchWithNotification(const css::util::URL&
 */
 IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
 {
+    SolarMutexReleaser aReleaser;
+    doClose();
+    return 0;
+}
+
+void CloseDispatcher::doClose()
+{
     try
     {
 
@@ -296,7 +303,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     // frame already dead ?!
     // Nothing to do !
     if (! xCloseFrame.is())
-        return 0;
+        return;
 
     sal_Bool bCloseFrame           = sal_False;
     sal_Bool bEstablishBackingMode = sal_False;
@@ -452,7 +459,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     {
     }
 
-    return 0;
+    return;
 }
 
 //-----------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits