[ooo-build-commit] .: patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Wed Oct 6 05:07:00 PDT 2010


 patches/dev300/writer-doc-comparison.diff |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit db3b415527cd0704bfae13fdec56e2a18a0fcfcc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Oct 6 14:06:28 2010 +0200

    Fixed a build breakage; QueryValue and PutValue now return bool.

diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index 319e443..1ccca97 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -133,8 +133,8 @@ index 0000000..fa95499
 +    virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
 +    virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
 +
-+    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-+    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
++    virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
++    virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 +};
 +
 +#endif // _SVX_RSIDITEM_HXX
@@ -182,22 +182,22 @@ index 6b21048..c305a2c 100644
 +
 +// class SvxRsidItem -----------------------------------------------------
 +
-+sal_Bool SvxRsidItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
++bool SvxRsidItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 +{
 +    rVal <<= ( (UINT32)GetValue() );
-+    return sal_True;
++    return true;
 +}
 +
 +// -----------------------------------------------------------------------
 +
-+sal_Bool SvxRsidItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
++bool SvxRsidItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 +{
 +    UINT32 nRsid = 0;
 +    if( !( rVal >>= nRsid ) )
-+        return sal_False;
++        return false;
 +
 +    SetValue( nRsid );
-+    return sal_True;
++    return true;
 +}
 +
 +// -----------------------------------------------------------------------


More information about the ooo-build-commit mailing list