Kaydet (Commit) 0ab5ce54 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#53006: Remove directories too, not just plain files

... that was an oversight in 5300f6f7; thanks
Petr for spotting it.

Change-Id: I4d0179165bc3b29d698cd776f7e1aa51fa73ebe3
üst 293151c8
...@@ -186,11 +186,16 @@ void removeTree(OUString const & url) { ...@@ -186,11 +186,16 @@ void removeTree(OUString const & url) {
} else { } else {
if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) { if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
"cannot remove " + stat.getFileURL(), "cannot remove file " + stat.getFileURL(),
css::uno::Reference< css::uno::XInterface >()); css::uno::Reference< css::uno::XInterface >());
} }
} }
} }
if (osl::Directory::remove(url) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
"cannot remove directory " + url,
css::uno::Reference< css::uno::XInterface >());
}
} }
// Remove any existing UserInstallation's user/extensions/bundled cache // Remove any existing UserInstallation's user/extensions/bundled cache
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment