[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - dbaccess/source dbaccess/uiconfig

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/opendoccontrols.cxx |    4 ++++
 dbaccess/uiconfig/ui/generalpagewizard.ui      |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8525523c926305d134324f16f31c5b10e474808e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 12 16:24:45 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Dec 16 13:38:44 2019 +0100

    Resolves: tdf#128972 limit width of combobox of recently-used
    
    in the wizard so that the end of the combobox is available and the
    dialog isn't oversized.
    
    the user can resize the window to see more of the text of the recently-used
    
    Change-Id: Ic0b8d6c6e8840052e8f20e9f9a13d44140efde85
    Reviewed-on: https://gerrit.libreoffice.org/85070
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 1a86e465b3c9..48c7a9162c39 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -124,6 +124,10 @@ namespace dbaui
     OpenDocumentListBox::OpenDocumentListBox(std::unique_ptr<weld::ComboBox> xControl, const sal_Char* _pAsciiModuleName )
         : m_xControl(std::move(xControl))
     {
+        // we need to limit the max auto width feature of the filter box
+        int nWidth = m_xControl->get_approximate_digit_width() * 50;
+        m_xControl->set_size_request(nWidth, -1);
+
         impl_init( _pAsciiModuleName );
     }
 
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 32a666a71db9..029fc1adf94d 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -153,7 +153,7 @@
           <object class="GtkComboBoxText" id="documentList">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="expand">False</property>