[Libreoffice-commits] core.git: fpicker/source svtools/source

[Caolán McNamara]

 fpicker/source/office/iodlg.src    |    3 +++
 svtools/source/control/inettbc.cxx |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6a4e3194bb16b595885e2814c92ace8911f9a5f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 14 20:30:11 2013 +0100

    Resolves: fdo#65569 dropdown list missing from built-in fpicker
    
    regression since a8c2cb0e6d0b9b301887be176694592f8ecda0c4
    the different ctors have different defaults around whether
    they show the dropdown or not.
    
    Change-Id: I3d1bb423c8a25b81ffb26981b63af7498f99e70a

diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index a4282d0..0524547 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -120,6 +120,9 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
         Pos = MAP_APPFONT ( 59 , 117 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
+        DropDown = TRUE ;
+        AutoSize = TRUE ;
+        AutoHScroll = TRUE ;
     };
     FixedText FT_EXPLORERFILE_SHARED_LISTBOX
     {
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 917639d..5ff01ab 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -899,10 +899,12 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
         SetHelpId( ".uno:OpenURL" );
     EnableAutocomplete( sal_False );
 
-    SetText( String() );
+    SetText( OUString() );
 
     GetSubEdit()->SetAutocompleteHdl( LINK( this, SvtURLBox, AutoCompleteHdl_Impl ) );
     UpdatePicklistForSmartProtocol_Impl();
+
+    EnableAutoSize(GetStyle() & WB_AUTOSIZE);
 }
 
 SvtURLBox::~SvtURLBox()