diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | 0be75e2f6580c15837bc916754cabffa9cd8021e (patch) | |
| tree | b5cae7fa3102a01004e0265269d386e0f66e858a /desktop | |
| parent | eced5e6fb21ab9b4d8233cee29ae7d2f223060d3 (diff) | |
| parent | f42d427a69383b84b83346a0fdeec324bf74f777 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'desktop')
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/Resource.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/makefile.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/rcfooter.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/rcheader.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/rctmpl.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/setup.cpp | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | desktop/win32/source/setup/setup.ulf | 0 |
7 files changed, 4 insertions, 4 deletions
diff --git a/desktop/win32/source/setup/Resource.h b/desktop/win32/source/setup/Resource.h index 2f075004d6..2f075004d6 100755..100644 --- a/desktop/win32/source/setup/Resource.h +++ b/desktop/win32/source/setup/Resource.h diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk index f0c6e0e955..f0c6e0e955 100755..100644 --- a/desktop/win32/source/setup/makefile.mk +++ b/desktop/win32/source/setup/makefile.mk diff --git a/desktop/win32/source/setup/rcfooter.txt b/desktop/win32/source/setup/rcfooter.txt index 3237729437..3237729437 100755..100644 --- a/desktop/win32/source/setup/rcfooter.txt +++ b/desktop/win32/source/setup/rcfooter.txt diff --git a/desktop/win32/source/setup/rcheader.txt b/desktop/win32/source/setup/rcheader.txt index 9a59ad7f64..9a59ad7f64 100755..100644 --- a/desktop/win32/source/setup/rcheader.txt +++ b/desktop/win32/source/setup/rcheader.txt diff --git a/desktop/win32/source/setup/rctmpl.txt b/desktop/win32/source/setup/rctmpl.txt index 59f454f70c..59f454f70c 100755..100644 --- a/desktop/win32/source/setup/rctmpl.txt +++ b/desktop/win32/source/setup/rctmpl.txt diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp index 69d09a47f6..6eae5de7c5 100755..100644 --- a/desktop/win32/source/setup/setup.cpp +++ b/desktop/win32/source/setup/setup.cpp @@ -87,8 +87,8 @@ #define RUNTIME_X64_NAME TEXT( "redist\\vcredist_x64.exe" ) #define RUNTIME_X86_NAME TEXT( "redist\\vcredist_x86.exe" ) -#define PRODUCTCODE_X86 TEXT( "{E503B4BF-F7BB-3D5F-8BC8-F694B1CFF942}" ) -#define PRODUCTCODE_X64 TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" ) +#define PRODUCTCODE_X86 TEXT( "{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}" ) +#define PRODUCTCODE_X64 TEXT( "{4B6C7001-C7D6-3710-913E-5BC23FCE91E6}" ) #define MSIAPI_DllGetVersion "DllGetVersion" #define ADVAPI32API_CheckTokenMembership "CheckTokenMembership" @@ -835,10 +835,10 @@ boolean SetupAppX::LaunchInstaller( LPCTSTR pParam ) PROCESS_INFORMATION aPI; Log( TEXT( " Will install using <%s>\r\n" ), sMsiPath ); - Log( TEXT( " Prameters are: %s\r\n" ), pParam ); + Log( TEXT( " Parameters are: %s\r\n" ), pParam ); OutputDebugStringFormat( TEXT( " Will install using <%s>\r\n" ), sMsiPath ); - OutputDebugStringFormat( TEXT( " Prameters are: %s\r\n" ), pParam ); + OutputDebugStringFormat( TEXT( " Parameters are: %s\r\n" ), pParam ); ZeroMemory( (void*)&aPI, sizeof( PROCESS_INFORMATION ) ); ZeroMemory( (void*)&aSUI, sizeof( STARTUPINFO ) ); diff --git a/desktop/win32/source/setup/setup.ulf b/desktop/win32/source/setup/setup.ulf index 85d43f43aa..85d43f43aa 100755..100644 --- a/desktop/win32/source/setup/setup.ulf +++ b/desktop/win32/source/setup/setup.ulf |