diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:03:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:03:47 +0000 |
| commit | 66ef6cf5df18559034fc04b63ccbcaf84ee4cd96 (patch) | |
| tree | 9a6941f29a0ccfce6c9dfd478f6c256aa5e56369 /sfx2 | |
| parent | 2da8ee94453909f3d21beacae37e90be0ab6f81c (diff) | |
INTEGRATION: CWS sw30bf02 (1.205.18); FILE MERGED
2008/03/19 14:28:13 mba 1.205.18.1: #152862#: ODF version for 3.0 is 1.2
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 66e0d9b18ed0..fbfe512d0200 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objstor.cxx,v $ * - * $Revision: 1.206 $ + * $Revision: 1.207 $ * - * last change: $Author: obo $ $Date: 2008-03-26 10:44:56 $ + * last change: $Author: kz $ $Date: 2008-04-03 17:03:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -954,8 +954,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { uno::Reference<beans::XPropertySet> xUserDefinedProps( xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); - //FIXME: this should be removed before 3.0! - // the new property "ODFVersion" is a temporary solution for OOo2.4 uno::Any aAny; try { @@ -971,9 +969,9 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( (aAny >>= sTemp) && sTemp.getLength() ) { double nVersion = sTemp.toDouble(); - if ( nVersion > 1.10001 ) + if ( nVersion > 1.20001 ) { - // ODF version greater than 1.1 - added some decimal places to be safe against floating point conversion errors (hack) + // ODF version greater than 1.2 - added some decimal places to be safe against floating point conversion errors (hack) sfx2::NewerVersionWarningDialog aDlg( NULL ); aDlg.Execute(); } |