Move messagedialog header to shared include

Change-Id: Ice8d01d2bb62667667a4c5f0366120cdb7600472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94040
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

5 files changed, 4 insertions, 61 deletions

diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
deleted file mode 100644
index 756409ef8a3f..000000000000
--- a/vcl/inc/messagedialog.hxx
+++ /dev/null
@@ -1,57 +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/.
- */
-
-#ifndef INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
-#define INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
-
-#include <vcl/dialog.hxx>
-#include <vcl/layout.hxx>
-
-class MessageDialog : public Dialog
-{
-private:
-    VclButtonsType m_eButtonsType;
-    VclMessageType m_eMessageType;
-    VclPtr<VclBox> m_pOwnedContentArea;
-    VclPtr<VclButtonBox> m_pOwnedActionArea;
-    VclPtr<VclGrid> m_pGrid;
-    VclPtr<VclVBox> m_pMessageBox;
-    VclPtr<FixedImage> m_pImage;
-    VclPtr<VclMultiLineEdit> m_pPrimaryMessage;
-    VclPtr<VclMultiLineEdit> m_pSecondaryMessage;
-    OUString m_sPrimaryString;
-    OUString m_sSecondaryString;
-    void create_owned_areas();
-
-    static void SetMessagesWidths(vcl::Window const* pParent, VclMultiLineEdit* pPrimaryMessage,
-                                  VclMultiLineEdit* pSecondaryMessage);
-
-    friend class VclPtr<MessageDialog>;
-    MessageDialog(vcl::Window* pParent, WinBits nStyle);
-
-    virtual void StateChanged(StateChangedType nType) override;
-
-public:
-    MessageDialog(vcl::Window* pParent, const OUString& rMessage, VclMessageType eMessageType,
-                  VclButtonsType eButtonsType);
-    virtual bool set_property(const OString& rKey, const OUString& rValue) override;
-    OUString const& get_primary_text() const;
-    OUString const& get_secondary_text() const;
-    void set_primary_text(const OUString& rPrimaryString);
-    void set_secondary_text(const OUString& rSecondaryString);
-    virtual ~MessageDialog() override;
-    virtual void dispose() override;
-
-    void create_message_area();
-    VclContainer* get_message_area() const { return m_pMessageBox.get(); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index a7d07f52efbe..f9e0ebafcaba 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -13,7 +13,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 
 class SalInstanceBuilder : public weld::Builder
 {
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 306e504f8f48..9a9cb9af9ff1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -53,7 +53,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <svdata.hxx>
 #include <bitmaps.hlst>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
 #include <desktop/crashreport.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 79e2cd95300d..209179cc9591 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -63,7 +63,7 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/IDialogRenderable.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <salframe.hxx>
 
 #include <iostream>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ce7a69e6455d..355a0d338778 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -16,7 +16,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <window.h>
 #include <boost/multi_array.hpp>
 #include <officecfg/Office/Common.hxx>