summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-12-09 08:32:23 +0000
committerOliver Bolte <obo@openoffice.org>2009-12-09 08:32:23 +0000
commita4cc452f9b7cb84d418cf594adcc02c534fe9c39 (patch)
tree29c5a13fe36cb9abcb20bf369af10590d9098655
parentdf6c6fd40cd92185f4e421d5cf827166d3981f43 (diff)
CWS-TOOLING: integrate CWS fwk129
2009-12-07 14:19:39 +0100 mba r277741 : #i106367#: typo again 2009-12-02 10:32:30 +0100 jsk r277700 : fwk129: #i105719 - Fixed file size, wording and timing 2009-11-25 13:25:48 +0100 mav r277632 : #i107047# let the temporary stream be flushed in time 2009-11-25 13:17:36 +0100 mav r277631 : #i105719# switch to temporary file ealier to allow storing to the same location 2009-11-23 14:47:02 +0100 mav r277596 : #i105343# no outdated info in the buffer 2009-11-23 14:09:49 +0100 os r277595 : #i107064# copy styles in SwDoc::CreateCopy() 2009-11-23 10:38:29 +0100 mba r277592 : #i104338#: fix build without Java 2009-11-20 10:22:11 +0100 cd r277572 : #i107003# Make toolbar invisible before calling doLazyDelete. This prevents possible crashes in scenarios where a modal dialog is visible. 2009-11-19 18:30:33 +0100 mav r277569 : #i107035# let the temporary file be removed after the stream has been closed 2009-11-19 18:06:21 +0100 mba r277565 : #i106390#: crash caused by optimization 2009-11-19 17:58:34 +0100 mba r277564 : #i106367#: typo prevents correct asian language fallback 2009-11-19 17:57:16 +0100 mba r277563 : #i106390#: crash caused by optimization 2009-11-19 16:35:41 +0100 nn r277561 : #i106854# get source stream directly from document's storage instead of a temporary SfxMedium 2009-11-19 12:36:38 +0100 mav r277558 : #i106854# check the date of the original file
-rw-r--r--framework/source/uielement/toolbarmanager.cxx4
-rw-r--r--sfx2/source/control/makefile.mk6
-rw-r--r--sfx2/source/doc/docfile.cxx7
-rw-r--r--xmlhelp/source/com/sun/star/help/makefile.mk5
4 files changed, 18 insertions, 4 deletions
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 );
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index 481952409d..9d936549b5 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 = \
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& )
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index 1e1a2c518f..f5cbd39d03 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
@@ -109,3 +110,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