summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-13 12:21:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-13 20:55:04 +0100
commitc32a61b8d4461f4c936f7ea0f07624e1286f29bf (patch)
tree2d0f9c3220248837d0b9c14981796977fc5bb482
parentc4281cb41e6b76cabd5fe42fc707877e864dfb82 (diff)
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 <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx8
1 files changed, 4 insertions, 4 deletions
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 );