summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-26 13:20:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-26 13:25:41 +0200
commit5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 (patch)
treebf5edea6b0e30b6b48d3dc794195e94cd7a25831
parenta572af02752164a62478052113707c5f9bc705da (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
-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 65dd453e11c6..8582af50ba95 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -649,7 +649,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