diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
| commit | 55a6583623008179f51a01416e5a3eef885835c2 (patch) | |
| tree | 0c5a519ad939d7a2fe5849ce91f89e4687225dfc /sfx2 | |
| parent | e7f2e7c26b6f53e86e48d4cfa3e45d59252c39f0 (diff) | |
| parent | 121fdea1bf20434091bf1f862be5611dfddd83ae (diff) | |
CWS-TOOLING: integrate CWS fwk129_DEV300
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 481952409d6c..9d936549b5b3 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 00bad511b10c..5db5d2afcb17 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& ) |