diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-26 15:24:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-26 17:12:56 +0100 |
commit | a75c8e8dce22facea5eae454d050515f169a3f8b (patch) | |
tree | 3dc9ab3e1075f7222787fbf74777b327adfbb55e /include | |
parent | feb5eb180de5e25ee6ee630b66f9cd876df60652 (diff) |
Resolves: tdf#96279 set correct parents for password dialogs
otherwise on Dialog::Execute before it becomes visible and
a password dialog is needed the new dialog will automatically
look for a parent, but will be parented by the main window
because the dialog it should be a parent of is not visible
yet.
Change-Id: Ia34e43d7ef2b204b348f2eb5aab542ee8ffe840e
(cherry picked from commit 7417311fc0f888223ae05f1cfc750de1735c5c9e)
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/ServerDetailsControls.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 181c7569ca75..b6ceaa2bb3b5 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -18,6 +18,7 @@ #include <tools/urlobj.hxx> #include <vcl/builder.hxx> #include <vcl/button.hxx> +#include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> @@ -136,9 +137,10 @@ class CmisDetailsContainer : public DetailsContainer VclPtr<FixedText> m_pFTRepository; VclPtr<ListBox> m_pLBRepository; VclPtr<Button> m_pBTRepoRefresh; + css::uno::Reference< css::awt::XWindow > m_xParentDialog; public: - CmisDetailsContainer( VclBuilderContainer* pBuilder, OUString const & sBinding ); + CmisDetailsContainer(VclBuilderContainer* pBuilder, Dialog* pParentDialog, OUString const & sBinding); virtual ~CmisDetailsContainer( ) { }; virtual void show( bool bShow = true ) override; |