include/tools/wintypes.hxx | 1 -
svtools/source/control/inettbc.cxx | 6 +++---
svtools/source/control/urlcontrol.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
toolkit/source/awt/scrollabledialog.cxx | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 2fdbf463f9d934bca48131df8b51caf36da2e8e5
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 30 15:19:50 2017 +0100
nothing is reading the futilely set WB_AUTOSIZE bit
Change-Id: Ifbc2dffcb8db1511d5c08e51c972e822355f41c6
Reviewed-on: https://gerrit.libreoffice.org/41737
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 15075f698449..39e23202b00f 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -117,7 +117,6 @@ WinBits const WB_BORDER = 0x00000008;
WinBits const WB_NOBORDER = 0x00000010;
WinBits const WB_SIZEABLE = 0x00000020;
WinBits const WB_3DLOOK = 0x00000040;
-WinBits const WB_AUTOSIZE = 0x00000080;
// Window-Bits for SystemWindows
WinBits const WB_MOVEABLE = 0x00000100;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4dd05c8d9c13..dc5ccfee8339 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1312,7 +1312,7 @@ SvxColorWindow::SvxColorWindow(const OUString&
rCommand,
mpColorSet->SetAccessibleName( GetText() );
- mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER |
WB_AUTOSIZE );
+ mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER );
mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow,
SelectPaletteHdl ) );
mpPaletteListBox->AdaptDropDownLineCountToMaximum();
std::vector<OUString> aPaletteList = mrPaletteManager.GetPaletteList();
diff --git a/toolkit/source/awt/scrollabledialog.cxx
b/toolkit/source/awt/scrollabledialog.cxx
index 902d64b79f63..230d53e14471 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -74,7 +74,7 @@ void ScrollableDialog::setScrollVisibility(
ScrollBarVisibility rVisState )
maVScrollBar->Show();
}
if ( mbHasHoriBar || mbHasVertBar )
- SetStyle( Dialog::GetStyle() | WB_CLIPCHILDREN | WB_AUTOSIZE );
+ SetStyle( Dialog::GetStyle() | WB_CLIPCHILDREN );
}
ScrollableDialog::~ScrollableDialog()
commit cfc2022deba6070b449f2c1d3b0b5a8b17057a47
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 30 15:17:33 2017 +0100
WB_AUTOSIZE is always on for SvtURLBox
Change-Id: I1c13392b4238fc8cdb1286b39c5eaaa62f7934cb
Reviewed-on: https://gerrit.libreoffice.org/41736
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
