diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/advancedsettings.hxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/advancedsettings.hxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 8efc8642863d..9eaca4a41b48 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX -#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX +#pragma once #include "adminpages.hxx" #include <dsmeta.hxx> @@ -27,7 +26,6 @@ namespace dbaui { struct BooleanSettingDesc; - typedef std::vector< BooleanSettingDesc > BooleanSettingDescs; // SpecialSettingsPage // implements the "Special Settings" page of the advanced database settings @@ -56,16 +54,16 @@ namespace dbaui std::unique_ptr<weld::Label> m_xMaxRowScanLabel; std::unique_ptr<weld::SpinButton> m_xMaxRowScan; - std::map<weld::ToggleButton*, TriState> m_aTriStates; + std::map<weld::Toggleable*, TriState> m_aTriStates; - BooleanSettingDescs m_aBooleanSettings; + std::vector< BooleanSettingDesc > m_aBooleanSettings; bool m_bHasBooleanComparisonMode; bool m_bHasMaxRowScan; public: - DECL_LINK(OnToggleHdl, weld::ToggleButton&, void); - DECL_LINK(OnTriStateToggleHdl, weld::ToggleButton&, void); + DECL_LINK(OnToggleHdl, weld::Toggleable&, void); + DECL_LINK(OnTriStateToggleHdl, weld::Toggleable&, void); virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; @@ -90,9 +88,7 @@ namespace dbaui { std::unique_ptr<weld::CheckButton> m_xAutoRetrievingEnabled; std::unique_ptr<weld::Widget> m_xGrid; - std::unique_ptr<weld::Label> m_xAutoIncrementLabel; std::unique_ptr<weld::Entry> m_xAutoIncrement; - std::unique_ptr<weld::Label> m_xAutoRetrievingLabel; std::unique_ptr<weld::Entry> m_xAutoRetrieving; public: @@ -102,7 +98,7 @@ namespace dbaui virtual ~GeneratedValuesPage() override; private: - DECL_LINK(OnAutoToggleHdl, weld::ToggleButton&, void); + DECL_LINK(OnAutoToggleHdl, weld::Toggleable&, void); // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; @@ -115,6 +111,4 @@ namespace dbaui }; } -#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |