diff options
| -rw-r--r-- | include/sfx2/childwin.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/ChildWindowWrapper.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/reffact.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/reffact.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshc.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 3 |
7 files changed, 13 insertions, 8 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 568abf3f2e21..ff12fe30b3d0 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -136,7 +136,7 @@ public: static void RegisterChildWindow(SfxModule*, const SfxChildWinFactory&); - static std::unique_ptr<SfxChildWindow> CreateChildWindow( sal_uInt16, vcl::Window*, SfxBindings*, SfxChildWinInfo const &); + static std::unique_ptr<SfxChildWindow> CreateChildWindow( sal_uInt16, vcl::Window*, SfxBindings*, SfxChildWinInfo &); void SetHideNotDelete( bool bOn ); bool IsHideNotDelete() const; bool IsVisible() const; diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index 5fb038df27dd..926e456c87ce 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -22,7 +22,7 @@ class ChildControllerWrapper : public SfxChildWindow { public: ChildControllerWrapper(vcl::Window* pParentP, sal_uInt16 nId, - SfxBindings* pBindings, const SfxChildWinInfo* pInfo) + SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(pParentP, nId) { ScTabViewShell* pViewShell = getTabViewShell( pBindings ); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 4fbe965c15d9..de001354bda8 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -28,7 +28,7 @@ class Class : public SfxChildWindow \ { \ public: \ - Class( vcl::Window*, sal_uInt16, SfxBindings*, const SfxChildWinInfo* ); \ + Class( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); \ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 1b80b0ab2f25..47c5c46e1bb0 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -356,7 +356,7 @@ public: static ScTabViewShell* GetActiveViewShell(); std::shared_ptr<SfxModelessDialogController> CreateRefDialogController(SfxBindings* pB, SfxChildWindow* pCW, - const SfxChildWinInfo* pInfo, + SfxChildWinInfo* pInfo, weld::Window* pParent, sal_uInt16 nSlotId); void UpdateOleZoom(); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 3834e3b8c33f..999f0402d0a6 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -67,7 +67,7 @@ namespace Class::Class( vcl::Window* pParentP, \ sal_uInt16 nId, \ SfxBindings* p, \ - const SfxChildWinInfo* pInfo ) \ + SfxChildWinInfo* pInfo ) \ : SfxChildWindow(pParentP, nId) \ { \ /************************************************************************************/\ @@ -227,6 +227,7 @@ ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper(vcl::Window* pParentP, { auto xDlg = std::make_shared<ScAcceptChgDlg>(pBindings, this, pParentP->GetFrameWeld(), &pViewShell->GetViewData()); SetController(xDlg); + pInfo->nFlags = SfxChildWindowFlags::NEVERHIDE; xDlg->Initialize( pInfo ); } else diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 8e2e74e8e4fb..f94850596731 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -115,7 +115,7 @@ void ScTabViewShell::SwitchBetweenRefDialogs(SfxModelessDialogController* pDialo std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogController( SfxBindings* pB, SfxChildWindow* pCW, - const SfxChildWinInfo* pInfo, + SfxChildWinInfo* pInfo, weld::Window* pParent, sal_uInt16 nSlotId) { // only open dialog when called through ScModule::SetRefDialog, @@ -449,7 +449,10 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont } if (xResult) - xResult->Initialize( pInfo ); + { + pInfo->nFlags = SfxChildWindowFlags::NEVERHIDE; + xResult->Initialize(pInfo); + } return xResult; } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 6bf2814599ec..9dd6da83d235 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -198,7 +198,7 @@ SfxChildWindow::~SfxChildWindow() } std::unique_ptr<SfxChildWindow> SfxChildWindow::CreateChildWindow( sal_uInt16 nId, - vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo const & rInfo) + vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo & rInfo) { std::unique_ptr<SfxChildWindow> pChild; SfxChildWinFactory* pFact=nullptr; @@ -239,6 +239,7 @@ std::unique_ptr<SfxChildWindow> SfxChildWindow::CreateChildWindow( sal_uInt16 nI SfxChildWinInfo aInfo = rInfo; Application::SetSystemWindowMode( SystemWindowFlags::NOAUTOMODE ); pChild = pFact->pCtor( pParent, nId, pBindings, &aInfo ); + rInfo.nFlags |= aInfo.nFlags; Application::SetSystemWindowMode( nOldMode ); if ( pBindings ) pBindings->LEAVEREGISTRATIONS(); |