summaryrefslogtreecommitdiff
path: root/uui/source/iahndl-locking.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-05-17 10:28:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-05-17 22:16:58 +0200
commitf9ecd0f47960c8975f01c4564228796342e19be1 (patch)
treeab91a4d04195cae9f891fac44ed3225141c9f863 /uui/source/iahndl-locking.cxx
parentbf09cd79d3414d88ea6c1d348ed191a77e8c413e (diff)
go through getParentXWindow
Change-Id: I1f52e1f9ff3fedf8996f72e671400c2549e74dfe Reviewed-on: https://gerrit.libreoffice.org/54488 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/iahndl-locking.cxx')
-rw-r--r--uui/source/iahndl-locking.cxx58
1 files changed, 29 insertions, 29 deletions
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index b1fa4989d66d..8df6c85b0608 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -210,38 +210,38 @@ UUIInteractionHelper::handleLockedDocumentRequest(
document::LockedDocumentRequest aLockedDocumentRequest;
if (aAnyRequest >>= aLockedDocumentRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleLockedDocumentRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- aLockedDocumentRequest.DocumentURL,
- aLockedDocumentRequest.UserInfo,
- rRequest->getContinuations(),
- UUI_DOC_LOAD_LOCK );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleLockedDocumentRequest_(Application::GetFrameWeld(xParent),
+ aLockedDocumentRequest.DocumentURL,
+ aLockedDocumentRequest.UserInfo,
+ rRequest->getContinuations(),
+ UUI_DOC_LOAD_LOCK);
return true;
}
document::OwnLockOnDocumentRequest aOwnLockOnDocumentRequest;
if (aAnyRequest >>= aOwnLockOnDocumentRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleLockedDocumentRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- aOwnLockOnDocumentRequest.DocumentURL,
- aOwnLockOnDocumentRequest.TimeInfo,
- rRequest->getContinuations(),
- aOwnLockOnDocumentRequest.IsStoring
- ? UUI_DOC_OWN_SAVE_LOCK
- : UUI_DOC_OWN_LOAD_LOCK );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleLockedDocumentRequest_(Application::GetFrameWeld(xParent),
+ aOwnLockOnDocumentRequest.DocumentURL,
+ aOwnLockOnDocumentRequest.TimeInfo,
+ rRequest->getContinuations(),
+ aOwnLockOnDocumentRequest.IsStoring
+ ? UUI_DOC_OWN_SAVE_LOCK
+ : UUI_DOC_OWN_LOAD_LOCK);
return true;
}
document::LockedOnSavingRequest aLockedOnSavingRequest;
if (aAnyRequest >>= aLockedOnSavingRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleLockedDocumentRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- aLockedOnSavingRequest.DocumentURL,
- aLockedOnSavingRequest.UserInfo,
- rRequest->getContinuations(),
- UUI_DOC_SAVE_LOCK );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleLockedDocumentRequest_(Application::GetFrameWeld(xParent),
+ aLockedOnSavingRequest.DocumentURL,
+ aLockedOnSavingRequest.UserInfo,
+ rRequest->getContinuations(),
+ UUI_DOC_SAVE_LOCK);
return true;
}
return false;
@@ -256,9 +256,9 @@ UUIInteractionHelper::handleChangedByOthersRequest(
document::ChangedByOthersRequest aChangedByOthersRequest;
if (aAnyRequest >>= aChangedByOthersRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleChangedByOthersRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- rRequest->getContinuations() );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleChangedByOthersRequest_(Application::GetFrameWeld(xParent),
+ rRequest->getContinuations());
return true;
}
return false;
@@ -274,18 +274,18 @@ UUIInteractionHelper::handleLockFileProblemRequest(
document::LockFileIgnoreRequest aLockFileIgnoreRequest;
if (aAnyRequest >>= aLockFileIgnoreRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleLockFileProblemRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- rRequest->getContinuations(), UUI_DOC_CreateErrDlg );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleLockFileProblemRequest_(Application::GetFrameWeld(xParent),
+ rRequest->getContinuations(), UUI_DOC_CreateErrDlg);
return true;
}
document::LockFileCorruptRequest aLockFileCorruptRequest;
if (aAnyRequest >>= aLockFileCorruptRequest )
{
- vcl::Window* pWin = getParentProperty();
- handleLockFileProblemRequest_( pWin ? pWin->GetFrameWeld() : nullptr,
- rRequest->getContinuations(), UUI_DOC_CorruptErrDlg );
+ uno::Reference<awt::XWindow> xParent = getParentXWindow();
+ handleLockFileProblemRequest_(Application::GetFrameWeld(xParent),
+ rRequest->getContinuations(), UUI_DOC_CorruptErrDlg);
return true;
}