[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source svx/uiconfig

[Samuel Mehrbrodt]

 svx/source/dialog/SafeModeDialog.cxx |   12 ++++++------
 svx/source/dialog/SafeModeDialog.hxx |    2 +-
 svx/uiconfig/ui/safemodedialog.ui    |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 403f29480ff9a679eba6a93ef7d43ffaa6d7f518
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Tue Dec 6 21:23:13 2016 +0100

    SafeModeDialog: Rename widget to match label
    
    Change-Id: I6bb02527fa77846343e55ff73497d1b46b5e1ba8
    Reviewed-on: https://gerrit.libreoffice.org/31699
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 6ce819eefe8dab8ba38bda160e45ccc4220c40f3)
    Reviewed-on: https://gerrit.libreoffice.org/31704

diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 25ef957..ac9c494 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));
@@ -137,7 +137,7 @@ void SafeModeDialog::dispose()
 {
     mpRadioRestore.clear();
     mpRadioConfigure.clear();
-    mpRadioDeinstall.clear();
+    mpRadioExtensions.clear();
     mpRadioReset.clear();
 
     mpBoxRestore.clear();
@@ -223,7 +223,7 @@ void SafeModeDialog::applyChanges()
     }
 
     // Deinstall
-    if (mpRadioDeinstall->IsChecked())
+    if (mpRadioExtensions->IsChecked())
     {
         if (mpCBDeinstallUserExtensions->IsChecked())
         {
@@ -289,7 +289,7 @@ IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn, void)
         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 07c82d9..aebbb8e 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 57161f4..01ae66b 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>