summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-12-06 17:23:27 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-12-06 20:05:13 +0000
commita3597a3f370175d0c06887e6691cbfa045937ad4 (patch)
treec0fbb7e0d80c4cb0423c8a85e706cc1c52f90ed5 /comphelper
parent9da0627254ca31f768740a7b6012ca85d925fb30 (diff)
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@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/misc/backupfilehelper.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index 643201080cc9..98bb029e211f 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()