diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-26 14:17:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 12:07:34 +0200 |
| commit | 5481ca586df8eed2c832e00bc5f7e910fa2cd174 (patch) | |
| tree | 78ce9d1f047062151dfd48ce0c399910505f066e /include | |
| parent | 55f0b65b0568b8a8b1d823578eea1cbf633f4134 (diff) | |
weld SpecialSettingsPage and GeneratedValuesPage
Change-Id: I3b4c2a4d553032128efe25c008df30d6f1f77628
Reviewed-on: https://gerrit.libreoffice.org/61018
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/dialogcontrolling.hxx | 12 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index eb993cdbf2b6..447ab1349edc 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -155,18 +155,6 @@ namespace svt void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 ); void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 ); - /** ensures that a given window is enabled or disabled, according to the mark state - of a given check box - @param _rBox - denotes the check box whose mark state is to observe - @param _rDependentWindow - denotes the window which should be enabled when ->_rBox is marked, and - disabled when it's unmarked - */ - void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow ); - void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ); - void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 ); - /** adds a non-standard controller whose functionality is not covered by the other methods @param _pController diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index c854468ffa5b..87139903d5d1 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -1190,11 +1190,8 @@ public: virtual std::unique_ptr<SpinButton> weld_spin_button(const OString& id, bool bTakeOwnership = false) = 0; - std::unique_ptr<MetricSpinButton> weld_metric_spin_button(const OString& id, FieldUnit eUnit, - bool bTakeOwnership = false) - { - return o3tl::make_unique<MetricSpinButton>(weld_spin_button(id, bTakeOwnership), eUnit); - } + virtual std::unique_ptr<MetricSpinButton> + weld_metric_spin_button(const OString& id, FieldUnit eUnit, bool bTakeOwnership = false) = 0; virtual std::unique_ptr<TimeSpinButton> weld_time_spin_button(const OString& id, TimeFieldFormat eFormat, bool bTakeOwnership = false) = 0; |