[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Ivan Timofeev]

 vcl/source/window/toolbox.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 32901f70b131939df733e725ecee02e3432d4e89
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Sun Jun 10 12:52:56 2012 +0400

    separator will be invisible if there is no visible buttons
    
    Change-Id: Ife88aa5059630b7d71f567a2c8368cec55050eef
    (cherry picked from commit cf5001f99fe7a855155c5b3facc241163ccf1777)

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 370eb0d..c672c7a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2353,8 +2353,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems )
                 std::vector< ImplToolItem >::iterator temp_it;
                 for ( temp_it = it+1; temp_it != rItems.end(); ++temp_it )
                 {
-                    if ( (temp_it->meType == TOOLBOXITEM_SEPARATOR) ||
-                         ((temp_it->meType == TOOLBOXITEM_BUTTON) &&
+                    if ( ((temp_it->meType == TOOLBOXITEM_BUTTON) &&
                           temp_it->mbVisible) )
                     {
                         it->mbVisible = sal_True;