svx/source/tbxctrls/tbunosearchcontrollers.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c32a61b8d4461f4c936f7ea0f07624e1286f29bf
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 13 12:21:49 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 13 20:55:04 2020 +0100
nStyle is always set to WB_DROPDOWN | WB_VSCROLL
Change-Id: I8978d910cba881e8c0343111f600ba3f6aef9025
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88603
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 51c2fd5a2a4e..104355137361 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -147,7 +147,7 @@ void impl_executeSearch( const css::uno::Reference<
css::uno::XComponentContext
class FindTextFieldControl : public ComboBox
{
public:
- FindTextFieldControl( vcl::Window* pParent, WinBits nStyle,
+ FindTextFieldControl( vcl::Window* pParent,
css::uno::Reference< css::frame::XFrame > const & xFrame,
const css::uno::Reference< css::uno::XComponentContext >& xContext );
@@ -163,10 +163,10 @@ private:
std::unique_ptr<svt::AcceleratorExecute> m_pAcc;
};
-FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, WinBits
nStyle,
+FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent,
css::uno::Reference< css::frame::XFrame > const & xFrame,
const css::uno::Reference< css::uno::XComponentContext >& xContext) :
- ComboBox( pParent, nStyle ),
+ ComboBox(pParent, WB_DROPDOWN | WB_VSCROLL),
m_xFrame(xFrame),
m_xContext(xContext),
m_pAcc(svt::AcceleratorExecute::createAcceleratorHelper())
@@ -542,7 +542,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL
FindTextToolbarController::cre
if ( pParent )
{
ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get());
- m_pFindTextFieldControl = VclPtr<FindTextFieldControl>::Create(
pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xContext );
+ m_pFindTextFieldControl =
VclPtr<FindTextFieldControl>::Create(pToolbar, m_xFrame, m_xContext);
Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200);
m_pFindTextFieldControl->SetSizePixel( aSize );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
