[Libreoffice-commits] core.git: 2 commits - dbaccess/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 2 13:06:20 UTC 2019
dbaccess/source/ui/dlg/adminpages.cxx | 47 ----------------------------------
dbaccess/source/ui/dlg/adminpages.hxx | 4 --
2 files changed, 51 deletions(-)
New commits:
commit 4cb2fb91d4f70940c1656716e59cdee5e6b6b592
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 2 10:24:32 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 2 15:05:15 2019 +0200
remove newly unused OGenericAdministrationPage ctor
Change-Id: Ibb1353e5b14648253cb455664693271fd4482c51
Reviewed-on: https://gerrit.libreoffice.org/76850
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/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 22486900faf3..f85635e8cbbb 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -58,16 +58,6 @@ namespace dbaui
{
}
- OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet)
- :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet)
- ,m_abEnableRoadmap(false)
- ,m_pAdminDialog(nullptr)
- ,m_pItemSetHelper(nullptr)
- {
-
- SetExchangeSupport();
- }
-
OGenericAdministrationPage::OGenericAdministrationPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, rUIXMLDescription, rId, &rAttrSet)
, m_abEnableRoadmap(false)
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 6900f1f7cc2f..63641145cbdf 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -123,7 +123,6 @@ namespace dbaui
css::uno::Reference< css::uno::XComponentContext >
m_xORB;
public:
- OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet);
OGenericAdministrationPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet);
/// set a handler which gets called every time something on the page has been modified
void SetModifiedHandler(const Link<OGenericAdministrationPage const *, void>& _rHandler) { m_aModifiedHandler = _rHandler; }
commit a6ed90b37cabd339aa1b364762e5e49fd9067848
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 2 10:22:10 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 2 15:04:55 2019 +0200
drop some newly unused functions
Change-Id: I2ee32a9fdac6ff85927a5755ce341a591a462544
Reviewed-on: https://gerrit.libreoffice.org/76849
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/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 58464f36643c..22486900faf3 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -203,27 +203,6 @@ namespace dbaui
{
return true;
}
- void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox const * _pCheckBox, sal_uInt16 _nID, bool& _bChangedSomething, bool _bRevertValue )
- {
- if ( _pCheckBox && _pCheckBox->IsValueChangedFromSaved() )
- {
- bool bValue = _pCheckBox->IsChecked();
- if ( _bRevertValue )
- bValue = !bValue;
-
- if ( _pCheckBox->IsTriStateEnabled() )
- {
- OptionalBoolItem aValue( _nID );
- if ( _pCheckBox->GetState() != TRISTATE_INDET )
- aValue.SetValue( bValue );
- _rSet.Put( aValue );
- }
- else
- _rSet.Put( SfxBoolItem( _nID, bValue ) );
-
- _bChangedSomething = true;
- }
- }
void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, const weld::CheckButton* pCheckBox, sal_uInt16 _nID, bool bOptionalBool, bool& _bChangedSomething, bool _bRevertValue )
{
if (pCheckBox && pCheckBox->get_state_changed_from_saved())
@@ -245,14 +224,6 @@ namespace dbaui
_bChangedSomething = true;
}
}
- void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet, NumericField const * _pEdit, sal_uInt16 _nID, bool& _bChangedSomething)
- {
- if( _pEdit && _pEdit->IsValueChangedFromSaved() )
- {
- _rSet.Put(SfxInt32Item(_nID, static_cast<sal_Int32>(_pEdit->GetValue())));
- _bChangedSomething = true;
- }
- }
void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet, const weld::SpinButton* pEdit, sal_uInt16 _nID, bool& _bChangedSomething)
{
if (pEdit && pEdit->get_value_changed_from_saved())
@@ -261,14 +232,6 @@ namespace dbaui
_bChangedSomething = true;
}
}
- void OGenericAdministrationPage::fillString(SfxItemSet& _rSet, Edit const * _pEdit, sal_uInt16 _nID, bool& _bChangedSomething)
- {
- if( _pEdit && _pEdit->IsValueChangedFromSaved() )
- {
- _rSet.Put(SfxStringItem(_nID, _pEdit->GetText()));
- _bChangedSomething = true;
- }
- }
void OGenericAdministrationPage::fillString(SfxItemSet& _rSet, const weld::Entry* pEdit, sal_uInt16 _nID, bool& _bChangedSomething)
{
if (pEdit && pEdit->get_value_changed_from_saved())
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 1bd217274066..6900f1f7cc2f 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -222,7 +222,6 @@ namespace dbaui
@param _bRevertValue
set to <TRUE/> if the display value should be reverted before putting it into the set
*/
- static void fillBool(SfxItemSet& _rSet, CheckBox const * _pCheckBox, sal_uInt16 _nID, bool& _bChangedSomething, bool _bRevertValue = false);
static void fillBool(SfxItemSet& _rSet, const weld::CheckButton* pCheckBox, sal_uInt16 _nID, bool bOptionalBool, bool& _bChangedSomething, bool _bRevertValue = false);
/** fills the int value into the item set when the value changed.
@@ -235,7 +234,6 @@ namespace dbaui
@param _bChangedSomething
<TRUE/> if something changed otherwise <FALSE/>
*/
- static void fillInt32(SfxItemSet& _rSet,NumericField const * _pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
static void fillInt32(SfxItemSet& _rSet,const weld::SpinButton* pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
/** fills the String value into the item set when the value changed.
@@ -248,7 +246,6 @@ namespace dbaui
@param _bChangedSomething
<TRUE/> if something changed otherwise <FALSE/>
*/
- static void fillString(SfxItemSet& _rSet,Edit const * _pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
static void fillString(SfxItemSet& _rSet,const weld::Entry* pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
static void fillString(SfxItemSet& _rSet,const dbaui::OConnectionURLEdit* pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
More information about the Libreoffice-commits
mailing list