diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 09:51:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 14:29:09 +0200 |
| commit | 45112bfd091b8a14729f1010d2662c9064ba03e6 (patch) | |
| tree | 6a196e3f63957248c16d4cd6b03b3dc3c6bafc32 /uui/source/iahndl.cxx | |
| parent | 27c9370b5fd00b851582e4163907656286e8c581 (diff) | |
weld NameClashDialog
Change-Id: I4c68bc92fa90ca4a9723f2664549f34b50213bfb
Reviewed-on: https://gerrit.libreoffice.org/54471
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 63e3fbdea28a..fa017aabadab 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1019,18 +1019,18 @@ executeMessageBox( return aResult; } -NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *pParent, - OUString const & rTargetFolderURL, - OUString const & rClashingName, - OUString & rProposedNewName, - bool bAllowOverwrite ) +NameClashResolveDialogResult executeSimpleNameClashResolveDialog(weld::Window *pParent, + OUString const & rTargetFolderURL, + OUString const & rClashingName, + OUString & rProposedNewName, + bool bAllowOverwrite) { std::locale aResLocale = Translate::Create("uui"); - ScopedVclPtrInstance<NameClashDialog> aDialog(pParent, aResLocale, rTargetFolderURL, - rClashingName, rProposedNewName, bAllowOverwrite); + NameClashDialog aDialog(pParent, aResLocale, rTargetFolderURL, + rClashingName, rProposedNewName, bAllowOverwrite); - NameClashResolveDialogResult eResult = static_cast<NameClashResolveDialogResult>(aDialog->Execute()); - rProposedNewName = aDialog->getNewName(); + NameClashResolveDialogResult eResult = static_cast<NameClashResolveDialogResult>(aDialog.run()); + rProposedNewName = aDialog.getNewName(); return eResult; } @@ -1063,11 +1063,12 @@ UUIInteractionHelper::handleNameClashResolveRequest( NameClashResolveDialogResult eResult = ABORT; OUString aProposedNewName( rRequest.ProposedNewName ); - eResult = executeSimpleNameClashResolveDialog( getParentProperty(), + uno::Reference<awt::XWindow> xParent = getParentXWindow(); + eResult = executeSimpleNameClashResolveDialog(Application::GetFrameWeld(xParent), rRequest.TargetFolderURL, rRequest.ClashingName, aProposedNewName, - xReplaceExistingData.is() ); + xReplaceExistingData.is()); switch ( eResult ) { |