[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - desktop/source

[Petr Mladek]

 desktop/source/app/app.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8b15d9db2c9ebca2251eb28efb304be8032e371
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 26 13:20:31 2012 +0200

    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 at redhat.com>
    Signed-off-by: Eike Rathke <erack at redhat.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8ebccdd..f8036cd 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