[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/source vcl/source

[Michael Meeks]

 dbaccess/source/core/misc/dsntypes.cxx |    2 +-
 vcl/source/window/toolbox.cxx          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f17ceb9b6d6dc16a2b276a6e81aa674d87d137e1
Author: Ivan Timofeev <timofeev....@gmail.com>
Date:   Wed May 9 12:40:23 2012 +0400

    fdo#39106: properly draw separators in vertical toolbars
    
    Change-Id: If99fdb01a472e488ab6d84b09f1d1db04ba5c000
    Signed-off-by: Michael Meeks <michael.me...@suse.com>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0ae1ccb..9da3a7a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3239,7 +3239,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, 
Rectangle rRect )
     bool bNativeOk = false;
     ImplToolItem* pItem = &mpData->m_aItems[nPos];
 
-    if( IsNativeControlSupported( CTRL_TOOLBAR, PART_SEPARATOR ) )
+    if( IsHorizontal() && IsNativeControlSupported( CTRL_TOOLBAR, 
PART_SEPARATOR ) )
     {
         ImplControlValue    aControlValue;
         ControlState        nState = 0;
commit 4a2a500391734f02f9e27c06b5971e670411bdff
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date:   Thu Feb 9 22:20:12 2012 +0100

    fdo#45580 crash on "connect to existing database" wizard
    
    Signed-off-by: Michael Meeks <michael.me...@suse.com>

diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index ec1041b..324e2e5 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -172,7 +172,7 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const 
::rtl::OUString& _sURL) c
             sOldPattern = *aIter;
         }
     }
-    return sRet.GetChar(sRet.Len()-1) == '*';
+    return sRet.Len() > 0 && sRet.GetChar(sRet.Len()-1) == '*';
 }
 // 
-----------------------------------------------------------------------------
 String ODsnTypeCollection::getMediaType(const ::rtl::OUString& _sURL) const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits