[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - extensions/source

[Julien Nabet]

 extensions/source/abpilot/typeselectionpage.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc66e55c53d55a91fffa7591fec96cb9578e71e3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Dec 9 22:14:21 2015 +0100

    tdf#96368: Address book wizard with no selection returns Evolution
    
    Don't select an option which is not even visible
    
    Change-Id: I003c835d7d623e559d67098de48efdf057a64422
    Reviewed-on: https://gerrit.libreoffice.org/20552
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 7b69dd64be71d1420158a553fb5ec861039cb017)
    Reviewed-on: https://gerrit.libreoffice.org/20558
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 6158def661f8281c4fc3493c7e2a1753d3891437)
    Reviewed-on: https://gerrit.libreoffice.org/20559
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 90bdf31..cfc9464 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -219,7 +219,7 @@ namespace abp
               loop != m_aAllTypes.end(); ++loop )
         {
             ButtonItem aItem = (*loop);
-            if ( aItem.m_pItem->IsChecked() )
+            if ( aItem.m_pItem->IsChecked() && aItem.m_bVisible )
                 return aItem.m_eType;
         }