cui/inc/dlgname.hxx | 2 +- cui/source/customize/SvxMenuConfigPage.cxx | 2 +- cui/source/customize/SvxToolbarConfigPage.cxx | 2 +- cui/source/dialogs/dlgname.cxx | 2 +- cui/source/factory/dlgfact.cxx | 1 - cui/source/factory/dlgfact.hxx | 2 +- cui/source/options/optaboutconfig.cxx | 1 - cui/source/options/optaboutconfig.hxx | 2 +- 8 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit 8c3e4dba01fa3bac6ddf16ebe75f3e169e458068 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Mon Nov 27 15:04:55 2023 +0100 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Nov 27 20:20:55 2023 +0100 Move a cui header inside the module + fix building issues about "cuidllapi.h" + remove #include <cui/dlgname.hxx> in some cxx since their corresponding hxx already contains the include Change-Id: I2396104fbcbca2e1aca29cdb2324ae0f4daf63cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159996 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/include/cui/dlgname.hxx b/cui/inc/dlgname.hxx similarity index 99% rename from include/cui/dlgname.hxx rename to cui/inc/dlgname.hxx index e06c56c0f010..3876585e1947 100644 --- a/include/cui/dlgname.hxx +++ b/cui/inc/dlgname.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include "cuidllapi.h" +#include <cui/cuidllapi.h> #include <vcl/formatter.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 3ec1f2a531e1..4ee5ce9be0ca 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <cui/dlgname.hxx> +#include <dlgname.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index be34445cf19f..035059ea8e83 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -38,7 +38,7 @@ #include <SvxConfigPageHelper.hxx> #include <dialmgr.hxx> -#include <cui/dlgname.hxx> +#include <dlgname.hxx> #include <comphelper/processfactory.hxx> SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 8164bf1c2b40..09b6158fde00 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cui/dlgname.hxx> +#include <dlgname.hxx> #include <comphelper/string.hxx> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 42a2b19fbaee..fbdea49672ef 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -33,7 +33,6 @@ #include <splitcelldlg.hxx> #include <cuiimapwnd.hxx> #include <cui/cuicharmap.hxx> -#include <cui/dlgname.hxx> #include <srchxtra.hxx> #include <textanim.hxx> #include <autocdlg.hxx> diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 137a5a033294..b6120dcfb2ef 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -27,7 +27,7 @@ #include <cfgutil.hxx> #include <cui/cuicharmap.hxx> -#include <cui/dlgname.hxx> +#include <dlgname.hxx> #include <cuifmsearch.hxx> #include <cuigaldlg.hxx> #include <cuigrfflt.hxx> diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index f191a59bd2ee..885ea189a8c5 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -33,7 +33,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <cppu/unotype.hxx> -#include <cui/dlgname.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <unotools/textsearch.hxx> diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 17aea23a997e..7bfce2ab85aa 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -11,7 +11,7 @@ #include <com/sun/star/container/XNameAccess.hpp> -#include <cui/dlgname.hxx> +#include <dlgname.hxx> #include <i18nutil/searchopt.hxx> #include <vcl/weld.hxx>