diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-30 15:17:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-30 20:13:02 +0200 |
| commit | cfc2022deba6070b449f2c1d3b0b5a8b17057a47 (patch) | |
| tree | e3e845c6875e85f745e3a7c9ae70b58ee27bdee0 /svtools | |
| parent | 14afb688d3a24be302867ea614b0e30e01d168be (diff) | |
WB_AUTOSIZE is always on for SvtURLBox
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>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 6 | ||||
| -rw-r--r-- | 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; |