diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-03 20:17:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-16 22:32:42 +0200 |
commit | 4d450704d672dddf2c555fda5ff3140d8c537d02 (patch) | |
tree | a7e13e2b579792695ebc900740b9c0ce466634bd /sw/source/ui | |
parent | f52d015b04779b8aaa3e353cbd9d0d5da3e73a16 (diff) |
move WizardMachine to vcl
Change-Id: I55cc4a6c1ad111a22a43fd66a3cd01b5b02fb7cb
Reviewed-on: https://gerrit.libreoffice.org/76902
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/mmresultdialogs.hxx | 1 |
12 files changed, 36 insertions, 35 deletions
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 9e5b9ad2fc06..dcbcffa2c31e 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -89,7 +89,7 @@ SwMailMergeWizard::~SwMailMergeWizard() VclPtr<TabPage> SwMailMergeWizard::createPage(WizardState _nState) { - VclPtr<OWizardPage> pRet; + VclPtr<vcl::OWizardPage> pRet; switch(_nState) { case MM_DOCUMENTSELECTPAGE : @@ -202,7 +202,7 @@ void SwMailMergeWizard::UpdateRoadmap() //#i97436# if a document has to be loaded then enable output type page only m_bDocumentLoad = false; bool bEnableOutputTypePage = (nCurPage != MM_DOCUMENTSELECTPAGE) || - static_cast<svt::OWizardPage*>(pCurPage)->commitPage( ::svt::WizardTypes::eValidate ); + static_cast<vcl::OWizardPage*>(pCurPage)->commitPage( ::vcl::WizardTypes::eValidate ); // handle the Finish button bool bCanFinish = !m_bDocumentLoad && bEnableOutputTypePage && diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index ade32dbc2b9e..dd12860e54ca 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) : - svt::OWizardPage(_pParent, "MMAddressBlockPage", + vcl::OWizardPage(_pParent, "MMAddressBlockPage", "modules/swriter/ui/mmaddressblockpage.ui") , m_pWizard(_pParent) { @@ -122,7 +122,7 @@ void SwMailMergeAddressBlockPage::dispose() m_pPrevSetIB.clear(); m_pNextSetIB.clear(); m_pWizard.clear(); - svt::OWizardPage::dispose(); + vcl::OWizardPage::dispose(); } bool SwMailMergeAddressBlockPage::canAdvance() const @@ -158,9 +158,9 @@ void SwMailMergeAddressBlockPage::ActivatePage() } } -bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) +bool SwMailMergeAddressBlockPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) { - return ::svt::WizardTypes::eTravelForward != _eReason || m_pWizard->GetConfigItem().GetResultSet().is(); + return ::vcl::WizardTypes::eTravelForward != _eReason || m_pWizard->GetConfigItem().GetResultSet().is(); } IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 5cdd6c1ad900..1bf08e55c2df 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_DBUI_MMADDRESSBLOCKPAGE_HXX #include <editeng/weldeditview.hxx> -#include <svtools/wizardmachine.hxx> +#include <vcl/wizardmachine.hxx> #include <vcl/button.hxx> #include <mailmergehelper.hxx> #include <sfx2/basedlgs.hxx> @@ -32,7 +32,7 @@ class SwMailMergeWizard; class SwMailMergeConfigItem; -class SwMailMergeAddressBlockPage : public svt::OWizardPage +class SwMailMergeAddressBlockPage : public vcl::OWizardPage { VclPtr<PushButton> m_pAddressListPB; VclPtr<FixedText> m_pCurrentAddressFI; @@ -71,7 +71,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage void EnableAddressBlock(bool bAll, bool bSelective); virtual void ActivatePage() override; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; virtual bool canAdvance() const override; public: diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index fb3e05110330..ee22935376e3 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno; using namespace svt; SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : svt::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage") + : vcl::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage") , m_pWizard(pWizard) , m_xCurrentDocRB(m_xBuilder->weld_radio_button("currentdoc")) , m_xNewDocRB(m_xBuilder->weld_radio_button("newdoc")) @@ -94,7 +94,7 @@ SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage() void SwMailMergeDocSelectPage::dispose() { m_pWizard.clear(); - svt::OWizardPage::dispose(); + vcl::OWizardPage::dispose(); } IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::ToggleButton&, void) @@ -158,11 +158,11 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, weld::Button&, rButton, void) m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE)); } -bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) +bool SwMailMergeDocSelectPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) { bool bReturn = false; - bool bNext = _eReason == ::svt::WizardTypes::eTravelForward; - if(bNext || _eReason == ::svt::WizardTypes::eValidate ) + bool bNext = _eReason == ::vcl::WizardTypes::eTravelForward; + if(bNext || _eReason == ::vcl::WizardTypes::eValidate ) { OUString sReloadDocument; bReturn = m_xCurrentDocRB->get_active() || @@ -186,7 +186,7 @@ bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason bReturn = !sReloadDocument.isEmpty(); } } - if( _eReason == ::svt::WizardTypes::eValidate ) + if( _eReason == ::vcl::WizardTypes::eValidate ) m_pWizard->SetDocumentLoad(!m_xCurrentDocRB->get_active()); if(bNext && !m_xCurrentDocRB->get_active()) diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index ae1a6e23588f..0a7afb45f240 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX #define INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX -#include <svtools/wizardmachine.hxx> +#include <vcl/wizardmachine.hxx> #include <vcl/weld.hxx> class SwMailMergeWizard; -class SwMailMergeDocSelectPage : public svt::OWizardPage +class SwMailMergeDocSelectPage : public vcl::OWizardPage { OUString m_sLoadFileName; OUString m_sLoadTemplateName; @@ -43,7 +43,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK(DocSelectHdl, weld::ToggleButton&, void); DECL_LINK(FileSelectHdl, weld::Button&, void); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; public: SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 17748adec77c..b80cc86480d7 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -197,7 +197,7 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting) } SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : svt::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage") + : vcl::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage") , SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder) , m_xPreview(new AddressPreview(m_xBuilder->weld_scrolled_window("previewwin"))) , m_xPreviewFI(m_xBuilder->weld_label("previewft")) @@ -254,7 +254,7 @@ void SwMailMergeGreetingsPage::dispose() { m_xPreviewWIN.reset(); m_xPreview.reset(); - svt::OWizardPage::dispose(); + vcl::OWizardPage::dispose(); } void SwMailMergeGreetingsPage::ActivatePage() @@ -280,7 +280,7 @@ void SwMailMergeGreetingsPage::ActivatePage() m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_LAYOUTPAGE)); } -bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason ) +bool SwMailMergeGreetingsPage::commitPage( ::vcl::WizardTypes::CommitPageReason ) { if (m_xFemaleColumnLB->get_value_changed_from_saved()) { diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 68ef6d9927cd..b836d931d14e 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX #define INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX -#include <svtools/wizardmachine.hxx> +#include <vcl/wizardmachine.hxx> #include <sfx2/basedlgs.hxx> #include <mailmergehelper.hxx> #include <vcl/weld.hxx> @@ -82,7 +82,7 @@ protected: virtual void UpdatePreview(); }; -class SwMailMergeGreetingsPage : public svt::OWizardPage +class SwMailMergeGreetingsPage : public vcl::OWizardPage , public SwGreetingsHandler { std::unique_ptr<AddressPreview> m_xPreview; @@ -103,7 +103,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage virtual void UpdatePreview() override; virtual void ActivatePage() override; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; public: SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent); virtual ~SwMailMergeGreetingsPage() override; diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index e2738aaf413a..ef464a8a6648 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::view; #define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm SwMailMergeLayoutPage::SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : svt::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage") + : vcl::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage") , m_pExampleWrtShell(nullptr) , m_pAddressBlockFormat(nullptr) , m_bIsGreetingInserted(false) @@ -160,7 +160,7 @@ void SwMailMergeLayoutPage::dispose() { File::remove( m_sExampleURL ); m_pWizard.clear(); - svt::OWizardPage::dispose(); + vcl::OWizardPage::dispose(); } void SwMailMergeLayoutPage::ActivatePage() @@ -216,11 +216,11 @@ void SwMailMergeLayoutPage::ActivatePage() } } -bool SwMailMergeLayoutPage::commitPage(::svt::WizardTypes::CommitPageReason eReason) +bool SwMailMergeLayoutPage::commitPage(::vcl::WizardTypes::CommitPageReason eReason) { //now insert the frame and the greeting SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - if (eReason == ::svt::WizardTypes::eTravelForward || eReason == ::svt::WizardTypes::eFinish) + if (eReason == ::vcl::WizardTypes::eTravelForward || eReason == ::vcl::WizardTypes::eFinish) { long nLeft = static_cast< long >(m_xLeftMF->denormalize(m_xLeftMF->get_value(FieldUnit::TWIP))); long nTop = static_cast< long >(m_xTopMF->denormalize(m_xTopMF->get_value(FieldUnit::TWIP))); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 0cc58b285407..6ce46554b993 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX #define INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX -#include <svtools/wizardmachine.hxx> +#include <vcl/wizardmachine.hxx> #include <mailmergehelper.hxx> #include <com/sun/star/uno/Reference.h> @@ -31,7 +31,7 @@ class SwView; namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySet;}}}} -class SwMailMergeLayoutPage : public svt::OWizardPage +class SwMailMergeLayoutPage : public vcl::OWizardPage { SwWrtShell* m_pExampleWrtShell; @@ -71,7 +71,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem const & rConfigItem, bool bExample); virtual void ActivatePage() override; - virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason) override; + virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override; public: SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent); virtual ~SwMailMergeLayoutPage() override; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 1ec126e0323c..c470a9f1a9e0 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : svt::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage") + : vcl::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage") , m_pWizard(pWizard) , m_xLetterRB(m_xBuilder->weld_radio_button("letter")) , m_xMailRB(m_xBuilder->weld_radio_button("email")) @@ -68,7 +68,7 @@ SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage() void SwMailMergeOutputTypePage::dispose() { m_pWizard.clear(); - svt::OWizardPage::dispose(); + vcl::OWizardPage::dispose(); } IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::ToggleButton&, void) diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 20e43ab69060..5b2f2ab1c17c 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -19,11 +19,11 @@ #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX #define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX -#include <svtools/wizardmachine.hxx> +#include <vcl/wizardmachine.hxx> #include <vcl/weld.hxx> class SwMailMergeWizard; -class SwMailMergeOutputTypePage : public svt::OWizardPage +class SwMailMergeOutputTypePage : public vcl::OWizardPage { VclPtr<SwMailMergeWizard> m_pWizard; diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index d6ef4477ffe5..12233b9eb9d1 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX #define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX +#include <vcl/wizardmachine.hxx> #include <vcl/button.hxx> #include <vcl/prgsbar.hxx> #include <vcl/weld.hxx> |