diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 10:16:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 16:08:02 +0100 |
| commit | 9aa46fbc67b8c1098e36fdf00dfc2468ee3a1694 (patch) | |
| tree | 70bc08871fc4a2a0cb64a20696a535cfb9542f29 /sfx2 | |
| parent | 5b348b1a8ca3c5ba1049aacba1ac2e3c43ed26b7 (diff) | |
set parent for password dialog
Change-Id: I3276cdc1a9f94aead260706cb378e278000081be
Reviewed-on: https://gerrit.libreoffice.org/51728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 141e43ce2742..78d5a3a409a4 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -855,7 +855,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl, Button*, void) } } -IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl, Button*, void) +IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl, Button*, void) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -869,7 +869,7 @@ IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl, Button*, void) if (!pFilter) break; - sfx2::RequestPassword(pFilter, OUString(), pMedSet); + sfx2::RequestPassword(pFilter, OUString(), pMedSet, GetParentDialog()); pShell->SetModified(); } while (false); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 9c8386746628..8c2e0ecc4175 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1513,7 +1513,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, { // ask for a password OUString aDocName(rpURLList[0]); - ErrCode errCode = RequestPassword(pCurrentFilter, aDocName, rpSet); + ErrCode errCode = RequestPassword(pCurrentFilter, aDocName, rpSet, mpPreferredParentWindow); if (errCode != ERRCODE_NONE) return errCode; } @@ -2662,9 +2662,9 @@ ErrCode FileOpenDialog_Impl( const vcl::Window* pParent, return nRet; } -ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet) +ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, vcl::Window* pPreferredParentWindow) { - uno::Reference < task::XInteractionHandler2 > xInteractionHandler = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), nullptr ); + uno::Reference<task::XInteractionHandler2> xInteractionHandler = task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), VCLUnoHelper::GetInterface(pPreferredParentWindow)); // TODO: need a save way to distinguish MS filters from other filters // for now MS-filters are the only alien filters that support encryption bool bMSType = !pCurrentFilter->IsOwnFormat(); |