solenv/clang-format/blacklist | 2 -
svtools/source/uno/wizard/wizardshell.hxx | 2 -
vcl/inc/wizdlg.hxx | 35 ++++++++++++++----------------
vcl/source/app/salvtables.cxx | 2 -
vcl/source/control/roadmapwizard.cxx | 2 -
vcl/source/control/wizardmachine.cxx | 2 -
vcl/source/window/builder.cxx | 2 -
7 files changed, 23 insertions(+), 24 deletions(-)
New commits:
commit 0d63d45bead9fc6e7fbd4f9dd48a2227ea800b90
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 15 21:21:28 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Sep 21 01:18:22 2019 +0200
wizdlg only needed in vcl now
Change-Id: I87d14fff339d18088795a876e2bf6c818b1674e3
Reviewed-on: https://gerrit.libreoffice.org/78973
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b4d2cbcadf64..14dcd2ae8fae 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7946,7 +7946,6 @@ include/vcl/waitobj.hxx
include/vcl/wall.hxx
include/vcl/window.hxx
include/vcl/wizardmachine.hxx
-include/vcl/wizdlg.hxx
include/vcl/wmf.hxx
include/vcl/wmfexternal.hxx
include/vcl/wrkwin.hxx
@@ -17590,6 +17589,7 @@ vcl/inc/win/svsys.h
vcl/inc/win/wincomp.hxx
vcl/inc/win/winlayout.hxx
vcl/inc/window.h
+vcl/inc/wizdlg.hxx
vcl/ios/dummies.cxx
vcl/ios/iosinst.cxx
vcl/null/printerinfomanager.cxx
diff --git a/svtools/source/uno/wizard/wizardshell.hxx
b/svtools/source/uno/wizard/wizardshell.hxx
index 9f6fddc7977a..94ad406d84b2 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
#include <com/sun/star/ui/dialogs/XWizard.hpp>
-#include <vcl/wizdlg.hxx>
+#include <vcl/roadmapwizard.hxx>
#include <map>
#include <memory>
diff --git a/include/vcl/wizdlg.hxx b/vcl/inc/wizdlg.hxx
similarity index 94%
rename from include/vcl/wizdlg.hxx
rename to vcl/inc/wizdlg.hxx
index 04c1041f36be..7818160ff721 100644
--- a/include/vcl/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_WIZDLG_HXX
#include <memory>
-#include <vcl/dllapi.h>
#include <vcl/roadmapwizard.hxx>
namespace vcl
@@ -54,7 +53,7 @@ namespace vcl
<code>n2</code>, which share at least the first <code>k</code> states
(where <code>k</code>
is at least 1), and an arbitrary number of other states.
*/
- class VCL_DLLPUBLIC RoadmapWizard : public Dialog
+ class RoadmapWizard : public Dialog
{
private:
Idle maWizardLayoutIdle;
@@ -71,7 +70,7 @@ namespace vcl
sal_Int16 mnLeftAlignCount;
bool mbEmptyViewMargin;
- DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Timer*, void );
+ DECL_LINK( ImplHandleWizardLayoutTimerHdl, Timer*, void );
// IMPORTANT:
// traveling pages should not be done by calling these base class
member, some mechanisms of this class
@@ -398,14 +397,14 @@ namespace vcl
virtual OUString getStateDisplayName(WizardTypes::WizardState nState)
const;
private:
- DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, LinkParamNone*, void );
+ DECL_LINK( OnRoadmapItemSelected, LinkParamNone*, void );
/** updates the roadmap control to show the given path, as far as
possible
(modulo conflicts with other paths)
*/
- VCL_DLLPRIVATE void implUpdateRoadmap( );
+ void implUpdateRoadmap( );
- VCL_DLLPRIVATE void impl_construct();
+ void impl_construct();
public:
class AccessGuard
@@ -423,21 +422,21 @@ namespace vcl
TabPage* GetOrCreatePage(const WizardTypes::WizardState i_nState);
private:
- VCL_DLLPRIVATE void ImplInitData();
- VCL_DLLPRIVATE void ImplCalcSize( Size& rSize );
- VCL_DLLPRIVATE void ImplPosCtrls();
- VCL_DLLPRIVATE void ImplPosTabPage();
- VCL_DLLPRIVATE void ImplShowTabPage( TabPage* pPage );
- VCL_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const;
+ void ImplInitData();
+ void ImplCalcSize( Size& rSize );
+ void ImplPosCtrls();
+ void ImplPosTabPage();
+ void ImplShowTabPage( TabPage* pPage );
+ TabPage* ImplGetPage( sal_uInt16 nLevel ) const;
- DECL_DLLPRIVATE_LINK(OnNextPage, Button*, void);
- DECL_DLLPRIVATE_LINK(OnPrevPage, Button*, void);
- DECL_DLLPRIVATE_LINK(OnFinish, Button*, void);
+ DECL_LINK(OnNextPage, Button*, void);
+ DECL_LINK(OnPrevPage, Button*, void);
+ DECL_LINK(OnFinish, Button*, void);
- VCL_DLLPRIVATE void implResetDefault(vcl::Window const * _pWindow);
- VCL_DLLPRIVATE void implUpdateTitle();
- VCL_DLLPRIVATE void implConstruct( const WizardButtonFlags
_nButtonFlags );
+ void implResetDefault(vcl::Window const * _pWindow);
+ void implUpdateTitle();
+ void implConstruct( const WizardButtonFlags _nButtonFlags );
};
/// helper class to temporarily suspend any traveling in the wizard
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 15f53a47b760..2063a4e618b9 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -49,7 +49,6 @@
#include <vcl/menubtn.hxx>
#include <vcl/prgsbar.hxx>
#include <vcl/ptrstyle.hxx>
-#include <vcl/wizdlg.hxx>
#include <vcl/slider.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svimpbox.hxx>
@@ -66,6 +65,7 @@
#include <vcl/virdev.hxx>
#include <aboutdialog.hxx>
#include <bitmaps.hlst>
+#include <wizdlg.hxx>
SalFrame::SalFrame()
: m_pWindow(nullptr)
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index 501122245e8d..4ef52d6e9ab5 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -18,13 +18,13 @@
*/
-#include <vcl/wizdlg.hxx>
#include <vcl/toolkit/roadmap.hxx>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
#include <strings.hrc>
#include <svdata.hxx>
+#include <wizdlg.hxx>
#include <vector>
#include <map>
diff --git a/vcl/source/control/wizardmachine.cxx
b/vcl/source/control/wizardmachine.cxx
index 960f34d0361e..91daa8ddfb19 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -19,11 +19,11 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/wizdlg.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <strings.hrc>
#include <svdata.hxx>
+#include <wizdlg.hxx>
#include <stack>
#include "wizimpldata.hxx"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2ea3b178bf2a..55162b7b861a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -48,7 +48,6 @@
#include <vcl/slider.hxx>
#include <vcl/listctrl.hxx>
#include <vcl/weld.hxx>
-#include <vcl/wizdlg.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <svdata.hxx>
#include <bitmaps.hlst>
@@ -62,6 +61,7 @@
#include <treeglue.hxx>
#include <tools/svlibrary.h>
#include <tools/diagnose_ex.h>
+#include <wizdlg.hxx>
#ifdef DISABLE_DYNLOADING
#include <dlfcn.h>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
