summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-26 13:20:31 +0200
committerPetr Mladek <pmladek@suse.cz>2012-07-27 09:54:04 +0200
commitc8b15d9db2c9ebca2251eb28efb304be8032e371 (patch)
tree5b3f125d8cfaf39eec74f41f44b68be94d135a37
parent9b40cdf280f0d67fcba6dd665106e7ef9910d34e (diff)
fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes
...see <https://bugs.freedesktop.org/show_bug.cgi?id=51252#c35>, comment 35 to "LO cannot start (reports runtime error with Visual C++ Runtime Library)" for all the details. This commit is intended as a band aid, to be backported to libreoffice-3-6-0. It can be cleaned up later on. Change-Id: I2984cdd7efc279e3ef482a762b614e1d625a697f (cherry picked from commit 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4) Signed-off-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--desktop/source/app/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8ebccdd228bd..f8036cd3ebd8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -641,7 +641,7 @@ void Desktop::Init()
// copy bundled folder to the user directory
osl::FileBase::RC rc = osl::Directory::createPath(aUserPath);
(void) rc;
- copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 );
+ if (false) copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 );
}
}
#endif