mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WB_AUTOSIZE is always on for SvtURLBox

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2017-08-30 15:17:33 +01:00
parent 14afb688d3
commit cfc2022deb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
svtools/source/control/inettbc.cxx
View File

@@ -814,7 +814,7 @@ void SvtURLBox::TryAutoComplete()
SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) 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 ), eSmartProtocol( eSmart ),
bAutoCompleteMode( false ), bAutoCompleteMode( false ),
bOnlyDirectories( 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 &) 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| 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); VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false);
pListBox->EnableAutoSize(true); pListBox->EnableAutoSize(true);
rRet = pListBox; rRet = pListBox;
@@ -867,7 +867,7 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)
GetSubEdit()->SetAutocompleteHdl(LINK(this, SvtURLBox, AutoCompleteHdl_Impl)); GetSubEdit()->SetAutocompleteHdl(LINK(this, SvtURLBox, AutoCompleteHdl_Impl));
UpdatePicklistForSmartProtocol_Impl(); UpdatePicklistForSmartProtocol_Impl();
EnableAutoSize(GetStyle() & WB_AUTOSIZE); EnableAutoSize(true);
} }
SvtURLBox::~SvtURLBox() SvtURLBox::~SvtURLBox()

2
svtools/source/control/urlcontrol.cxx
View File

@@ -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 &) 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| 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); VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits);
pListBox->EnableAutoSize(true); pListBox->EnableAutoSize(true);
rRet = pListBox; rRet = pListBox;