diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-11 20:54:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-11 21:19:46 +0100 |
| commit | a7a96078ff5d7b0d5655db64e49ec4d48c6bb3f4 (patch) | |
| tree | 54dcc7174516d3a6836ca95f21458070a2b65b6d /sd/source/ui/func/fucopy.cxx | |
| parent | 58a64174a8679b10464180d3807e4b89a1535b42 (diff) | |
Resolves: tdf#99464 set what parent the dialogs are dialogs for
With nullptr a parent is searched for and assigned (unless NoParent is
set which means no parent)
since...
commit dd46727b99d4bb5135451aa7e5e1bdb197373843
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Apr 5 15:27:38 2016 +0100
Resolves; tdf#87120 no keyboard navigation inside floating windows
lets try and treat these the same as we do normal toplevels
like dialogs if they popup with GrabFocus.
This way focus can be set on widgets inside the floating windows, and
so keyboard traversal of widgets etc all works.
I believe an active menu is allowed as a parent (which I'll investigate and see
if we can fix or revert that if necessary), but its good practice to explicitly
set the right parent rather than depending on what happens to be on top anyway.
Change-Id: I744f6d9bc133058a4a9db94d6c27d2e36e22179e
Diffstat (limited to 'sd/source/ui/func/fucopy.cxx')
| -rw-r--r-- | sd/source/ui/func/fucopy.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 1d38fdebea61..d6bab1ad174c 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -26,6 +26,7 @@ #include "strings.hrc" #include "ViewShell.hxx" #include "View.hxx" +#include "Window.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include <vcl/wrkwin.hxx> @@ -101,7 +102,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); if( pFact ) { - std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(aSet, mpDoc->GetColorList(), mpView )); + std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(mpViewShell->GetActiveWindow(), aSet, mpDoc->GetColorList(), mpView )); if (!pDlg) return; |