diff options
| author | Rashesh <rashesh.padia@collabora.com> | 2024-09-26 16:39:55 +0530 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2024-10-19 14:18:27 +0200 |
| commit | 9ffc274bbc414d1e98313af804386861beeff9bf (patch) | |
| tree | d28bd96bc41be5a8d721d307cf0174abcc6957e4 /sc | |
| parent | 115776004c875b3a8a861d070129187c893b136a (diff) | |
cool#10115 sc: enable ScPosWnd for lokit with jsdialog
Change-Id: I18829c48a2495e3aa31af83970c8c1c4791a170a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173987
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
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 3395c1a5fe84..6261437a35e8 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), @@ -2254,8 +2253,9 @@ void ScTextWnd::TextGrabFocus() } // Position window -ScPosWnd::ScPosWnd(vcl::Window* pParent) - : InterimItemWindow(pParent, "modules/scalc/ui/posbox.ui", "PosBox") +ScPosWnd::ScPosWnd(vcl::Window* pParent, ScTabViewShell* pViewShell) + : InterimItemWindow(pParent, "modules/scalc/ui/posbox.ui", "PosBox", false, + reinterpret_cast<sal_uInt64>(pViewShell)) , m_xWidget(m_xBuilder->weld_combo_box("pos_window")) , m_nAsyncGetFocusId(nullptr) , nTipVisible(nullptr) diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index ee1a6151a0e0..1c5d5b73962f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -174,7 +174,7 @@ private: std::set<OUString> aRangeNames; public: - ScPosWnd( vcl::Window* pParent ); + ScPosWnd(vcl::Window* pParent, ScTabViewShell* pViewSh); virtual ~ScPosWnd() override; virtual void dispose() override; |