diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-25 11:15:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 12:04:32 +0200 |
| commit | bc27ced45cf634ff3fbeef2605cae88ac1f1f0a1 (patch) | |
| tree | 8ac1ef57e7dfe10a7a71f0c5e5b388f7ad66f2fd /sfx2 | |
| parent | 299122e3d0a3ecf1862c26e92eb1e08884fca6f8 (diff) | |
drop newly unused SfxModalDialog
Change-Id: Ia06713c9766a6731995c83ed0516535d13665ff1
Reviewed-on: https://gerrit.libreoffice.org/79526
Tested-by: Jenkins
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/appl/sfxhelp.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 59 |
2 files changed, 1 insertions, 59 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index e6942da14fd6..73d2d2cc3619 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -69,6 +69,7 @@ #include <unotools/securityoptions.hxx> #include <rtl/uri.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/dialog.hxx> #include <vcl/keycod.hxx> #include <vcl/layout.hxx> #include <vcl/waitobj.hxx> diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 139e9eae1a88..c1906d547cf0 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -80,65 +80,6 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - -void SfxModalDialog::SetDialogData_Impl() -{ - // save settings (position and user data) - OUString sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8); - SvtViewOptions aDlgOpt(EViewType::Dialog, sConfigId); - aDlgOpt.SetWindowState(OStringToOUString( - GetWindowState(WindowStateMask::Pos), RTL_TEXTENCODING_ASCII_US)); - if ( !aExtraData.isEmpty() ) - aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aExtraData ) ); -} - - -void SfxModalDialog::GetDialogData_Impl() - -/* [Description] - - Helper function, reads the dialogue position from the ini file and - puts them on the transferred window. -*/ - -{ - OUString sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8); - SvtViewOptions aDlgOpt(EViewType::Dialog, sConfigId); - if ( aDlgOpt.Exists() ) - { - // load settings - SetWindowState( OUStringToOString( aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US ) ); - Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME ); - OUString aTemp; - if ( aUserItem >>= aTemp ) - aExtraData = aTemp; - } -} - -SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription ) -: ModalDialog(pParent, rID, rUIXMLDescription) -{ - SetInstallLOKNotifierHdl(LINK(this, SfxModalDialog, InstallLOKNotifierHdl)); - GetDialogData_Impl(); -} - -IMPL_STATIC_LINK_NOARG(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*) -{ - return SfxViewShell::Current(); -} - -SfxModalDialog::~SfxModalDialog() -{ - disposeOnce(); -} - -void SfxModalDialog::dispose() -{ - SetDialogData_Impl(); - - ModalDialog::dispose(); -} - void SfxModelessDialogController::Initialize(SfxChildWinInfo const *pInfo) /* [Description] |