From cfc2022deba6070b449f2c1d3b0b5a8b17057a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 30 Aug 2017 15:17:33 +0100
Subject: [PATCH] WB_AUTOSIZE is always on for SvtURLBox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1c13392b4238fc8cdb1286b39c5eaaa62f7934cb
Reviewed-on: https://gerrit.libreoffice.org/41736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 svtools/source/control/inettbc.cxx    | 6 +++---
 svtools/source/control/urlcontrol.cxx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index ce4b42629f09..7ca9f391471c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -814,7 +814,7 @@ void SvtURLBox::TryAutoComplete()
 
 
 SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
-    :   ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ),
+    :   ComboBox( pParent , WB_DROPDOWN | WB_AUTOHSCROLL ),
         eSmartProtocol( eSmart ),
         bAutoCompleteMode( false ),
         bOnlyDirectories( false ),
@@ -847,7 +847,7 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvtURLBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
 {
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
-                       WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL;
+                       WB_DROPDOWN|WB_AUTOHSCROLL;
     VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false);
     pListBox->EnableAutoSize(true);
     rRet = pListBox;
@@ -867,7 +867,7 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
     GetSubEdit()->SetAutocompleteHdl(LINK(this, SvtURLBox, AutoCompleteHdl_Impl));
     UpdatePicklistForSmartProtocol_Impl();
 
-    EnableAutoSize(GetStyle() & WB_AUTOSIZE);
+    EnableAutoSize(true);
 }
 
 SvtURLBox::~SvtURLBox()
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index ec253542c6b8..c18d2e816fe5 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -34,7 +34,7 @@ namespace svt
     extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeOFileURLControl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
     {
         WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
-                           WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL;
+                           WB_DROPDOWN|WB_AUTOHSCROLL;
         VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits);
         pListBox->EnableAutoSize(true);
         rRet = pListBox;