diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-12-09 08:32:23 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-12-09 08:32:23 +0000 |
commit | a4cc452f9b7cb84d418cf594adcc02c534fe9c39 (patch) | |
tree | 29c5a13fe36cb9abcb20bf369af10590d9098655 /sfx2 | |
parent | df6c6fd40cd92185f4e421d5cf827166d3981f43 (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
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/control/makefile.mk | 6 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 7 |
2 files changed, 10 insertions, 3 deletions
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& ) |