fdo#60689: replace SUPD variable

Change-Id: Iad63330f8762b595ba5ee94fc20bc2c64ac92f6b
Reviewed-on: https://gerrit.libreoffice.org/11937Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

basic/source/runtime/methods1.cxx

@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <sal/config.h>
+#include <config_version.h>
 
 #include <cstddef>
 
@@ -735,7 +736,7 @@ RTLFUNC(GetSolarVersion)
     (void)pBasic;
     (void)bWrite;
 
-    rPar.Get(0)->PutLong( (sal_Int32)SUPD );
+    rPar.Get(0)->PutLong( LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1);
 }
 
 RTLFUNC(TwipsPerPixelX)

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

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 );
 

solenv/gbuild/gbuild.mk

@@ -206,7 +206,6 @@ gb_CPUDEFS += -D$(CPUNAME)
 gb_GLOBALDEFS := \
 	-D_REENTRANT \
 	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-	-DSUPD=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0 \
 	$(gb_OSDEFS) \
 	$(gb_COMPILERDEFS) \
 	$(gb_CPUDEFS) \

solenv/inc/doxygen.cfg

@@ -1615,7 +1615,6 @@ PREDEFINED             = LINUX \
                          NEW_SOLAR \
                          _USE_NAMESPACE=1 \
                          UNIX \
-                         SUPD=300 \
                          DEBUG \
                          DBG_UTIL \
                          OSL_DEBUG_LEVEL=2 \