[Libreoffice-commits] .: 6 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 85b804fe80a773a7611993e0e88470091b636f3c
Merge: 98bfefe... a5d54a8...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Feb 8 00:22:18 2011 +0100

    Merge remote branch 'origin/libreoffice-3-3'
    
    Conflicts:
    	bridges/source/cpp_uno/gcc3_linux_intel/except.cxx

commit a5d54a8a2d254b49c5fffaa6b3d0c094b756e691
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 20:26:07 2011 +0000

    move cxxabi.h after stl headers to workaround gcc 4.6.0 and damn stlport
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 8074489..d6f3ec1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -32,9 +32,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
-#include <cxxabi.h>
 #include <hash_map>
 
+#include <cxxabi.h>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
@@ -47,7 +48,6 @@
 
 #include "share.hxx"
 
-
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
commit f06193d3a0c3c5f827df091f0253928adfbf43d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 16:24:07 2011 +0200

    Manipulate also the C runtime's environment
    
    Fixes fdo#33355.
    
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 796f4c4..1749b8e 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -28,6 +28,7 @@
 
 #define UNICODE
 #include "system.h"
+#include <string.h>
 #ifdef _MSC_VER
 #pragma warning(push,1) /* disable warnings within system headers */
 #endif
@@ -419,7 +420,15 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *ustrVar, rtl_uString *u
     LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
     LPCWSTR lpValue = reinterpret_cast<LPCWSTR>(ustrValue->buffer);
     if (SetEnvironmentVariableW(lpName, lpValue))
+    {
+        wchar_t *buffer = new wchar_t[wcslen(lpName) + 1 + wcslen(lpValue) + 1];
+        wcscpy(buffer, lpName);
+        wcscat(buffer, L"=");
+        wcscat(buffer, lpValue);
+        _wputenv(buffer);
+        delete[] buffer;
         return osl_Process_E_None;
+    }
     return osl_Process_E_Unknown;
 }
 
@@ -429,7 +438,14 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *ustrVar)
     //process's environment.
     LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
     if (SetEnvironmentVariableW(lpName, NULL))
+    {
+        wchar_t *buffer = new wchar_t[wcslen(lpName) + 1 + 1];
+        wcscpy(buffer, lpName);
+        wcscat(buffer, L"=");
+        _wputenv(buffer);
+        delete[] buffer;
         return osl_Process_E_None;
+    }
     return osl_Process_E_Unknown;
 }
 
commit f352463d20ea162b67a22b3a66e9ab712af6bfe2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jan 11 23:05:58 2011 +0100

    Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
    
    This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
    Only safe changes, reviewed by anoter person are allowed.
    
    If you want to build something cool, unstable, and risky, use master.
commit 71c1bae118e03b0b46c2ee7f7881427f8c5bc6bb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jan 11 22:39:09 2011 +0100

    Branch libreoffice-3-3-0
    
    This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.3.x release,
    please use the 'libreoffice-3-3' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 18f7397f113e6049360fb0362fc64e034265ea17
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 10 19:47:12 2011 +0100

    Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)