sfx2/inc/inputdlg.hxx | 5 ++---
sfx2/inc/pch/precompiled_sfx.hxx | 2 +-
sfx2/source/control/templatedlglocalview.cxx | 2 +-
sfx2/source/control/templatelocalview.cxx | 2 +-
sfx2/source/dialog/inputdlg.cxx | 2 +-
sfx2/source/doc/templatedlg.cxx | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 7ddf39f02e87943b1e447a405ec6ecd513848209
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 24 13:09:45 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 24 14:53:19 2025 +0200
inputdlg.hxx does not need to be in the global include path
Change-Id: I0c249517a2b33c681de6035eea197b724f95bd5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188278
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/include/sfx2/inputdlg.hxx b/sfx2/inc/inputdlg.hxx
similarity index 87%
rename from include/sfx2/inputdlg.hxx
rename to sfx2/inc/inputdlg.hxx
index 8abab28fc7e1..12f65a997800 100644
--- a/include/sfx2/inputdlg.hxx
+++ b/sfx2/inc/inputdlg.hxx
@@ -10,10 +10,9 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
#define INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
-#include <sfx2/dllapi.h>
#include <vcl/weld.hxx>
-class SFX2_DLLPUBLIC InputDialog final : public weld::GenericDialogController
+class InputDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr<weld::Entry> m_xEntry;
@@ -21,7 +20,7 @@ private:
std::unique_ptr<weld::Button> m_xHelp;
std::unique_ptr<weld::Button> m_xOk;
std::function<bool(OUString)> mCheckEntry;
- DECL_DLLPRIVATE_LINK(EntryChangedHdl, weld::Entry&, void);
+ DECL_LINK(EntryChangedHdl, weld::Entry&, void);
public:
InputDialog(weld::Widget* pParent, const OUString& rLabelText);
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index cdcf5a4107f9..98de908285f2 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -425,7 +425,7 @@
#include <sfx2/frame.hxx>
#include <sfx2/frmdescr.hxx>
#include <sfx2/infobar.hxx>
-#include <sfx2/inputdlg.hxx>
+#include <inputdlg.hxx>
#include <sfx2/ipclient.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/lnkbase.hxx>
diff --git a/sfx2/source/control/templatedlglocalview.cxx
b/sfx2/source/control/templatedlglocalview.cxx
index 46362763ab06..420cfed15654 100644
--- a/sfx2/source/control/templatedlglocalview.cxx
+++ b/sfx2/source/control/templatedlglocalview.cxx
@@ -10,7 +10,7 @@
#include <sfx2/templatedlglocalview.hxx>
#include <comphelper/string.hxx>
-#include <sfx2/inputdlg.hxx>
+#include <inputdlg.hxx>
#include <templateviewitem.hxx>
#include <sfx2/sfxresid.hxx>
#include <templatecontaineritem.hxx>
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 43083414656b..b90a259e4f8d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -11,7 +11,7 @@
#include <comphelper/string.hxx>
#include <sfx2/doctempl.hxx>
-#include <sfx2/inputdlg.hxx>
+#include <inputdlg.hxx>
#include <sfx2/sfxresid.hxx>
#include <templatecontaineritem.hxx>
#include <templateviewitem.hxx>
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index 6334240d6faa..e97c22d235ac 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <sfx2/inputdlg.hxx>
+#include <inputdlg.hxx>
InputDialog::InputDialog(weld::Widget* pParent, const OUString& rLabelText)
: GenericDialogController(pParent, u"sfx/ui/inputdialog.ui"_ustr,
u"InputDialog"_ustr)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7c04c31d4c70..c668a517d2f3 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -9,7 +9,7 @@
#include <sfx2/templatedlg.hxx>
-#include <sfx2/inputdlg.hxx>
+#include <inputdlg.hxx>
#include <sfx2/module.hxx>
#include <comphelper/processfactory.hxx>
