CWS-TOOLING: integrate CWS macrestart2_DEV300

desktop/prj/d.lst

@@ -12,10 +12,11 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\soffice.bin %_DEST%\bin%_EXT%\soffice.bin
 ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
 ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
-..\%__SRC%\bin\officeloader %_DEST%\bin%_EXT%\soffice
+..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice
 ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
 ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
 ..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
+..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice
 ..\%__SRC%\bin\sofficea*.dll %_DEST%\bin%_EXT%\sofficea*.dll
 ..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib%_EXT%\isofficeapp.lib
 ..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib%_EXT%\libsofficeapp.dylib

desktop/source/app/app.cxx

@@ -1059,6 +1059,29 @@ sal_Bool Desktop::SaveTasks()
         sal_False);
 }
 
+#ifdef MACOSX
+static void DoRestart()
+{
+    oslProcess      process;
+    oslProcessError error;
+    OUString    sExecutableFile;
+
+    osl_getExecutableFile( &sExecutableFile.pData );
+
+    error = osl_executeProcess(
+        sExecutableFile.pData,
+        NULL,
+        0,
+        0,
+        NULL,
+        NULL,
+        NULL,
+        0,
+        &process
+        );
+}
+#endif
+
 USHORT Desktop::Exception(USHORT nError)
 {
     // protect against recursive calls
@@ -1146,6 +1169,10 @@ USHORT Desktop::Exception(USHORT nError)
                 if (m_pLockfile != NULL) {
                     m_pLockfile->clean();
                 }
+
+#ifdef MACOSX
+                DoRestart();
+#endif
                 _exit( ExitHelper::E_CRASH_WITH_RESTART );
             }
             else

desktop/source/app/makefile.mk

@@ -40,6 +40,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(GUIBASE)"=="aqua"
+CFLAGS+=-x objective-c++
+.ENDIF
+
 .IF "$(ENABLE_GNOMEVFS)"=="TRUE"
 CFLAGS+=-DGNOME_VFS_ENABLED
 .ENDIF

fpicker/source/aqua/SalAquaFilePicker.cxx

@@ -776,6 +776,8 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
     ensureFilterHelper();
 
     OUStringList aStringList = m_pFilterHelper->getCurrentFilterSuffixList();
+    if( aStringList.empty()) // #i9328#
+        return;
 
     rtl::OUString suffix = (*(aStringList.begin())).copy(1);
     NSString *requiredFileType = [NSString stringWithOUString:suffix];