[Libreoffice-commits] core.git: include/sfx2 sfx2/source sw/source

[Caolán McNamara (via logerrit)]

 include/sfx2/basedlgs.hxx            |   27 ----------------
 sfx2/source/appl/sfxhelp.cxx         |    1 
 sfx2/source/dialog/basedlgs.cxx      |   59 -----------------------------------
 sw/source/ui/inc/mmresultdialogs.hxx |    1 
 sw/source/ui/index/cnttab.cxx        |    1 
 5 files changed, 3 insertions(+), 86 deletions(-)

New commits:
commit bc27ced45cf634ff3fbeef2605cae88ac1f1f0a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 25 11:15:49 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 26 12:04:32 2019 +0200

    drop newly unused SfxModalDialog
    
    Change-Id: Ia06713c9766a6731995c83ed0516535d13665ff1
    Reviewed-on: https://gerrit.libreoffice.org/79526
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index c01d6bd72b73..200cea5c40e5 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <vcl/dialog.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/weld.hxx>
 
@@ -32,34 +31,8 @@ class SfxBindings;
 class SfxChildWindow;
 struct SfxChildWinInfo;
 class SfxItemSet;
-class OKButton;
-class CancelButton;
-class HelpButton;
-class Button;
 class Timer;
 
-// class SfxModalDialog --------------------------------------------------
-
-class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
-{
-    OUString                aExtraData;
-
-private:
-    SfxModalDialog(SfxModalDialog const &) = delete;
-    SfxModalDialog& operator =(SfxModalDialog const &) = delete;
-
-    SAL_DLLPRIVATE void SetDialogData_Impl();
-    SAL_DLLPRIVATE void GetDialogData_Impl();
-    DECL_DLLPRIVATE_STATIC_LINK(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*);
-
-protected:
-    SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
-
-public:
-    virtual ~SfxModalDialog() override;
-    virtual void dispose() override;
-};
-
 class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
 {
 private:
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]
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 12233b9eb9d1..70ffb08970f5 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/wizardmachine.hxx>
 #include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3afac2a604ce..d0b8a25c2d62 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -21,6 +21,7 @@
 
 #include <sal/log.hxx>
 #include <svl/style.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/help.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>