slideshow1: merge with DEV300 m45

8 files changed, 62 insertions, 14 deletions

diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index 765d10ff0780..cd1e4d6da19c 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -111,7 +111,7 @@ void BreakpointWindow::SetBPsInModule()
     {
         pModule->SetBP( (USHORT)pBrk->nLine );
 #if OSL_DEBUG_LEVEL > 1
-        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" )
+        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
         pBrk = Next();
     }
@@ -152,7 +152,7 @@ void BreakpointWindow::InsertBreakpoint( USHORT nLine )
     if ( pModule->SetBP( nLine ) )
     {
 #if OSL_DEBUG_LEVEL > 1
-        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( nLine ), "Brechpunkt wurde nicht gesetzt" )
+        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
         if ( StarBASIC::IsRunning() )
         {
@@ -165,7 +165,7 @@ void BreakpointWindow::InsertBreakpoint( USHORT nLine )
         }
     }
 #if OSL_DEBUG_LEVEL > 1
-    DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( nLine ), "Brechpunkt wurde nicht gesetzt" )
+    DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
 }
 
@@ -282,7 +282,7 @@ void BreakpointWindow::Paint( const Rectangle& )
     while ( pBrk )
     {
 #if OSL_DEBUG_LEVEL > 1
-        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" )
+        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
         ULONG nLine = pBrk->nLine-1;
         ULONG nY = nLine*nLineHeight - nCurYOffset;
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 91b3c2e5ea52..8420977820f1 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -37,6 +37,7 @@ Version 2           changed order of entries(New Entries at the end)
 Version 3           Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
 
 *************************************************************************/
+#include <cstdio>
 #include <tools/time.hxx>
 #include <tools/stream.hxx>
 #ifndef _MSGBOX_HXX //autogen
@@ -61,6 +62,8 @@ Version 3           Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
 
 USHORT MsgEdit::nMaxLogLen = 0;
 BOOL MsgEdit::bLimitLogLen = FALSE;
+BOOL MsgEdit::bPrintLogToStdout = FALSE;
+BOOL MsgEdit::bPrintLogToStdoutSet = FALSE;
 
 #define WARNING_PREFIX String( SttResId( S_WARNING_PREFIX ) )
 #define VERSION_STRING CUniString("File Format Version: ")
@@ -85,6 +88,20 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
     aEditTree.SetSelectionMode( MULTIPLE_SELECTION );
     if ( aEditTree.GetModel()->GetSortMode() != SortNone )
         aEditTree.GetModel()->SetSortMode( SortNone );
+
+    if ( !bPrintLogToStdoutSet )
+    {
+        bPrintLogToStdoutSet = TRUE;
+        for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+        {
+            if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-printlog") == COMPARE_EQUAL
+    #ifndef UNX
+              || Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("/printlog") == COMPARE_EQUAL
+    #endif
+              )
+                bPrintLogToStdout = TRUE;
+        }
+    }
 }
 
 MsgEdit::~MsgEdit()
@@ -177,6 +194,7 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
             }
 
             String aLogMsg = Impl_MakeSaveText( LogMsg->aDebugData ).AppendAscii("\n");
+
             if( aStrm.IsOpen() )
             {
                 aLogMsg.ConvertLineEnd(LINEEND_CRLF);
@@ -186,8 +204,27 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
             }
             if ( !bFileWasChanged )
                 pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
+
+
+            // now write to stdout
+            if ( bPrintLogToStdout )
+            {
+                String aPrintMsg, aOriginalMsg;
+
+                aOriginalMsg = LogMsg->aDebugData.aMsg;
+                // converting to human readable string for adding errors to list in testobject
+                LogMsg->aDebugData.aMsg = pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg );
+
+                aPrintMsg = Impl_MakeSaveText( LogMsg->aDebugData ).AppendAscii("\n");
+
+                // restore Original Msg
+                LogMsg->aDebugData.aMsg = aOriginalMsg;
+
+                printf( ByteString( aPrintMsg, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
+            }
         }
     }
+    // converting to human readable string for adding errors to list in testobject
     LogMsg->aDebugData.aMsg = pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg );
 }
 
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 0bc86e9d3b9e..bca0eef72929 100644
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -94,6 +94,8 @@ class MsgEdit : public DataEdit
 
     static USHORT nMaxLogLen;
     static BOOL bLimitLogLen;
+    static BOOL bPrintLogToStdout;
+    static BOOL bPrintLogToStdoutSet;   // has it been initialized yet
 public:
     MsgEdit( AppError*, BasicFrame *pBF, const WinBits& );
     ~MsgEdit();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index cb2c14893e33..c0ee288eb882 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1731,6 +1731,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
         nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
         pItems, nModi );
 
+    // FIXME: Dialog can be destroyed while in Execute() check stack variable for dtor flag!
     if ( !pItem || aDeleted() )
         return FALSE;
 
@@ -1753,6 +1754,11 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
                 *pIdx = i;
         }
     }
+
+    // Reset destroyed flag otherwise we use the pointer in the dtor
+    // where the local stack object is already destroyed. This would
+    // overwrite objects on the stack!! See #i100110
+    pbDeleted = NULL;
     return TRUE;
 }
 
diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
index 4c8823c969e7..2ebebd6ed806 100644
--- a/sysui/desktop/solaris/copyright
+++ b/sysui/desktop/solaris/copyright
@@ -1,2 +1,2 @@
-Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 Use is subject to license terms.
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 25cf88ea32fb..9a2c606f6264 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -125,8 +125,8 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
     @-$(RM) $(BIN)$/$(@:f)
     @$(MKDIRHIER) $(@:d)
     pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) 
-    $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int
-    @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int | gzip > $@
-    @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)30-desktop-int
+    $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
+    @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@
+    @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
 
 .ENDIF
diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo
index 448096b1c26a..8fbf60ec812f 100644
--- a/sysui/desktop/solaris/pkginfo
+++ b/sysui/desktop/solaris/pkginfo
@@ -1,4 +1,4 @@
-PKG=%pkgprefix30-desktop-int
+PKG=%pkgprefix3-desktop-int
 NAME=%PRODUCTNAME Solaris desktop integration
 CATEGORY=application
 BASEDIR=/
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 1650da2e3623..7915c9e4e8c1 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -613,18 +613,21 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
 {
     bool bResult = false;
     ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) );
+    //if there is a meta stream at the chart object it was not written with an older OpenOffice version < 2.3
     if( !aGenerator.getLength() )
     {
-        //if there is no meta stream at the chart object it was not written with a newer OpenOffice version >= 2.3
-
-        //so it is sufficient to check now whether it was written by an OpenOffice version at all
-        //->check the meta information at the parent document
+        //if there is no meta stream at the chart object we need to check the version from the parent document
+        //and we need to check whether the document was created with OpenOffice.org at all
         uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
         if( xChild.is() )
         {
             ::rtl::OUString aParentGenerator( lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) ) );
             if( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 )
-                bResult= true;
+            {
+                sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( aParentGenerator );
+                if( nBuilId<=9161 ) //9161 is build id of OpenOffice.org 2.2.1
+                    bResult= true;
+            }
             else if(
                    ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )
                 || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )