ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

move WizardDialog to vcl

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2019-08-07 11:22:42 +02:00
parent d97cd7a1f0
commit 8c8813db5f
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbaccess/source/ui/inc/WCopyTable.hxx
+1 -1
View File
@@ -30,7 +30,7 @@
#include <comphelper/stl_types.hxx>
#include "TypeInfo.hxx"
#include <vcl/button.hxx>
#include <svtools/wizdlg.hxx>
#include <vcl/wizdlg.hxx>
#include "DExport.hxx"
#include "WTabPage.hxx"
#include "FieldDescriptions.hxx"
include/svtools/wizardmachine.hxx
+1 -1
View File
@@ -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>
include/svtools/wizdlg.hxx → include/vcl/wizdlg.hxx
+11 -12
View File
@@ -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: */
solenv/clang-format/blacklist
+2 -2
View File
@@ -7021,7 +7021,6 @@ include/svtools/unoimap.hxx
include/svtools/urlcontrol.hxx
include/svtools/valueset.hxx
include/svtools/wizardmachine.hxx
include/svtools/wizdlg.hxx
include/svx/AccessibleControlShape.hxx
include/svx/AccessibleGraphicShape.hxx
include/svx/AccessibleOLEShape.hxx
@@ -7974,6 +7973,7 @@ include/vcl/virdev.hxx
include/vcl/waitobj.hxx
include/vcl/wall.hxx
include/vcl/window.hxx
include/vcl/wizdlg.hxx
include/vcl/wmf.hxx
include/vcl/wmfexternal.hxx
include/vcl/wrkwin.hxx
@@ -13756,7 +13756,6 @@ svtools/source/dialogs/prnsetup.cxx
svtools/source/dialogs/restartdialog.cxx
svtools/source/dialogs/roadmapwizard.cxx
svtools/source/dialogs/wizardmachine.cxx
svtools/source/dialogs/wizdlg.cxx
svtools/source/edit/editsyntaxhighlighter.cxx
svtools/source/edit/svmedit.cxx
svtools/source/edit/svmedit2.cxx
@@ -17800,6 +17799,7 @@ vcl/source/control/spinfld.cxx
vcl/source/control/tabctrl.cxx
vcl/source/control/throbber.cxx
vcl/source/control/thumbpos.hxx
vcl/source/control/wizdlg.cxx
vcl/source/edit/textdat2.hxx
vcl/source/edit/textdata.cxx
vcl/source/edit/textdoc.cxx
svtools/Library_svt.mk
-1
View File
@@ -126,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/dialogs/roadmapwizard \
svtools/source/dialogs/ServerDetailsControls \
svtools/source/dialogs/wizardmachine \
svtools/source/dialogs/wizdlg \
svtools/source/edit/editsyntaxhighlighter \
svtools/source/edit/svmedit \
svtools/source/edit/svmedit2 \
vcl/Library_vcl.mk
+1
View File
@@ -210,6 +210,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/control/spinfld \
vcl/source/control/tabctrl \
vcl/source/control/throbber \
vcl/source/control/wizdlg \
vcl/source/edit/vclmedit \
vcl/source/edit/textdata \
vcl/source/edit/textdoc \
svtools/source/dialogs/wizdlg.cxx → vcl/source/control/wizdlg.cxx
+1 -1
View File
@@ -22,7 +22,7 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/tabpage.hxx>
#include <svtools/wizdlg.hxx>
#include <vcl/wizdlg.hxx>
#define WIZARDDIALOG_BUTTON_OFFSET_Y 6