vcl/inc/wizdlg.hxx | 7 ++++++- vcl/source/control/roadmapwizard.cxx | 1 - vcl/source/control/wizimpldata.hxx | 7 ------- 3 files changed, 6 insertions(+), 9 deletions(-)
New commits: commit 6ca73a2ba232e4ba003fed5d14334f4827a967ad Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat May 17 22:49:23 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun May 18 20:37:11 2025 +0200 vcl: Move ImplWizButtonData definition to where it's used As this uses a vcl Button, it's specific to the vcl::Widget based implementation, so move it to the header where that one is declared. Change-Id: I9b64517541cb67df66ff8530589b0608076a88e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185458 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index d847b6e9a6be..bfde5a5bcb69 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -31,7 +31,12 @@ struct ImplWizPageData VclPtr<TabPage> mpPage; }; -struct ImplWizButtonData; +struct ImplWizButtonData +{ + ImplWizButtonData* mpNext; + VclPtr<Button> mpButton; + tools::Long mnOffset; +}; namespace vcl { diff --git a/vcl/source/control/wizimpldata.hxx b/vcl/source/control/wizimpldata.hxx index bb00c7832bb3..6a9f407d0ce2 100644 --- a/vcl/source/control/wizimpldata.hxx +++ b/vcl/source/control/wizimpldata.hxx @@ -30,13 +30,6 @@ struct WizPageData std::unique_ptr<BuilderPage> mxPage; }; -struct ImplWizButtonData -{ - ImplWizButtonData* mpNext; - VclPtr<Button> mpButton; - tools::Long mnOffset; -}; - namespace vcl { struct WizardMachineImplData commit fc42bd1e23fb70f291db74fa5745695befca66f9 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat May 17 21:15:41 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun May 18 20:37:02 2025 +0200 vcl: Drop unnecessary include Change-Id: I1fa5b7076c5028a7fed4e816506651558f5eb81c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185457 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 3aa3429a0e43..68a0e052c8a1 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -18,7 +18,6 @@ */ -#include <vcl/toolkit/roadmap.hxx> #include <tools/debug.hxx> #include <tools/json_writer.hxx> #include <osl/diagnose.h>