diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2014-10-12 14:49:43 -0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-23 14:38:27 +0000 |
| commit | 2e52086aa0428b61111d9954a6af34febd75addb (patch) | |
| tree | 77192db92890288506dc47dc9f758e980c318255 /desktop | |
| parent | e87a0ca94b173272f90242c2929b2a0d141acf40 (diff) | |
fdo#60689: replace SUPD variable
Change-Id: Iad63330f8762b595ba5ee94fc20bc2c64ac92f6b
Reviewed-on: https://gerrit.libreoffice.org/11937
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 3 | ||||
| -rw-r--r-- | desktop/win32/source/officeloader/officeloader.cxx | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index d636adf92a28..2c4e9d1df365 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_version.h> #include "app.hxx" #include "officeipcthread.hxx" @@ -504,7 +505,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if ( aPreloadData == "1" ) { sal_Char szBuffer[32]; - sprintf( szBuffer, "%d", SUPD ); + sprintf( szBuffer, "%d", LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 ); aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() ); } else diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index ff95bc45b3fb..7f820c23aa6f 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -46,6 +46,8 @@ #include "../../../source/inc/exithelper.h" #include "../extendloaderenvironment.hxx" +#include <config_version.h> + #define PIPE_PREFIX TEXT("\\\\.\\pipe\\OSL_PIPE_") #define PIPE_POSTFIX TEXT("_SingleOfficeIPC_") #define PIPE_TERMINATION_SEQUENCE "InternalIPC::ProcessingDone" @@ -250,7 +252,8 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) _tcsncpy( szPipeName, PIPE_PREFIX, SAL_N_ELEMENTS(szPipeName) ); _tcsncat( szPipeName, szUserIdent, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); _tcsncat( szPipeName, PIPE_POSTFIX, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); - _tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10), SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); + _tcsncat( szPipeName, _ultot( LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 + , szSUPD, 10), SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); LocalFree( szUserIdent ); |