From 82088d2cbeb70a82ab33a9e41f30773e087f3ed6 Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Thu, 19 Nov 2009 11:36:38 +0000
Subject: #i106854# check the date of the original file

---
 sfx2/source/doc/docfile.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 445508e2e1..5b1e220a02 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -590,11 +590,14 @@ sal_Bool SfxMedium::DocNeedsFileDateCheck()
 //------------------------------------------------------------------
 util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
 {
-    if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && GetContent().is() )
+    if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && aLogicName.Len() )
     {
         try
         {
-            pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= pImp->m_aDateTime;
+            uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
+            ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
+
+            aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= pImp->m_aDateTime;
             pImp->m_bGotDateTime = sal_True;
         }
         catch ( ::com::sun::star::uno::Exception& )
-- 
cgit v1.2.3


From e33f0177051875405e39e542b380cd9dfa905e97 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Thu, 19 Nov 2009 16:57:16 +0000
Subject: #i106390#: crash caused by optimization

---
 sfx2/source/control/makefile.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index 481952409d..e93502fae2 100644
--- a/sfx2/source/control/makefile.mk
+++ b/sfx2/source/control/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,6 +47,10 @@ CFLAGS+=-Od
 .ENDIF
 .ENDIF
 
++.IF "$(COM)"=="GCC"
++CFLAGS+=-O0
++.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
-- 
cgit v1.2.3


From 43c5df0e865200cca3d04b6dea8ff1b23c73ca16 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Thu, 19 Nov 2009 17:06:21 +0000
Subject: #i106390#: crash caused by optimization

---
 sfx2/source/control/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index e93502fae2..9d936549b5 100644
--- a/sfx2/source/control/makefile.mk
+++ b/sfx2/source/control/makefile.mk
@@ -47,9 +47,9 @@ CFLAGS+=-Od
 .ENDIF
 .ENDIF
 
-+.IF "$(COM)"=="GCC"
-+CFLAGS+=-O0
-+.ENDIF
+.IF "$(COM)"=="GCC"
+CFLAGS+=-O0
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
-- 
cgit v1.2.3


From cc30aec49de53ef46ce0ec362e9b145558bd63c3 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Fri, 20 Nov 2009 09:22:11 +0000
Subject: #i107003# Make toolbar invisible before calling doLazyDelete. This
 prevents possible crashes in scenarios where a modal dialog is visible.

---
 framework/source/uielement/toolbarmanager.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 6d5add117e..7451f6888c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -341,9 +341,11 @@ void ToolBarManager::Destroy()
             delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId ));
     }
 
+    // Hide toolbar as lazy delete can destroy the toolbar much later.
+    m_pToolBar->Hide();
     /* #i99167# removed change for i93173 since there is some weird crash */
         // #i93173# delete toolbar lazily as we can still be in one of its handlers
-        m_pToolBar->doLazyDelete();
+    m_pToolBar->doLazyDelete();
     
     Link aEmpty;
     m_pToolBar->SetSelectHdl( aEmpty );
-- 
cgit v1.2.3


From c840d57f8e2986cebd7c99605ebeb93187d86012 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Mon, 23 Nov 2009 09:38:29 +0000
Subject: #i104338#: fix build without Java

---
 xmlhelp/source/com/sun/star/help/makefile.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index db6e619b31..ad589a1a98 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -36,6 +36,7 @@ LIBBASENAME = helplinker
 PACKAGE = com$/sun$/star$/help
 TARGETTYPE=CUI
 
+.IF "$(SOLAR_JAVA)"!=""
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
@@ -106,3 +107,7 @@ fix_system_lucene:
     @echo "Fix Java Class-Path entry for Lucene libraries from system."
     @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
     -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
+.ELSE
+all:
+        @echo java disabled
+.ENDIF
-- 
cgit v1.2.3