From ee91b511167bc74b368466854dabc87d917c8527 Mon Sep 17 00:00:00 2001 From: Babak Mahbod Date: Thu, 21 Sep 2000 19:17:23 +0000 Subject: [PATCH] Hexdecimal constant 0x601 was changed to decimal constant. --- configmgr/source/xml/typeconverter.cxx | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx index db302e3c6a29..1448bbaf6336 100644 --- a/configmgr/source/xml/typeconverter.cxx +++ b/configmgr/source/xml/typeconverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: typeconverter.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:13:42 $ + * last change: $Author: babak.mahbod $ $Date: 2000-09-21 20:17:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -335,15 +335,19 @@ namespace configmgr OSL_ASSERT(pSequenceTD); OSL_ASSERT(pSequenceTD->pType); - if (pSequenceTD && pSequenceTD->pType) - { - #if (SUPD >= 0x601) - return staruno::Type(pSequenceTD->pType); - #else - OSL_ASSERT(pSequenceTD->pType); - return staruno::Type(pSequenceTD->pType->pWeakRef); - #endif - } + if ( pSequenceTD && pSequenceTD->pType ) + { + // SUPD expects a decimal constant, hence, + // build version comparison is made using + // a decimal number + + #if ( SUPD >= 601 ) + return staruno::Type(pSequenceTD->pType); + #else + OSL_ASSERT(pSequenceTD->pType); + return staruno::Type(pSequenceTD->pType->pWeakRef); + #endif + } //if return staruno::Type(); }