diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 14 | ||||
| -rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index b70a2d21aa90..f9d76b365959 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -144,7 +144,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const } -static VclPtr<ScInputBarGroup> lcl_chooseRuntimeImpl( vcl::Window* pParent, const SfxBindings* pBind ) +static ScTabViewShell* lcl_chooseRuntimeImpl( const SfxBindings* pBind ) { ScTabViewShell* pViewSh = nullptr; SfxDispatcher* pDisp = pBind->GetDispatcher(); @@ -154,15 +154,14 @@ static VclPtr<ScInputBarGroup> lcl_chooseRuntimeImpl( vcl::Window* pParent, cons if ( pViewFrm ) pViewSh = dynamic_cast<ScTabViewShell*>( pViewFrm->GetViewShell() ); } - - return VclPtr<ScInputBarGroup>::Create( pParent, pViewSh ); + return pViewSh; } ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) : // With WB_CLIPCHILDREN otherwise we get flickering ToolBox ( pParent, WinBits(WB_CLIPCHILDREN | WB_BORDER | WB_NOSHADOW) ), - aWndPos ( !comphelper::LibreOfficeKit::isActive() ? VclPtr<ScPosWnd>::Create(this) : nullptr ), - mxTextWindow ( lcl_chooseRuntimeImpl( this, pBind ) ), + aWndPos ( VclPtr<ScPosWnd>::Create( this, lcl_chooseRuntimeImpl(pBind)) ), + mxTextWindow ( VclPtr<ScInputBarGroup>::Create( this, lcl_chooseRuntimeImpl(pBind)) ), pInputHdl ( nullptr ), mpViewShell ( nullptr ), mnMaxY (0), @@ -2253,8 +2252,9 @@ void ScTextWnd::TextGrabFocus() } // Position window -ScPosWnd::ScPosWnd(vcl::Window* pParent) - : InterimItemWindow(pParent, u"modules/scalc/ui/posbox.ui"_ustr, u"PosBox"_ustr) +ScPosWnd::ScPosWnd(vcl::Window* pParent, ScTabViewShell* pViewShell) + : InterimItemWindow(pParent, u"modules/scalc/ui/posbox.ui"_ustr, u"PosBox"_ustr, false, + reinterpret_cast<sal_uInt64>(pViewShell)) , m_xWidget(m_xBuilder->weld_combo_box(u"pos_window"_ustr)) , m_nAsyncGetFocusId(nullptr) , nTipVisible(nullptr) diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index d98b5a85c56f..832a37356424 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -172,7 +172,7 @@ private: bool bFormulaMode; public: - ScPosWnd( vcl::Window* pParent ); + ScPosWnd(vcl::Window* pParent, ScTabViewShell* pViewSh); virtual ~ScPosWnd() override; virtual void dispose() override; |