sc/inc/sc.hrc | 1 - sc/source/core/data/stlpool.cxx | 1 + sc/source/core/data/stlsheet.cxx | 2 +- sc/source/core/tool/addinhelpid.cxx | 1 + sc/source/ui/app/inputwin.cxx | 1 + sc/source/ui/docshell/docsh4.cxx | 1 + sc/source/ui/navipi/scenwnd.cxx | 1 + sc/source/ui/pagedlg/tphf.cxx | 1 + sc/source/ui/view/gridwin.cxx | 1 + sc/source/ui/view/preview.cxx | 1 + sc/source/ui/view/tabvwsh3.cxx | 1 + sc/source/ui/view/tabvwshf.cxx | 1 + 12 files changed, 11 insertions(+), 2 deletions(-)
New commits: commit 40c3b5dee84b419efcbc1efc1020d1c07332d670 Author: Gabor Kelemen <kelem...@ubuntu.com> Date: Wed Apr 18 07:02:11 2018 +0200 tdf#42949 Remove unnecessary helpids.h from sc.hrc There is only a few files now where HIDs are set from code so no need to include helpids.h into the widely used sc.hrc Change-Id: Id7c9ef7fdf299c580f597e4c27ba8bece3d99f5d Reviewed-on: https://gerrit.libreoffice.org/53076 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 5f1ae5ef385b..ba6fbc6686dd 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -24,7 +24,6 @@ #include <svx/svxids.hrc> #include <svx/svxcommands.h> -#include "helpids.h" // areas diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index acd8b90bbaf4..6075f553ef79 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -45,6 +45,7 @@ #include <vcl/settings.hxx> #include <sc.hrc> +#include <helpids.h> #include <attrib.hxx> #include <global.hxx> #include <globstr.hrc> diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index f57939773372..52888c5557c6 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -42,7 +42,7 @@ #include <globstr.hrc> #include <sc.hrc> - +#include <helpids.h> #define TWO_CM 1134 #define HFDIST_CM 142 diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index f60953541abd..4a7b8f6a1992 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -19,6 +19,7 @@ #include <addinhelpid.hxx> #include <sc.hrc> +#include <helpids.h> // A struct containing the built-in function name and the built-in help ID. struct ScUnoAddInHelpId diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 985365e3f2fd..80823aca43f4 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -75,6 +75,7 @@ #include <svtools/miscopt.hxx> #include <comphelper/string.hxx> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <helpids.h> #define THESIZE 1000000 // Should be more than enough! #define TBX_WINDOW_HEIGHT 22 // in pixel - TODO: The same on all systems? diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 8a4c6c9d8d77..fa473bdf9d67 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -112,6 +112,7 @@ using namespace ::com::sun::star; #include <documentlinkmgr.hxx> #include <memory> #include <sfx2/notebookbar/SfxNotebookBar.hxx> +#include <helpids.h> void ScDocShell::ReloadAllLinks() { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index bcd4a3ba472f..9f6ebd9a1562 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -28,6 +28,7 @@ #include <navipi.hxx> #include <sc.hrc> #include <globstr.hrc> +#include <helpids.h> // class ScScenarioWindow ------------------------------------------------ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 13eedeaa0da0..ba90213b054a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -36,6 +36,7 @@ #include <styledlg.hxx> #include <scuitphfedit.hxx> #include <memory> +#include <helpids.h> // class ScHFPage diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index a24ce844c5ba..0a3831d9b2c5 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -82,6 +82,7 @@ #include <printfun.hxx> #include <cbutton.hxx> #include <sc.hrc> +#include <helpids.h> #include <globstr.hrc> #include <strings.hrc> #include <editutil.hxx> diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 11596ac08e5d..71900841844e 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -48,6 +48,7 @@ #include <markdata.hxx> #include <globstr.hrc> #include <sc.hrc> +#include <helpids.h> #include <AccessibleDocumentPagePreview.hxx> #include <vcl/lineinfo.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 5c4d1b0bbdb2..a65d878dc4e4 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -39,6 +39,7 @@ #include <tabvwsh.hxx> #include <document.hxx> #include <sc.hrc> +#include <helpids.h> #include <inputwin.hxx> #include <scresid.hxx> #include <printfun.hxx> diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 64e5cb52ef3b..6d5197b6333e 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -37,6 +37,7 @@ #include <tabvwsh.hxx> #include <sc.hrc> +#include <helpids.h> #include <docsh.hxx> #include <document.hxx> #include <shtabdlg.hxx> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits