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

nStyle is always set to WB_DROPDOWN | WB_VSCROLL

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2020-02-13 12:21:49 +00:00
parent c4281cb41e
commit c32a61b8d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svx/source/tbxctrls/tbunosearchcontrollers.cxx
View File

@@ -147,7 +147,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
class FindTextFieldControl : public ComboBox class FindTextFieldControl : public ComboBox
{ {
public: public:
FindTextFieldControl( vcl::Window* pParent, WinBits nStyle, FindTextFieldControl( vcl::Window* pParent,
css::uno::Reference< css::frame::XFrame > const & xFrame, css::uno::Reference< css::frame::XFrame > const & xFrame,
const css::uno::Reference< css::uno::XComponentContext >& xContext ); const css::uno::Reference< css::uno::XComponentContext >& xContext );
@@ -163,10 +163,10 @@ private:
std::unique_ptr<svt::AcceleratorExecute> m_pAcc; 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, css::uno::Reference< css::frame::XFrame > const & xFrame,
const css::uno::Reference< css::uno::XComponentContext >& xContext) : const css::uno::Reference< css::uno::XComponentContext >& xContext) :
ComboBox( pParent, nStyle ), ComboBox(pParent, WB_DROPDOWN | WB_VSCROLL),
m_xFrame(xFrame), m_xFrame(xFrame),
m_xContext(xContext), m_xContext(xContext),
m_pAcc(svt::AcceleratorExecute::createAcceleratorHelper()) m_pAcc(svt::AcceleratorExecute::createAcceleratorHelper())
@@ -542,7 +542,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
if ( pParent ) if ( pParent )
{ {
ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get()); 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); Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200);
m_pFindTextFieldControl->SetSizePixel( aSize ); m_pFindTextFieldControl->SetSizePixel( aSize );