diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-06 21:23:13 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-01-19 18:12:58 +0100 |
| commit | 15fd33cd94442cc04306720297084d0b53a0d542 (patch) | |
| tree | 9c71ba21d981f8668cfbcfe5666530809ffa3dbb | |
| parent | SafeModeDialog: Add option to reset bundled extension registration (diff) | |
| download | core-15fd33cd94442cc04306720297084d0b53a0d542.tar.gz core-15fd33cd94442cc04306720297084d0b53a0d542.zip | |
SafeModeDialog: Rename widget to match label
Change-Id: I6bb02527fa77846343e55ff73497d1b46b5e1ba8
Reviewed-on: https://gerrit.libreoffice.org/31699
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 13 | ||||
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.hxx | 2 | ||||
| -rw-r--r-- | svx/uiconfig/ui/safemodedialog.ui | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index da94888a90c3..59db86c13964 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -47,7 +47,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpRadioRestore(), mpRadioConfigure(), - mpRadioDeinstall(), + mpRadioExtensions(), mpRadioReset(), mpCBCheckProfilesafeConfig(), @@ -73,7 +73,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) get(mpRadioRestore, "radio_restore"); get(mpRadioConfigure, "radio_configure"); - get(mpRadioDeinstall, "radio_deinstall"); + get(mpRadioExtensions, "radio_extensions"); get(mpRadioReset, "radio_reset"); get(mpCBCheckProfilesafeConfig, "check_profilesafe_config"); @@ -92,7 +92,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpRadioRestore->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioConfigure->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); - mpRadioDeinstall->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); + mpRadioExtensions->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); @@ -138,7 +138,7 @@ void SafeModeDialog::dispose() { mpRadioRestore.clear(); mpRadioConfigure.clear(); - mpRadioDeinstall.clear(); + mpRadioExtensions.clear(); mpRadioReset.clear(); mpBoxRestore.clear(); @@ -223,7 +223,8 @@ void SafeModeDialog::applyChanges() } } - if (mpRadioDeinstall->IsChecked()) + // Deinstall + if (mpRadioExtensions->IsChecked()) { if (mpCBDeinstallUserExtensions->IsChecked()) { @@ -289,7 +290,7 @@ IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn) mpBoxDeinstall->Disable(); } - else if (pBtn == mpRadioDeinstall.get()) + else if (pBtn == mpRadioExtensions.get()) { // Enable the currently selected box mpBoxDeinstall->Enable(); diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx index 615236bdc4a4..978fd82eceb8 100644 --- a/svx/source/dialog/SafeModeDialog.hxx +++ b/svx/source/dialog/SafeModeDialog.hxx @@ -44,7 +44,7 @@ private: VclPtr<RadioButton> mpRadioRestore; VclPtr<RadioButton> mpRadioConfigure; - VclPtr<RadioButton> mpRadioDeinstall; + VclPtr<RadioButton> mpRadioExtensions; VclPtr<RadioButton> mpRadioReset; VclPtr<CheckBox> mpCBCheckProfilesafeConfig; diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui index 10a5c8f841f1..c2ce6fef53af 100644 --- a/svx/uiconfig/ui/safemodedialog.ui +++ b/svx/uiconfig/ui/safemodedialog.ui @@ -230,7 +230,7 @@ The proposed changes get more radical from top down so it is recommended to try </packing> </child> <child> - <object class="GtkRadioButton" id="radio_deinstall"> + <object class="GtkRadioButton" id="radio_extensions"> <property name="label" translatable="yes">Extensions</property> <property name="visible">True</property> <property name="can_focus">True</property> |