summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-09-29 18:12:24 +0300
committerTor Lillqvist <tml@collabora.com>2014-09-29 19:39:00 +0300
commit0a4d780413c817363b97cdf0f0f0451bf9790f7d (patch)
treeea79795e7810f537c709eaa072b54bda73bbdee7 /desktop
parentd83cd0bc896f879d7964003a16b3b9da63e3683b (diff)
No extension cache to clean unless HAVE_FEATURE_EXTENSIONS
Change-Id: Id19a93b0b428849a3590e2e28e081154c443e949
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6a59eee1f002..da0d92730423 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -161,6 +161,8 @@ static oslSignalHandler pSignalHandler = 0;
namespace {
+#if HAVE_FEATURE_EXTENSIONS
+
void removeTree(OUString const & url) {
osl::Directory dir(url);
osl::FileBase::RC rc = dir.open();
@@ -320,6 +322,8 @@ bool cleanExtensionCache() {
return true;
}
+#endif
+
bool shouldLaunchQuickstart()
{
bool bQuickstart = Desktop::GetCommandLineArgs().IsQuickstart();
@@ -587,7 +591,9 @@ void Desktop::Init()
SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::Init" );
SetBootstrapStatus(BS_OK);
+#if HAVE_FEATURE_EXTENSIONS
m_bCleanedExtensionCache = cleanExtensionCache();
+#endif
// We need to have service factory before going further, but see fdo#37195.
// Doing this will mmap common.rdb, making it not overwritable on windows,