diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-03 19:53:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-07 11:22:42 +0200 |
| commit | 8c8813db5f747af2553cb5ed7a1df5090413d524 (patch) | |
| tree | f6b9eab47739d45156e3a4dcfb340ebef68b3902 /include | |
| parent | d97cd7a1f0b06f7edea9c1ab96237a1f1b6e7255 (diff) | |
move WizardDialog to vcl
Change-Id: I93d03601cb429687a9a73b7d28c595e69977bf87
Reviewed-on: https://gerrit.libreoffice.org/76901
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/wizardmachine.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/wizdlg.hxx (renamed from include/svtools/wizdlg.hxx) | 23 |
2 files changed, 12 insertions, 13 deletions
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index ee2d32a39107..ed8aa86412cc 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -21,7 +21,7 @@ #include <memory> #include <svtools/svtdllapi.h> -#include <svtools/wizdlg.hxx> +#include <vcl/wizdlg.hxx> #include <vcl/button.hxx> #include <vcl/tabpage.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svtools/wizdlg.hxx b/include/vcl/wizdlg.hxx index d31869acb047..fbb10e61eacc 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/vcl/wizdlg.hxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_WIZDLG_HXX -#define INCLUDED_SVTOOLS_WIZDLG_HXX - -#include <svtools/svtdllapi.h> +#ifndef INCLUDED_VCL_WIZDLG_HXX +#define INCLUDED_VCL_WIZDLG_HXX +#include <vcl/dllapi.h> #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/idle.hxx> @@ -175,7 +174,7 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) #define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3 -class SVT_DLLPUBLIC WizardDialog : public ModalDialog +class VCL_DLLPUBLIC WizardDialog : public ModalDialog { private: Idle maWizardLayoutIdle; @@ -209,12 +208,12 @@ protected: void SetEmptyViewMargin(); private: - SVT_DLLPRIVATE void ImplInitData(); - SVT_DLLPRIVATE void ImplCalcSize( Size& rSize ); - SVT_DLLPRIVATE void ImplPosCtrls(); - SVT_DLLPRIVATE void ImplPosTabPage(); - SVT_DLLPRIVATE void ImplShowTabPage( TabPage* pPage ); - SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const; + 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; public: WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); @@ -256,6 +255,6 @@ public: void SetActivatePageHdl( const Link<WizardDialog*,void>& rLink ) { maActivateHdl = rLink; } }; -#endif // INCLUDED_SVTOOLS_WIZDLG_HXX +#endif // INCLUDED_VCL_WIZDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |