move SvxStandardDialog to last consumer

Change-Id: I02638b5a1a3c7a27c19320fedd291bbcb17bb9dc
Reviewed-on: https://gerrit.libreoffice.org/73283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 26 insertions, 78 deletions

diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
deleted file mode 100644
index a783bd8c0061..000000000000
--- a/include/svx/stddlg.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_STDDLG_HXX
-#define INCLUDED_SVX_STDDLG_HXX
-
-#include <sfx2/basedlgs.hxx>
-#include <svx/svxdllapi.h>
-
-class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog
-{
-public:
-    SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
-
-    short           Execute() override;
-
-protected:
-    virtual void    Apply() = 0;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 164cf6cc0cad..c38bd65eb9d4 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7303,7 +7303,6 @@ include/svx/sidebar/ValueSetWithTextControl.hxx
 include/svx/spacinglistbox.hxx
 include/svx/sphere3d.hxx
 include/svx/srchdlg.hxx
-include/svx/stddlg.hxx
 include/svx/strarray.hxx
 include/svx/svdcrtv.hxx
 include/svx/svddef.hxx
@@ -14065,7 +14064,6 @@ svx/source/dialog/spacinglistbox.cxx
 svx/source/dialog/srchctrl.cxx
 svx/source/dialog/srchctrl.hxx
 svx/source/dialog/srchdlg.cxx
-svx/source/dialog/stddlg.cxx
 svx/source/dialog/strarray.cxx
 svx/source/dialog/svxbmpnumvalueset.cxx
 svx/source/dialog/svxdlg.cxx
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 1ca893e5eeab..fc9449fede66 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/dialog/papersizelistbox \
     svx/source/dialog/samecontentlistbox \
     svx/source/dialog/spacinglistbox \
-    svx/source/dialog/stddlg \
     svx/source/dialog/svxdlg \
     svx/source/dialog/SvxNumOptionsTabPageHelper \
     svx/source/engine3d/camera3d \
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
deleted file mode 100644
index f73e65e6e7b5..000000000000
--- a/svx/source/dialog/stddlg.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/stddlg.hxx>
-
-short SvxStandardDialog::Execute()
-{
-    short nRet = ModalDialog::Execute();
-
-    if ( RET_OK == nRet )
-        Apply();
-    return nRet;
-}
-
-SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
-    : SfxModalDialog(pParent, rID, rUIXMLDescription)
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index e7769feb7c14..7072502c095c 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -118,6 +118,20 @@ void SwXSelChgLstnr_Impl::disposing( const EventObject&  )
     OSL_FAIL("disposing");
 }
 
+short SvxStandardDialog::Execute()
+{
+    short nRet = ModalDialog::Execute();
+
+    if ( RET_OK == nRet )
+        Apply();
+    return nRet;
+}
+
+SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
+    : SfxModalDialog(pParent, rID, rUIXMLDescription)
+{
+}
+
 SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
                                const OUString& rSourceName,
                                const OUString& rTableName,
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index cbb9a9465936..2930f9f908ba 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX
 
 #include <memory>
-#include <svx/stddlg.hxx>
+#include <sfx2/basedlgs.hxx>
 
 #include <vcl/button.hxx>
 
@@ -47,6 +47,17 @@ namespace com{namespace sun{namespace star{
     }
 }}}
 
+class SvxStandardDialog : public SfxModalDialog
+{
+public:
+    SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
+
+    short           Execute() override;
+
+protected:
+    virtual void    Apply() = 0;
+};
+
 class SwMailMergeDlg : public SvxStandardDialog
 {
     friend class SwXSelChgLstnr_Impl;