[Libreoffice-commits] core.git: 2 commits - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/ui/inc/WTypeSelect.hxx  |    2 +-
 dbaccess/source/ui/misc/WTypeSelect.cxx |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit de9d0e797903e7ecc19be2b05c7e89d5936ae02d
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Dec 3 05:09:15 2015 +0100

    Revert "tdf#96012: Type formatting in Base shouldn't be multiselect"
    
    This reverts commit 103cd686de34b668a838c459f3d827c02e704656.
    Better fix for tdf#96012 in b2d479854a9182234a378166900240aee7e1c79b
    ("simple mode" for the multiselection)
    
    Change-Id: Ia6d7e5132e3f1997906a03f67ea4d7d0cf54ce7a

diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 5ff28dc..ba9e35e 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -246,7 +246,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
     m_pAutoEt->SetText("10");
     m_pAutoEt->SetDecimalDigits(0);
     m_pAutoPb->SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl));
-    m_pColumnNames->EnableMultiSelection(false);
+    m_pColumnNames->EnableMultiSelection(true);
 
     try
     {
@@ -288,6 +288,8 @@ IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
     OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
     if(pField)
         m_pTypeControl->DisplayData(pField);
+
+    m_pTypeControl->Enable(m_pColumnNames->GetSelectEntryCount() == 1 );
 }
 
 void OWizTypeSelect::Reset()
commit b2d479854a9182234a378166900240aee7e1c79b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Dec 3 05:07:11 2015 +0100

    tdf#96012 enable simple mode for the multilistbox
    
    Change-Id: Ia4d4c56318bc7d32d317abbda27eda9d3413ba75

diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 2501707..5432411 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
         VclPtr<vcl::Window>     m_pParentTabPage;
     public:
-        OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
+        OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER | WB_SIMPLEMODE )
             : MultiListBox(pParent,nStyle)
             , m_bPKey(false)
             , m_pParentTabPage(nullptr)