diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:00:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:00:00 +0000 |
| commit | 201a75936c41cde55a88b205b4cc434ec9d243b0 (patch) | |
| tree | 6c1de11829c148411771c6b6383861a0b5792244 /xmloff | |
| parent | 32b3fbe1e05881f87b9d850c4f138bb5b35efe83 (diff) | |
INTEGRATION: CWS merge20to201v3 (1.8.30); FILE MERGED
2005/10/14 15:04:56 hr 1.8.30.1: #i55999#: merge OOO680 CWS ooo20m2 to SRC680
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/propimp0.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 4d2c4f9564..6c6c777609 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propimp0.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-09 13:47:25 $ + * last change: $Author: rt $ $Date: 2005-10-17 14:00:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -165,11 +165,11 @@ sal_Bool XMLOpacityPropertyHdl::importXML( // #i42959# if( mpImport ) { - sal_Int32 nMajor, nMinor; - if( mpImport->getBuildIds( nMajor, nMinor ) ) + sal_Int32 nUPD, nBuild; + if( mpImport->getBuildIds( nUPD, nBuild ) ) { - // correct import of documents written with StarOffice 8 Final - if( (nMajor == 680) && (nMinor < 125) ) + // correct import of documents written prior to StarOffice 8/OOO 2.0 final + if( (nUPD == 680) && (nBuild < 8951) ) nValue = 100 - nValue; } } |