CWS-TOOLING: integrate CWS sb121

8 files changed, 50 insertions, 68 deletions

diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
index 1e00634bd6a3..87ff690dd653 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
@@ -77,8 +77,5 @@ SHL1STDLIBS= \
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
-#remote bridgeing breaks
-#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
     $(CC) -c -o $(SLO)$/$(@:b).o $<
     touch $@
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
index 50cf80654a94..d5eb2dd6e1d9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
@@ -77,8 +77,5 @@ SHL1STDLIBS= \
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
-#remote bridgeing breaks
-#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
     $(CC) -c -o $(SLO)$/$(@:b).o $<
     touch $@
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
index 92d575a14dfb..7bca40bbaf97 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
@@ -72,8 +72,5 @@ SHL1STDLIBS= \
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
-#remote bridgeing breaks
-#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
     $(CC) -c -o $(SLO)$/$(@:b).o $<
     touch $@
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
index a23288f9f677..2c7a8da48527 100644
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
@@ -87,8 +87,5 @@ DEF1NAME=	$(SHL1TARGET)
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
-#remote bridgeing breaks
-#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
     $(CC) -c -o $(SLO)$/$(@:b).obj $<
     touch $@
diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx
index f0e338e4728c..ce58b1f3f779 100644
--- a/bridges/source/remote/urp/urp_job.hxx
+++ b/bridges/source/remote/urp/urp_job.hxx
@@ -76,9 +76,6 @@ public:
 
     ~Job();
 
-       inline void setUnmarshal( Unmarshal *p )
-           { m_pUnmarshal = p; }
-
 public:
     remote_Context *m_pContext;
       Unmarshal *m_pUnmarshal;
@@ -87,7 +84,7 @@ public:
     ::bridges_remote::RemoteThreadCounter m_counter;
 };
 
-class ClientJob : public Job
+class ClientJob : private Job
 {
 public:
     // pContext is null for bridge-internal UrpProtocolProperties requests
@@ -123,6 +120,9 @@ public:
         { return m_bBridgePropertyCall; }
     inline sal_Bool isOneway()
         { return m_bOneway; }
+
+        inline void setUnmarshal( Unmarshal *p )
+                { m_pUnmarshal = p; }
 public:
     typelib_InterfaceMethodTypeDescription    *m_pMethodType;
     typelib_InterfaceAttributeTypeDescription *m_pAttributeType;
@@ -172,7 +172,7 @@ struct ServerJobEntry
     sal_Bool              m_bIgnoreCache;
 };
 
-class ServerMultiJob : public Job
+class ServerMultiJob : private Job
 {
 public:
     ServerMultiJob( uno_Environment *pEnvRemote,
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index 9e546e7d4018..078478107224 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -55,7 +55,7 @@ PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
 .ENDIF
 
 FINDLIBFILES_TMP:=$(subst,/,$/ \
-    $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc |$(GREP) -v .py\~ |$(GREP) -v .orig ))
+    $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc |$(GREP) -v .py\~ |$(GREP) -v .orig | $(GREP) -v _failed))
 FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
 
 FILES=\
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index c5141fa02260..5563375d9567 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -74,10 +74,14 @@
 #include "file_path_helper.h"
 
 #define ACT_IGNORE  1
-#define ACT_ABORT   2
-#define ACT_EXIT    3
-#define ACT_SYSTEM  4
-#define ACT_HIDE    5
+#define ACT_EXIT    2
+#define ACT_SYSTEM  3
+#define ACT_HIDE    4
+#ifdef SAL_ENABLE_CRASH_REPORT
+#    define ACT_ABORT   5
+#else
+#    define ACT_ABORT   ACT_SYSTEM
+#endif
 
 #define MAX_PATH_LEN    2048
 
@@ -556,7 +560,7 @@ static int ReportCrash( int Signal )
             if (Signals[i].Signal == Signal && Signals[i].Action == ACT_ABORT )
             {
                 int  ret;
-                char szShellCmd[512];
+                char szShellCmd[512] = { '\0' };
                 char *pXMLTempName = NULL;
                 char *pStackTempName = NULL;
                 char *pChecksumTempName = NULL;
@@ -728,68 +732,57 @@ static int ReportCrash( int Signal )
                 if ( checksumout )
                     fclose( checksumout );
 
-#if defined( LINUX )
-                if ( pXMLTempName && pChecksumTempName && pStackTempName )
-                    snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
-                        "crash_report -p %d -s %d -xml %s -chksum %s -stack %s%s",
-                        getpid(),
-                        Signal,
-                        pXMLTempName,
-                        pChecksumTempName,
-                        pStackTempName,
-                        bAutoCrashReport ? " -noui -send" : " -noui" );
-#elif defined( MACOSX )
                 if ( pXMLTempName && pChecksumTempName && pStackTempName )
+#endif /* INCLUDE_BACKTRACE */
                 {
-                    rtl_uString *crashrep_url = NULL;
-                    rtl_uString *crashrep_path = NULL;
-                    rtl_String  *crashrep_path_system = NULL;
-
-                    rtl_string2UString( &crashrep_url, RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/crash_report.bin"), OSTRING_TO_OUSTRING_CVTFLAGS );
-                    rtl_bootstrap_expandMacros( &crashrep_url );
-                    osl_getSystemPathFromFileURL( crashrep_url, &crashrep_path );
+                    rtl_uString * crashrep_url = NULL;
+                    rtl_uString * crashrep_path = NULL;
+                    rtl_String  * crashrep_path_system = NULL;
+                    rtl_string2UString(
+                        &crashrep_url,
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "$BRAND_BASE_DIR/program/crashrep"),
+                        OSTRING_TO_OUSTRING_CVTFLAGS);
+                    rtl_bootstrap_expandMacros(&crashrep_url);
+                    osl_getSystemPathFromFileURL(crashrep_url, &crashrep_path);
                     rtl_uString2String(
                         &crashrep_path_system,
-                        rtl_uString_getStr( crashrep_path ),
-                        rtl_uString_getLength( crashrep_path ),
+                        rtl_uString_getStr(crashrep_path),
+                        rtl_uString_getLength(crashrep_path),
                         osl_getThreadTextEncoding(),
-                        RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR );
-
-                    rtl_uString_release( crashrep_url );
-                    rtl_uString_release( crashrep_path );
-
+                        (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+                         | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR));
+                    rtl_uString_release(crashrep_url);
+                    rtl_uString_release(crashrep_path);
+#if defined INCLUDE_BACKTRACE && (defined LINUX || defined MACOSX)
                     snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
-                        "%s -p %d -s %d -xml %s -chksum %s -stack %s%s",
-                        rtl_string_getStr( crashrep_path_system ),
+                        "%s -p %d -s %d -xml %s -chksum %s -stack %s -noui%s",
+                        rtl_string_getStr(crashrep_path_system),
                         getpid(),
                         Signal,
                         pXMLTempName,
                         pChecksumTempName,
                         pStackTempName,
-                        bAutoCrashReport ? " -noui -send" : " -noui" );
-
-                    rtl_string_release( crashrep_path_system );
-
-                    printf( "%s\n", szShellCmd );
-                }
-#elif defined ( SOLARIS )
-                if ( pXMLTempName && pChecksumTempName )
+                        bAutoCrashReport ? " -send" : "" );
+#elif defined INCLUDE_BACKTRACE && defined SOLARIS
                     snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
-                        "crash_report -p %d -s %d -xml %s -chksum %s%s",
+                        "%s -p %d -s %d -xml %s -chksum %s -noui%s",
+                        rtl_string_getStr(crashrep_path_system),
                         getpid(),
                         Signal,
                         pXMLTempName,
                         pChecksumTempName,
-                        bAutoCrashReport ? " -noui -send" : " -noui" );
+                        bAutoCrashReport ? " -send" : "" );
+#else
+                    snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
+                        "%s -p %d -s %d -noui%s",
+                        rtl_string_getStr(crashrep_path_system),
+                        getpid(), Signal, bAutoCrashReport ? " -send" : "" );
 #endif
+                    rtl_string_release(crashrep_path_system);
+                }
 
-#else /* defined INCLUDE BACKTRACE */
-                snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
-                "crash_report -p %d -s %d%s", getpid(), Signal, bAutoCrashReport ? " -noui -send" : " -noui" );
-#endif /* defined INCLUDE BACKTRACE */
-
-
-                ret = system( szShellCmd );
+                ret = szShellCmd[0] == '\0' ? -1 : system( szShellCmd );
 
                 if ( pXMLTempName )
                     unlink( pXMLTempName );
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index ec325ce11db1..95d9990257f5 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -877,7 +877,8 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
 Uik InterfaceIdlClassImpl::getUik()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return *(Uik *)&getTypeDescr()->aUik;
+    return Uik(0, 0, 0, 0, 0);
+        // Uiks are deprecated and this function must not be called
 }
 //__________________________________________________________________________________________________
 Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()