[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - ucb/source vcl/unx

[Caolán McNamara]

 ucb/source/ucp/webdav-neon/NeonSession.cxx |    4 +++-
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fb0cc37991a13e81490363f187bf9adfdeb5781b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 19 16:58:50 2015 +0100

    fix assert on loading kde98819-1.html
    
    Change-Id: I3f8ccf2d0642657b3768a237c96f15cf7a7aff97
    (cherry picked from commit 1cc396069b7170c12716dbfbbab149701dd2b540)

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 6f1f81a..a35a124 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -349,7 +349,9 @@ namespace {
         {
             nContStart += sPartId.getLength();
             sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart );
-            sPart = _rRawString.copy( nContStart, nContEnd - nContStart );
+            sPart = nContEnd != -1 ?
+                _rRawString.copy(nContStart, nContEnd - nContStart) :
+                _rRawString.copy(nContStart);
         }
         return sPart;
     }
commit 56b2cc5e4b3600fa6e57d2ce0393afdc9ec93d0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 19 16:08:25 2015 +0100

    HIG: the label should specify what it's a label for
    
    Change-Id: I196812200ab82ba0d457b59022f472f942615220
    (cherry picked from commit 0196c1c9277129b058827ee1804f93ffa90a307c)

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 8cc246f..b0b8573 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -207,6 +207,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
         gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] );
         gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], false, false, 0 );
         gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], false, false, 0 );
+        gtk_label_set_mnemonic_widget( GTK_LABEL(m_pListLabels[i]), m_pLists[i] );
         gtk_box_set_spacing( GTK_BOX( m_pHBoxs[i] ), 12 );
 
         gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], false, false, 0 );
commit f16133e051d8e8b93b39ca8d192c8637460ebd1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 19 16:00:28 2015 +0100

    HIG: 12 pixels from label to widget in file picker
    
    Change-Id: Ia54eeae792efe65ca03ac08c8f5e70a7643a0b69
    (cherry picked from commit d242f46f25341b8cf96caf33d60d6179a05b901e)

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index de85382..8cc246f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -206,8 +206,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
 
         gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] );
         gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], false, false, 0 );
-
         gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], false, false, 0 );
+        gtk_box_set_spacing( GTK_BOX( m_pHBoxs[i] ), 12 );
 
         gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], false, false, 0 );
     }