[Libreoffice-commits] core.git: 3 commits - basic/source connectivity/source helpcontent2

[Caolán McNamara]

 basic/source/runtime/methods.cxx                 |    3 +++
 connectivity/source/commontools/dbconversion.cxx |    6 ++++++
 helpcontent2                                     |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 60c2fed616bc1ad95ed2c48b46b94ad40e9f5657
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Jul 29 14:28:37 2013 +0100

    Updated core
    Project: help  e9f0aae948acb3c4ad6c1639bc1e08df4aebcd11

diff --git a/helpcontent2 b/helpcontent2
index 60eaec5..e9f0aae 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 60eaec58845c8f697c2d7ab5bb671273b0ff4155
+Subproject commit e9f0aae948acb3c4ad6c1639bc1e08df4aebcd11
commit 13fe681d6039ce39793b27629edfd22727f155f8
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date:   Mon Jul 29 15:26:08 2013 +0200

    fdo#67387 skip separating space between date and time in timestamp
    
    Change-Id: I3c38d179f8b2f59e79cd889fa88f4582f650c09e

diff --git a/connectivity/source/commontools/dbconversion.cxx 
b/connectivity/source/commontools/dbconversion.cxx
index e55fb98..cd2b1c3 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -457,7 +457,13 @@ namespace dbtools
         utl::Time aTime;
         sal_Int32 nSeparation = _sSQLString.indexOf( ' ' );
         if ( -1 != nSeparation )
+        {
+            const sal_Unicode *p = _sSQLString.getStr() + nSeparation;
+            const sal_Unicode *const begin = p;
+            for(;isspace(*p);++p);
+            nSeparation += p - begin;
             aTime = toTime( _sSQLString.copy( nSeparation ) );
+        }
 
         return utl::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, 
aTime.Hours,
                         aDate.Day, aDate.Month, aDate.Year, false);
commit 5e505896a5109bbf4939019ab217e80885288bbf
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date:   Mon Jul 29 12:42:45 2013 +0200

    Basic: make sure a messagebox has solarmutex
    
    Change-Id: Icc5f05456e4031ffbc88d6128689465f08eb5f0d

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1ee75dc..3ae89cb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4455,6 +4455,9 @@ RTLFUNC(MsgBox)
 
     nType &= (16+32+64);
     MessBox* pBox = 0;
+
+    SolarMutexGuard aSolarGuard;
+
     Window* pParent = GetpApp()->GetDefDialogParent();
     switch( nType )
     {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits