[Libreoffice-commits] core.git: dbaccess/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 07:58:30 UTC 2018
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 36 +++++++++++-----------
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 8 ++--
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 26 +++++++--------
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 6 +--
dbaccess/source/ui/dlg/dbwizsetup.cxx | 12 +++----
5 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit f6f53264d9e2f924ac1dbb309b615912dfe9a7dc
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 24 16:25:08 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 25 09:58:00 2018 +0200
rename DBOConnectionTabPageSetup back to OConnectionTabPageSetup
Change-Id: I3d5c90e51922350ca3bb6f59fc94bf5768c995f1
Reviewed-on: https://gerrit.libreoffice.org/62326
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index fa11988bca04..6d7588b077f9 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -61,32 +61,32 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- VclPtr<OGenericAdministrationPage> DBOConnectionTabPageSetup::CreateDbaseTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateDbaseTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
- return VclPtr<DBOConnectionTabPageSetup>::Create ( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE );
+ return VclPtr<OConnectionTabPageSetup>::Create ( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE );
}
- VclPtr<OGenericAdministrationPage> DBOConnectionTabPageSetup::CreateMSAccessTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateMSAccessTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
- return VclPtr<DBOConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE );
+ return VclPtr<OConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE );
}
- VclPtr<OGenericAdministrationPage> DBOConnectionTabPageSetup::CreateADOTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateADOTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
- return VclPtr<DBOConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL );
+ return VclPtr<OConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL );
}
- VclPtr<OGenericAdministrationPage> DBOConnectionTabPageSetup::CreateODBCTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateODBCTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
- return VclPtr<DBOConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE );
+ return VclPtr<OConnectionTabPageSetup>::Create( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE );
}
- VclPtr<OGenericAdministrationPage> DBOConnectionTabPageSetup::CreateUserDefinedTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateUserDefinedTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
- return VclPtr<DBOConnectionTabPageSetup>::Create(pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, nullptr, nullptr, STR_COMMONURL);
+ return VclPtr<OConnectionTabPageSetup>::Create(pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, nullptr, nullptr, STR_COMMONURL);
}
- DBOConnectionTabPageSetup::DBOConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId)
+ OConnectionTabPageSetup::OConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId)
: DBOConnectionHelper(pParent, _rUIXMLDescription, _rId, _rCoreAttrs)
, m_xHelpText(m_xBuilder->weld_label("helptext"))
, m_xHeaderText(m_xBuilder->weld_label("header"))
@@ -111,17 +111,17 @@ namespace dbaui
else
m_xFT_Connection->hide();
- m_xConnectionURL->connect_changed(LINK(this, DBOConnectionTabPageSetup, OnEditModified));
+ m_xConnectionURL->connect_changed(LINK(this, OConnectionTabPageSetup, OnEditModified));
SetRoadmapStateValue(false);
}
- DBOConnectionTabPageSetup::~DBOConnectionTabPageSetup()
+ OConnectionTabPageSetup::~OConnectionTabPageSetup()
{
disposeOnce();
}
- void DBOConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
+ void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
{
m_eType = m_pAdminDialog->getDatasourceType(_rSet);
// special handling for oracle, this can only happen
@@ -149,26 +149,26 @@ namespace dbaui
callModifiedHdl();
}
- bool DBOConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
+ bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
{
return commitURL();
}
- bool DBOConnectionTabPageSetup::FillItemSet(SfxItemSet* _rSet)
+ bool OConnectionTabPageSetup::FillItemSet(SfxItemSet* _rSet)
{
bool bChangedSomething = false;
fillString(*_rSet,m_xConnectionURL.get(), DSID_CONNECTURL, bChangedSomething);
return bChangedSomething;
}
- bool DBOConnectionTabPageSetup::checkTestConnection()
+ bool OConnectionTabPageSetup::checkTestConnection()
{
if ( m_pCollection->determineType(m_eType) == ::dbaccess::DST_POSTGRES )
return true;
return !m_xConnectionURL->get_visible() || !m_xConnectionURL->GetTextNoPrefix().isEmpty();
}
- IMPL_LINK_NOARG(DBOConnectionTabPageSetup, OnEditModified, weld::Entry&, void)
+ IMPL_LINK_NOARG(OConnectionTabPageSetup, OnEditModified, weld::Entry&, void)
{
SetRoadmapStateValue(checkTestConnection());
callModifiedHdl();
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 79b7f053537f..c1ef26cdc656 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -34,9 +34,9 @@ namespace dbaui
/** implements the connection page of the data source properties dialog.
*/
- class DBOConnectionTabPageSetup : public DBOConnectionHelper
+ class OConnectionTabPageSetup : public DBOConnectionHelper
{
- friend class VclPtr<DBOConnectionTabPageSetup>;
+ friend class VclPtr<OConnectionTabPageSetup>;
protected:
std::unique_ptr<weld::Label> m_xHelpText;
@@ -46,7 +46,7 @@ namespace dbaui
DECL_LINK(OnEditModified, weld::Entry&, void);
public:
- virtual ~DBOConnectionTabPageSetup() override;
+ virtual ~OConnectionTabPageSetup() override;
static VclPtr<OGenericAdministrationPage> CreateDbaseTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
static VclPtr<OGenericAdministrationPage> CreateMSAccessTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
static VclPtr<OGenericAdministrationPage> CreateADOTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
@@ -59,7 +59,7 @@ namespace dbaui
virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
protected:
- DBOConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
+ OConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
virtual bool checkTestConnection() override;
// nControlFlags is a combination of the CBTP_xxx-constants
};
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index eafbc7eb40df..4a3473e5dacc 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -66,7 +66,7 @@ using namespace ::com::sun::star;
// OTextConnectionPageSetup
OTextConnectionPageSetup::OTextConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : DBOConnectionTabPageSetup(pParent, "dbaccess/ui/dbwiztextpage.ui", "DBWizTextPage",
+ : OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwiztextpage.ui", "DBWizTextPage",
rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
, m_xSubContainer(m_xBuilder->weld_widget("TextPageContainer"))
, m_aTextConnectionHelper(m_xSubContainer.get(), TC_EXTENSION | TC_SEPARATORS)
@@ -81,26 +81,26 @@ using namespace ::com::sun::star;
IMPL_LINK_NOARG(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, void)
{
- SetRoadmapStateValue(!m_aTextConnectionHelper.GetExtension().isEmpty() && DBOConnectionTabPageSetup::checkTestConnection());
+ SetRoadmapStateValue(!m_aTextConnectionHelper.GetExtension().isEmpty() && OConnectionTabPageSetup::checkTestConnection());
callModifiedHdl();
}
bool OTextConnectionPageSetup::checkTestConnection()
{
- bool bDoEnable = DBOConnectionTabPageSetup::checkTestConnection();
+ bool bDoEnable = OConnectionTabPageSetup::checkTestConnection();
bDoEnable = !m_aTextConnectionHelper.GetExtension().isEmpty() && bDoEnable;
return bDoEnable;
}
void OTextConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
- DBOConnectionTabPageSetup::fillControls(_rControlList);
+ OConnectionTabPageSetup::fillControls(_rControlList);
m_aTextConnectionHelper.fillControls(_rControlList);
}
void OTextConnectionPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
- DBOConnectionTabPageSetup::fillWindows(_rControlList);
+ OConnectionTabPageSetup::fillWindows(_rControlList);
m_aTextConnectionHelper.fillWindows(_rControlList);
}
@@ -109,13 +109,13 @@ using namespace ::com::sun::star;
// first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
bool bValid, bReadonly;
getFlags(_rSet, bValid, bReadonly);
- DBOConnectionTabPageSetup::implInitControls( _rSet, _bSaveValue);
+ OConnectionTabPageSetup::implInitControls( _rSet, _bSaveValue);
m_aTextConnectionHelper.implInitControls(_rSet, bValid);
}
bool OTextConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
{
- bool bChangedSomething = DBOConnectionTabPageSetup::FillItemSet(_rSet);
+ bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
bChangedSomething = m_aTextConnectionHelper.FillItemSet(*_rSet, bChangedSomething);
return bChangedSomething;
}
@@ -570,7 +570,7 @@ using namespace ::com::sun::star;
// OMySQLJDBCConnectionPageSetup
OJDBCConnectionPageSetup::OJDBCConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : DBOConnectionTabPageSetup(pParent, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs,
+ : OConnectionTabPageSetup(pParent, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs,
STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
, m_xFTDriverClass(m_xBuilder->weld_label("jdbcLabel"))
, m_xETDriverClass(m_xBuilder->weld_entry("jdbcEntry"))
@@ -597,7 +597,7 @@ using namespace ::com::sun::star;
bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
{
- bool bChangedSomething = DBOConnectionTabPageSetup::FillItemSet(_rSet);
+ bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
fillString(*_rSet,m_xETDriverClass.get(),DSID_JDBCDRIVERCLASS,bChangedSomething);
return bChangedSomething;
}
@@ -629,7 +629,7 @@ using namespace ::com::sun::star;
}
bool bEnable = pDrvItem->GetValue().getLength() != 0;
m_xPBTestJavaDriver->set_sensitive(bEnable);
- DBOConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
+ OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
SetRoadmapStateValue(checkTestConnection());
}
@@ -683,7 +683,7 @@ using namespace ::com::sun::star;
OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : DBOConnectionTabPageSetup(pParent, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
+ : OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
, m_xPasswordrequired(m_xBuilder->weld_check_button("passwordrequired"))
{
@@ -701,14 +701,14 @@ using namespace ::com::sun::star;
void OSpreadSheetConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
- DBOConnectionTabPageSetup::fillControls(_rControlList);
+ OConnectionTabPageSetup::fillControls(_rControlList);
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xPasswordrequired.get()));
}
bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
{
- bool bChangedSomething = DBOConnectionTabPageSetup::FillItemSet(_rSet);
+ bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
fillBool(*_rSet,m_xPasswordrequired.get(),DSID_PASSWORDREQUIRED,false,bChangedSomething);
return bChangedSomething;
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index ec41c7281ad2..8f9acc5e1470 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -36,7 +36,7 @@ namespace dbaui
{
// OSpreadSheetConnectionPageSetup
- class OSpreadSheetConnectionPageSetup final : public DBOConnectionTabPageSetup
+ class OSpreadSheetConnectionPageSetup final : public OConnectionTabPageSetup
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
@@ -52,7 +52,7 @@ namespace dbaui
};
// OTextConnectionPage
- class OTextConnectionPageSetup : public DBOConnectionTabPageSetup
+ class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
std::unique_ptr<weld::Widget> m_xSubContainer;
@@ -168,7 +168,7 @@ namespace dbaui
};
// OJDBCConnectionPageSetup
- class OJDBCConnectionPageSetup final : public DBOConnectionTabPageSetup
+ class OJDBCConnectionPageSetup final : public OConnectionTabPageSetup
{
public:
OJDBCConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 2d75c52962b2..17565955523b 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -471,11 +471,11 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_DBASE:
- pPage = DBOConnectionTabPageSetup::CreateDbaseTabPage(this,*m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateDbaseTabPage(this,*m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_ADO:
- pPage = DBOConnectionTabPageSetup::CreateADOTabPage( this, *m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateADOTabPage( this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_TEXT:
@@ -483,7 +483,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_ODBC:
- pPage = DBOConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_JDBC:
@@ -492,7 +492,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
case PAGE_DBSETUPWIZARD_MYSQL_ODBC:
m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:odbc:")));
- pPage = DBOConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_JDBC:
@@ -517,7 +517,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_MSACCESS:
- pPage = DBOConnectionTabPageSetup::CreateMSAccessTabPage(this,*m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateMSAccessTabPage(this,*m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_INTRO:
m_pMySQLIntroPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(this,*m_pOutSet);
@@ -530,7 +530,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_USERDEFINED:
- pPage = DBOConnectionTabPageSetup::CreateUserDefinedTabPage(this,*m_pOutSet);
+ pPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(this,*m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_FINAL:
More information about the Libreoffice-commits
mailing list