[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - comphelper/source include/comphelper svx/source svx/uiconfig
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Tue Dec 6 20:58:31 UTC 2016
comphelper/source/misc/backupfilehelper.cxx | 10 +++++-----
include/comphelper/backupfilehelper.hxx | 4 ++--
svx/source/dialog/SafeModeDialog.cxx | 18 +++++++++---------
svx/source/dialog/SafeModeDialog.hxx | 2 +-
svx/uiconfig/ui/safemodedialog.ui | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 66b8bb8753035280d68b42bfaec48b1c59387f75
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Tue Dec 6 17:23:27 2016 +0100
SafeModeDialog: Rename to match reality
This doesn't remove shared&bundled extensions, but resets the registration
database from shared extensions.
Change-Id: I9f198fc7b771fd3bd31547008fd8d006a6d1b5d5
Reviewed-on: https://gerrit.libreoffice.org/31693
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
(cherry picked from commit a3597a3f370175d0c06887e6691cbfa045937ad4)
Reviewed-on: https://gerrit.libreoffice.org/31702
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index 6432010..98bb029 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2031,9 +2031,9 @@ namespace comphelper
deleteDirRecursively(maUserConfigWorkURL + "/uno_packages");
}
- bool BackupFileHelper::isTryDeinstallAllExtensionsPossible()
+ bool BackupFileHelper::isTryResetSharedExtensionsPossible()
{
- // check if there are other Extensions installed (shared|bundled).
+ // check if there are shared Extensions installed
class ExtensionInfo aExtensionInfo;
aExtensionInfo.createUsingExtensionRegistryEntriesFromXML(maUserConfigWorkURL, false);
@@ -2041,10 +2041,10 @@ namespace comphelper
return !aExtensionInfo.getExtensionInfoEntryVector().empty();
}
- void BackupFileHelper::tryDeinstallAllExtensions()
+ void BackupFileHelper::tryResetSharedExtensions()
{
- // delete other Extension installs (shared|bundled)
- deleteDirRecursively(maUserConfigWorkURL + "/extensions");
+ // reset shared extension info
+ deleteDirRecursively(maUserConfigWorkURL + "/extensions/shared");
}
const std::vector< OUString >& BackupFileHelper::getCustomizationDirNames()
diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx
index d11208a..5870f24 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/include/comphelper/backupfilehelper.hxx
@@ -164,8 +164,8 @@ namespace comphelper
/** Deinstall all Extensions (user|shared|bundled)
*/
- static bool isTryDeinstallAllExtensionsPossible();
- static void tryDeinstallAllExtensions();
+ static bool isTryResetSharedExtensionsPossible();
+ static void tryResetSharedExtensions();
/// Disables OpenGL and OpenCL
static void tryDisableHWAcceleration();
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 18256f3..f3a6960 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -54,7 +54,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
mpCBCheckProfilesafeExtensions(),
mpCBDisableAllExtensions(),
mpCBDeinstallUserExtensions(),
- mpCBDeinstallAllExtensions(),
+ mpCBResetSharedExtensions(),
mpCBDisableHWAcceleration(),
mpCBResetCustomizations(),
mpCBResetWholeUserProfile(),
@@ -79,7 +79,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
get(mpCBCheckProfilesafeExtensions, "check_profilesafe_extensions");
get(mpCBDisableAllExtensions, "check_disable_all_extensions");
get(mpCBDeinstallUserExtensions, "check_deinstall_user_extensions");
- get(mpCBDeinstallAllExtensions, "check_deinstall_all_extensions");
+ get(mpCBResetSharedExtensions, "check_reset_shared_extensions");
get(mpCBDisableHWAcceleration, "check_disable_hw_acceleration");
get(mpCBResetCustomizations, "check_reset_customizations");
get(mpCBResetWholeUserProfile, "check_reset_whole_userprofile");
@@ -101,7 +101,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
mpCBCheckProfilesafeExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
mpCBDisableAllExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
mpCBDeinstallUserExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
- mpCBDeinstallAllExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
+ mpCBResetSharedExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
mpCBDisableHWAcceleration->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
mpCBResetCustomizations->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
mpCBResetWholeUserProfile->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl));
@@ -150,7 +150,7 @@ void SafeModeDialog::dispose()
mpCBCheckProfilesafeExtensions.clear();
mpCBDisableAllExtensions.clear();
mpCBDeinstallUserExtensions.clear();
- mpCBDeinstallAllExtensions.clear();
+ mpCBResetSharedExtensions.clear();
mpCBDisableHWAcceleration.clear();
mpCBResetCustomizations.clear();
mpCBResetWholeUserProfile.clear();
@@ -168,7 +168,7 @@ void SafeModeDialog::enableDisableWidgets()
mpCBCheckProfilesafeExtensions->Enable(maBackupFileHelper.isPopPossibleExtensionInfo());
mpCBDisableAllExtensions->Enable(comphelper::BackupFileHelper::isTryDisableAllExtensionsPossible());
mpCBDeinstallUserExtensions->Enable(comphelper::BackupFileHelper::isTryDeinstallUserExtensionsPossible());
- mpCBDeinstallAllExtensions->Enable(comphelper::BackupFileHelper::isTryDeinstallAllExtensionsPossible());
+ mpCBResetSharedExtensions->Enable(comphelper::BackupFileHelper::isTryResetSharedExtensionsPossible());
mpCBResetCustomizations->Enable(comphelper::BackupFileHelper::isTryResetCustomizationsPossible());
// no disable of mpCBResetWholeUserProfile, always possible (as last choice)
@@ -226,10 +226,10 @@ void SafeModeDialog::applyChanges()
comphelper::BackupFileHelper::tryDeinstallUserExtensions();
}
- if (mpCBDeinstallAllExtensions->IsChecked())
+ if (mpCBResetSharedExtensions->IsChecked())
{
- // Deinstall all Extensions (user|shared|bundled)
- comphelper::BackupFileHelper::tryDeinstallAllExtensions();
+ // Reset shared Extensions
+ comphelper::BackupFileHelper::tryResetSharedExtensions();
}
}
@@ -378,7 +378,7 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void)
mpCBCheckProfilesafeExtensions->IsChecked() ||
mpCBDisableAllExtensions->IsChecked() ||
mpCBDeinstallUserExtensions->IsChecked() ||
- mpCBDeinstallAllExtensions->IsChecked() ||
+ mpCBResetSharedExtensions->IsChecked() ||
mpCBDisableHWAcceleration->IsChecked() ||
mpCBResetCustomizations->IsChecked() ||
mpCBResetWholeUserProfile->IsChecked());
diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx
index d926dd4..ddba90f 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -51,7 +51,7 @@ private:
VclPtr<CheckBox> mpCBCheckProfilesafeExtensions;
VclPtr<CheckBox> mpCBDisableAllExtensions;
VclPtr<CheckBox> mpCBDeinstallUserExtensions;
- VclPtr<CheckBox> mpCBDeinstallAllExtensions;
+ VclPtr<CheckBox> mpCBResetSharedExtensions;
VclPtr<CheckBox> mpCBDisableHWAcceleration;
VclPtr<CheckBox> mpCBResetCustomizations;
VclPtr<CheckBox> mpCBResetWholeUserProfile;
diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index bacc7f0..a4d4353 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="SafeModeDialog">
@@ -231,7 +231,7 @@ The proposed changes get more radical from top down so it is recommended to try
</child>
<child>
<object class="GtkRadioButton" id="radio_deinstall">
- <property name="label" translatable="yes">Uninstall extensions</property>
+ <property name="label" translatable="yes">Extensions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -268,8 +268,8 @@ The proposed changes get more radical from top down so it is recommended to try
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="check_deinstall_all_extensions">
- <property name="label" translatable="yes">Uninstall all extensions (including shared and bundled)</property>
+ <object class="GtkCheckButton" id="check_reset_shared_extensions">
+ <property name="label" translatable="yes">Reset state of shared extensions</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
More information about the Libreoffice-commits
mailing list