summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx8
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extensions/source/abpilot/abspage.cxx9
-rw-r--r--extensions/source/abpilot/abspage.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx12
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx4
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx2
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx4
-rw-r--r--extensions/source/abpilot/fieldmappingpage.hxx2
-rw-r--r--extensions/source/abpilot/tableselectionpage.cxx4
-rw-r--r--extensions/source/abpilot/tableselectionpage.hxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx4
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
13 files changed, 26 insertions, 31 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 952c4a1f78da..d420a3658791 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -42,8 +42,8 @@ namespace abp
return pFilter;
}
- FinalPage::FinalPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/datasourcepage.ui",
+ FinalPage::FinalPage(weld::Container* pPage, OAddressBookSourcePilot* pWizard)
+ : AddressBookSourcePage(pPage, pWizard, "modules/sabpilot/ui/datasourcepage.ui",
"DataSourcePage")
, m_xLocation(new URLBox(m_xBuilder->weld_combo_box("location")))
, m_xBrowse(m_xBuilder->weld_button("browse"))
@@ -57,8 +57,8 @@ namespace abp
m_xLocation->SetSmartProtocol(INetProtocol::File);
m_xLocation->DisableHistory();
- m_xLocationController.reset( new svx::DatabaseLocationInputController(pDialog->getORB(),
- *m_xLocation, *m_xBrowse, *pPageParent.GetFrameWeld()) );
+ m_xLocationController.reset( new svx::DatabaseLocationInputController(pWizard->getORB(),
+ *m_xLocation, *m_xBrowse, *pWizard->getDialog()) );
m_xName->connect_changed( LINK(this, FinalPage, OnEntryNameModified) );
m_xLocation->connect_changed( LINK(this, FinalPage, OnComboNameModified) );
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index e919b79dbd9a..c4cc6bccf6c0 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -46,7 +46,7 @@ namespace abp
StringBag m_aInvalidDataSourceNames;
public:
- explicit FinalPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit FinalPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~FinalPage() override;
private:
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index 640fa30b0afb..774ed245e0b0 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -20,18 +20,15 @@
#include "abspage.hxx"
#include "abspilot.hxx"
-
namespace abp
{
-
-
using namespace ::svt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
- AddressBookSourcePage::AddressBookSourcePage(OAddressBookSourcePilot* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : AddressBookSourcePage_Base(pPageParent, rUIXMLDescription, rID)
- , m_pDialog(pParent)
+ AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OString& rID)
+ : AddressBookSourcePage_Base(pPage, pDialog, rUIXMLDescription, rID)
+ , m_pDialog(pDialog)
{
}
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index a7298e1270f5..b10ee599c144 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -37,7 +37,7 @@ namespace abp
OAddressBookSourcePilot* m_pDialog;
protected:
- AddressBookSourcePage(OAddressBookSourcePilot *pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID);
+ AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OString& rID);
protected:
// helper
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 231adb51c3a9..e6e16d118076 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -370,27 +370,25 @@ namespace abp
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
std::unique_ptr<vcl::OWizardPage> xRet;
switch (_nState)
{
case STATE_SELECT_ABTYPE:
- xRet = std::make_unique<TypeSelectionPage>( this, aParent );
+ xRet = std::make_unique<TypeSelectionPage>(pPageContainer, this);
break;
case STATE_INVOKE_ADMIN_DIALOG:
- xRet = std::make_unique<AdminDialogInvokationPage>( this, aParent );
+ xRet = std::make_unique<AdminDialogInvokationPage>(pPageContainer, this);
break;
case STATE_TABLE_SELECTION:
- xRet = std::make_unique<TableSelectionPage>( this, aParent );
+ xRet = std::make_unique<TableSelectionPage>(pPageContainer, this);
break;
case STATE_MANUAL_FIELD_MAPPING:
- xRet = std::make_unique<FieldMappingPage>( this, aParent );
+ xRet = std::make_unique<FieldMappingPage>(pPageContainer, this);
break;
case STATE_FINAL_CONFIRM:
- xRet = std::make_unique<FinalPage>( this, aParent );
+ xRet = std::make_unique<FinalPage>(pPageContainer, this);
break;
default:
assert(false && "OAddressBookSourcePilot::createPage: invalid state!");
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index f1a2127b6237..2f51d8639896 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -23,8 +23,8 @@
namespace abp
{
- AdminDialogInvokationPage::AdminDialogInvokationPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/invokeadminpage.ui", "InvokeAdminPage")
+ AdminDialogInvokationPage::AdminDialogInvokationPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/invokeadminpage.ui", "InvokeAdminPage")
, m_xInvokeAdminDialog(m_xBuilder->weld_button("settings"))
, m_xErrorMessage(m_xBuilder->weld_label("warning"))
{
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index b5dcaaeaeaed..5765e1fd5c33 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -31,7 +31,7 @@ namespace abp
std::unique_ptr<weld::Label> m_xErrorMessage;
public:
- explicit AdminDialogInvokationPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit AdminDialogInvokationPage(weld::Container* pPage, OAddressBookSourcePilot* pDialog);
virtual ~AdminDialogInvokationPage() override;
private:
// BuilderPage overridables
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 54e2ab86e7ed..1652723fda99 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -25,8 +25,8 @@
namespace abp
{
- FieldMappingPage::FieldMappingPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/fieldassignpage.ui", "FieldAssignPage")
+ FieldMappingPage::FieldMappingPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/fieldassignpage.ui", "FieldAssignPage")
, m_xInvokeDialog(m_xBuilder->weld_button("assign"))
, m_xHint(m_xBuilder->weld_label("hint"))
{
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 63b5b2158832..1423da470b25 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -30,7 +30,7 @@ namespace abp
std::unique_ptr<weld::Button> m_xInvokeDialog;
std::unique_ptr<weld::Label> m_xHint;
public:
- explicit FieldMappingPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit FieldMappingPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~FieldMappingPage() override;
private:
// OWizardPage overridables
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index a897326902ac..585a5ea3d5ae 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -27,8 +27,8 @@
namespace abp
{
- TableSelectionPage::TableSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/selecttablepage.ui", "SelectTablePage")
+ TableSelectionPage::TableSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/selecttablepage.ui", "SelectTablePage")
, m_xTableList(m_xBuilder->weld_tree_view("table"))
{
m_xTableList->connect_changed( LINK( this, TableSelectionPage, OnTableSelected ) );
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 35f2e40e6cc3..2f96aeb60bd2 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -30,7 +30,7 @@ namespace abp
std::unique_ptr<weld::TreeView> m_xTableList;
public:
- explicit TableSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit TableSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~TableSelectionPage() override;
private:
// OWizardPage overridables
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 394b6889cefb..3aac37ef7dcb 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -31,8 +31,8 @@ namespace abp
using namespace ::com::sun::star::sdbc;
// TypeSelectionPage
- TypeSelectionPage::TypeSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/selecttypepage.ui", "SelectTypePage")
+ TypeSelectionPage::TypeSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pDialog)
+ : AddressBookSourcePage(pPage, pDialog, "modules/sabpilot/ui/selecttypepage.ui", "SelectTypePage")
, m_xEvolution(m_xBuilder->weld_radio_button("evolution"))
, m_xEvolutionGroupwise(m_xBuilder->weld_radio_button("groupwise"))
, m_xEvolutionLdap(m_xBuilder->weld_radio_button("evoldap"))
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index ef8a609cd6ad..7488495f20c0 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -55,7 +55,7 @@ namespace abp
std::vector< ButtonItem > m_aAllTypes;
public:
- explicit TypeSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit TypeSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~TypeSelectionPage() override;
// retrieves the currently selected type
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 20:04:46 +0000