diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-11 14:38:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-11 21:50:55 +0200 |
| commit | 4ab0912cd214a4b0bdcbcdd2711b831dab9ca60a (patch) | |
| tree | 043a6e9c404677872ef1d015224552551e85c0a2 /fpicker | |
| parent | b6f7a4908d1c3fc610440a1cbbbc1673a53da8b6 (diff) | |
weld PlaceEditDialog
Change-Id: I971784afc8c2ba6ebd7809c20ef8d730aafbfe31
Reviewed-on: https://gerrit.libreoffice.org/52727
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 'fpicker')
| -rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 8 | ||||
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 20 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 |
3 files changed, 17 insertions, 17 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 9f233d059a01..3d6741d1bd6e 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -210,13 +210,13 @@ IMPL_LINK_NOARG( PlacesListBox, DoubleClick, SvTreeListBox*, bool ) PlacePtr pPlace = maPlaces[nSelected]; if ( pPlace->IsEditable() && !pPlace->IsLocal( ) ) { - ScopedVclPtrInstance< PlaceEditDialog > aDlg(mpDlg, pPlace); - short aRetCode = aDlg->Execute(); + PlaceEditDialog aDlg(mpDlg->GetFrameWeld(), pPlace); + short aRetCode = aDlg.run(); switch(aRetCode) { case RET_OK : { - pPlace->SetName ( aDlg->GetServerName() ); - pPlace->SetUrl( aDlg->GetServerUrl() ); + pPlace->SetName ( aDlg.GetServerName() ); + pPlace->SetUrl( aDlg.GetServerUrl() ); mbUpdated = true; break; } diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 06eb31b10b3d..9c3e0902f707 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -746,22 +746,22 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, ListViewHdl, Button*, void ) IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl, Button*, void ) { - ScopedVclPtrInstance< PlaceEditDialog > aDlg( this ); - aDlg->ShowPasswordControl(); - short aRetCode = aDlg->Execute(); + PlaceEditDialog aDlg(GetFrameWeld()); + aDlg.ShowPasswordControl(); + short aRetCode = aDlg.run(); switch( aRetCode ) { case RET_OK : { - ServicePtr newService = aDlg->GetPlace(); + ServicePtr newService = aDlg.GetPlace(); m_aServices.push_back( newService ); - OUString sPassword = aDlg->GetPassword(); - OUString sUser = aDlg->GetUser(); + OUString sPassword = aDlg.GetPassword(); + OUString sUser = aDlg.GetUser(); if( !sUser.isEmpty() && !sPassword.isEmpty() ) { - bool bPersistent = aDlg->IsRememberChecked(); + bool bPersistent = aDlg.IsRememberChecked(); SavePassword( newService->GetUrl(), sUser, sPassword, bPersistent ); } @@ -811,14 +811,14 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) if( nPos >= 0 ) { - ScopedVclPtrInstance< PlaceEditDialog > aDlg( this, m_aServices[nPos] ); - short aRetCode = aDlg->Execute(); + PlaceEditDialog aDlg(GetFrameWeld(), m_aServices[nPos]); + short aRetCode = aDlg.run(); switch( aRetCode ) { case RET_OK : { - ServicePtr pEditedService = aDlg->GetPlace(); + ServicePtr pEditedService = aDlg.GetPlace(); m_aServices[nPos] = pEditedService; m_pServices_lb->RemoveEntry( nSelected ); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index a6503e680d31..e4e840b0fbd8 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1247,13 +1247,13 @@ IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) { _pFileView->EndInplaceEditing(); - ScopedVclPtrInstance< PlaceEditDialog > aDlg(this); - short aRetCode = aDlg->Execute(); + PlaceEditDialog aDlg(GetFrameWeld()); + short aRetCode = aDlg.run(); switch (aRetCode) { case RET_OK : { - PlacePtr newPlace = aDlg->GetPlace(); + PlacePtr newPlace = aDlg.GetPlace(); pImpl->_pPlaces->AppendPlace(newPlace); break; |