Never mind that one: This one is the one: THX! diff --git a/main/comphelper/inc/comphelper/extract.hxx b/main/comphelper/inc/comphelper/extract.hxx index dc67c5dc58..fc75fa9cb9 100644 --- a/main/comphelper/inc/comphelper/extract.hxx +++ b/main/comphelper/inc/comphelper/extract.hxx @@ -131,9 +131,10 @@ inline sal_Bool SAL_CALL extractInterface( inline sal_Bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny ) throw( ::com::sun::star::lang::IllegalArgumentException ) { - if (rAny.getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN) + sal_Bool sValue; + if ( rAny >>= sValue) { - return *(sal_Bool *)rAny.getValue(); + return sValue; } else { diff --git a/main/cppu/inc/com/sun/star/uno/Any.hxx b/main/cppu/inc/com/sun/star/uno/Any.hxx index e1d125be82..2a38598efa 100644 --- a/main/cppu/inc/com/sun/star/uno/Any.hxx +++ b/main/cppu/inc/com/sun/star/uno/Any.hxx @@ -251,9 +251,9 @@ inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) { value = *reinterpret_cast< sal_Bool const * >( &rAny.pReserved ) != sal_False; - return true; + return sal_True; } - return false; + return sal_False; } //______________________________________________________________________________ diff --git a/main/starmath/source/mathmlexport.cxx b/main/starmath/source/mathmlexport.cxx index 3f36ff152d..00b301d0eb 100644 --- a/main/starmath/source/mathmlexport.cxx +++ b/main/starmath/source/mathmlexport.cxx @@ -169,9 +169,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) SvtSaveOptions aSaveOpt; OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); sal_Bool bUsePrettyPrinting( bFlat || aSaveOpt.IsPrettyPrinting() ); - Any aAny; - aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() ); - xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny ); + xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny(bUsePrettyPrinting)); // Set base URI OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); diff --git a/main/sw/source/filter/xml/wrtxml.cxx b/main/sw/source/filter/xml/wrtxml.cxx index e288bfc006..7677f86ff1 100644 --- a/main/sw/source/filter/xml/wrtxml.cxx +++ b/main/sw/source/filter/xml/wrtxml.cxx @@ -207,8 +207,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, SvtSaveOptions aSaveOpt; OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); - aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() ); - xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny ); + xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny(bUsePrettyPrinting)); // save show redline mode ... OUString sShowChanges(RTL_CONSTASCII_USTRINGPARAM("ShowChanges"));
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org