Attachment 39112 Details for Bug 30556 – patch to convert QueryValue() and PutValue() virtual funcitons to bool

[patch] patch to convert QueryValue() and PutValue() virtual funcitons to bool

QueryValue.PutValue.migration.to.bool.patch (text/plain), 936.92 KB, created by Norbert Thiebaud on 2010-10-02 00:36:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Norbert Thiebaud

Created: 2010-10-02 00:36:08 UTC

Size: 936.92 KB

patch

obsolete

>diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
>index 3e7f757..aaac8dd 100644
>--- a/sc/inc/attrib.hxx
>+++ b/sc/inc/attrib.hxx
>@@ -137,8 +137,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
> 
>-    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 );
>+    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 );
> 
>             BOOL            GetProtection() const { return bProtection; }
>             BOOL            SetProtection( BOOL bProtect);
>@@ -278,8 +278,8 @@ public:
> 
>     virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
> 
>-    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 );
>+    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 );
> 
>     const EditTextObject* GetLeftArea() const		{ return pLeftArea; }
>     const EditTextObject* GetCenterArea() const		{ return pCenterArea; }
>@@ -384,8 +384,8 @@ public:
>                                     XubString& rText,
>                                     const IntlWrapper* = 0 ) const;
> 
>-    virtual BOOL                QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ) const;
>-    virtual BOOL                PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 );
>+    virtual bool                QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ) const;
>+    virtual bool                PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 );
> 
> private:
>     sal_uInt16                  mnWidth;
>diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
>index c9f0275..1f4b7f9 100644
>--- a/sc/source/core/data/attrib.cxx
>+++ b/sc/source/core/data/attrib.cxx
>@@ -241,7 +241,7 @@ ScProtectionAttr::~ScProtectionAttr()
> 
> //------------------------------------------------------------------------
> 
>-BOOL ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId  )
>@@ -266,15 +266,15 @@ BOOL ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (sal_Bool ) bHidePrint; break;
>         default:
>             DBG_ERROR("Wrong MemberID!");
>-            return FALSE;
>+            return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     sal_Bool bVal = sal_Bool();
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -288,7 +288,7 @@ BOOL ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 bHideFormula = aProtection.IsFormulaHidden;
>                 bHideCell    = aProtection.IsHidden;
>                 bHidePrint   = aProtection.IsPrintHidden;
>-                bRet = TRUE;
>+                bRet = true;
>             }
>             else
>             {
>@@ -662,18 +662,18 @@ ScPageHFItem::~ScPageHFItem()
> 
> //------------------------------------------------------------------------
> 
>-BOOL ScPageHFItem::QueryValue( uno::Any& rVal, BYTE /* nMemberId */ ) const
>+bool ScPageHFItem::QueryValue( uno::Any& rVal, BYTE /* nMemberId */ ) const
> {
>     uno::Reference<sheet::XHeaderFooterContent> xContent =
>         new ScHeaderFooterContentObj( pLeftArea, pCenterArea, pRightArea );
> 
>     rVal <<= xContent;
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
>+bool ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     uno::Reference<sheet::XHeaderFooterContent> xContent;
>     if ( rVal >>= xContent )
>     {
>@@ -707,7 +707,7 @@ BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
>                         pRightArea = aEngine.CreateTextObject();
>                 }
> 
>-                bRet = TRUE;
>+                bRet = true;
>             }
>         }
>     }
>@@ -717,7 +717,7 @@ BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
>         DBG_ERROR("exception - wrong argument");
>     }
> 
>-    return bRet;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -1201,23 +1201,23 @@ SfxItemPresentation ScPageScaleToItem::GetPresentation(
>     return ePres;
> }
> 
>-BOOL ScPageScaleToItem::QueryValue( uno::Any& rAny, BYTE nMemberId ) const
>+bool ScPageScaleToItem::QueryValue( uno::Any& rAny, BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nMemberId )
>     {
>         case SC_MID_PAGE_SCALETO_WIDTH:     rAny <<= mnWidth;   break;
>         case SC_MID_PAGE_SCALETO_HEIGHT:    rAny <<= mnHeight;  break;
>         default:
>             DBG_ERRORFILE( "ScPageScaleToItem::QueryValue - unknown member ID" );
>-            bRet = FALSE;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL ScPageScaleToItem::PutValue( const uno::Any& rAny, BYTE nMemberId )
>+bool ScPageScaleToItem::PutValue( const uno::Any& rAny, BYTE nMemberId )
> {
>-    BOOL bRet = FALSE;
>+    BOOL bRet = false;
>     switch( nMemberId )
>     {
>         case SC_MID_PAGE_SCALETO_WIDTH:     bRet = rAny >>= mnWidth;    break;
>diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
>index 95c660b..49fa30f 100644
>--- a/sc/source/ui/app/uiitems.cxx
>+++ b/sc/source/ui/app/uiitems.cxx
>@@ -221,11 +221,11 @@ SfxPoolItem* __EXPORT ScSortItem::Clone( SfxItemPool * ) const
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
>+bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
> {
>     // Return empty value as there is no useful conversion
>     rVal = com::sun::star::uno::Any();
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -379,11 +379,11 @@ SfxPoolItem* __EXPORT ScSubTotalItem::Clone( SfxItemPool * ) const
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
>+bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
> {
>     // Return empty value as there is no useful conversion
>     rVal = com::sun::star::uno::Any();
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
>index 842603a..e9d4aa0 100644
>--- a/sc/source/ui/inc/uiitems.hxx
>+++ b/sc/source/ui/inc/uiitems.hxx
>@@ -158,7 +158,7 @@ public:
>     virtual String          GetValueText() const;
>     virtual int             operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
> 
>     ScViewData*			GetViewData () const { return pViewData; }
>     const ScSortParam&	GetSortData	() const { return theSortData; }
>@@ -218,7 +218,7 @@ public:
>     virtual String          GetValueText() const;
>     virtual int             operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
> 
>     ScViewData*				GetViewData () const { return pViewData; }
>     const ScSubTotalParam&	GetSubTotalData() const { return theSubTotalData; }
>diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
>index 487f6e6..ddc6a1c 100644
>--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
>+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
>@@ -220,7 +220,7 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ BOOL __EXPORT ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool __EXPORT ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
> /*N*/     switch ( nMemberId  )
>@@ -245,16 +245,16 @@ using namespace ::com::sun::star;
> /*N*/             rVal <<= (sal_Bool ) bHidePrint; break;
> /*N*/         default:
> /*N*/             DBG_ERROR("Wrong MemberID!");
>-/*N*/             return FALSE;
>+/*N*/             return false;
> /*N*/     }
>-/*N*/ 
>-/*N*/ 	return TRUE;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ BOOL __EXPORT ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool __EXPORT ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
>-/*N*/ 	BOOL bRet = FALSE;
>-/*N*/     sal_Bool bVal;
>+/*N*/ 	bool bRet = false;
>+/*N*/   sal_Bool bVal;
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
> /*N*/     switch ( nMemberId )
> /*N*/     {
>@@ -267,7 +267,7 @@ using namespace ::com::sun::star;
> /*N*/                 bHideFormula = aProtection.IsFormulaHidden;
> /*N*/                 bHideCell    = aProtection.IsHidden;
> /*N*/                 bHidePrint   = aProtection.IsPrintHidden;
>-/*N*/                 bRet = TRUE;
>+/*N*/                 bRet = true;
> /*N*/             }
> /*N*/             else
> /*N*/                 DBG_ERROR("exception - wrong argument");
>@@ -284,7 +284,7 @@ using namespace ::com::sun::star;
> /*N*/         default:
> /*N*/             DBG_ERROR("Wrong MemberID!");
> /*N*/     }
>-/*N*/ 
>+/*N*/
> /*N*/ 	return bRet;
> /*N*/ }
> 
>@@ -636,18 +636,18 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ BOOL __EXPORT ScPageHFItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool __EXPORT ScPageHFItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	uno::Reference<sheet::XHeaderFooterContent> xContent =
> /*N*/ 		new ScHeaderFooterContentObj( pLeftArea, pCenterArea, pRightArea );
>-/*N*/ 
>+/*N*/
> /*N*/ 	rVal <<= xContent;
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ BOOL __EXPORT ScPageHFItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool __EXPORT ScPageHFItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
>-/*N*/ 	BOOL bRet = FALSE;
>+/*N*/ 	bool bRet = false;
> /*N*/ 	uno::Reference<sheet::XHeaderFooterContent> xContent;
> /*N*/ 	if ( rVal >>= xContent )
> /*N*/ 	{
>@@ -660,15 +660,15 @@ using namespace ::com::sun::star;
> /*N*/ 				const EditTextObject* pImpLeft = pImp->GetLeftEditObject();
> /*N*/ 				delete pLeftArea;
> /*N*/ 				pLeftArea = pImpLeft ? pImpLeft->Clone() : NULL;
>-/*N*/ 
>+/*N*/
> /*N*/ 				const EditTextObject* pImpCenter = pImp->GetCenterEditObject();
> /*N*/ 				delete pCenterArea;
> /*N*/ 				pCenterArea = pImpCenter ? pImpCenter->Clone() : NULL;
>-/*N*/ 
>+/*N*/
> /*N*/ 				const EditTextObject* pImpRight = pImp->GetRightEditObject();
> /*N*/ 				delete pRightArea;
> /*N*/ 				pRightArea = pImpRight ? pImpRight->Clone() : NULL;
>-/*N*/ 
>+/*N*/
> /*N*/ 				if ( !pLeftArea || !pCenterArea || !pRightArea )
> /*N*/ 				{
> /*?*/ 					// keine Texte auf NULL stehen lassen
>@@ -680,17 +680,17 @@ using namespace ::com::sun::star;
> /*?*/ 					if (!pRightArea)
> /*?*/ 						pRightArea = aEngine.CreateTextObject();
> /*N*/ 				}
>-/*N*/ 
>-/*N*/ 				bRet = TRUE;
>+/*N*/
>+/*N*/ 				bRet = true;
> /*N*/ 			}
> /*N*/ 		}
> /*N*/ 	}
>-/*N*/ 
>+/*N*/
> /*N*/ 	if (!bRet)
> /*N*/ 	{
> /*N*/ 		DBG_ERROR("exception - wrong argument");
> /*N*/ 	}
>-/*N*/ 
>+/*N*/
> /*N*/ 	return bRet;
> /*N*/ }
> 
>diff --git a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
>index 87f0276..160f10b 100644
>--- a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
>+++ b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
>@@ -267,14 +267,14 @@ using namespace ::com::sun::star::uno;
> /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_True;//STRIP001 
>+/*N*/ bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_True;//STRIP001 
>+/*N*/ bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
> /*N*/ }
> 
> void SvxSearchItem::Commit()
>diff --git a/binfilter/bf_svtools/source/items/svt_globalnameitem.cxx b/binfilter/bf_svtools/source/items/svt_globalnameitem.cxx
>index 6d8ff19..34055bf 100644
>--- a/binfilter/bf_svtools/source/items/svt_globalnameitem.cxx
>+++ b/binfilter/bf_svtools/source/items/svt_globalnameitem.cxx
>@@ -82,7 +82,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
>             ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
>@@ -96,22 +96,22 @@ BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>     if ( aSeq.getLength() == 16 )
>     {
>         m_aName.MakeFromMemory( (void*) aSeq.getConstArray() );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxGlobalNameItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxGlobalNameItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
>     void* pData = ( void* ) &m_aName.GetCLSID();
>     memcpy( aSeq.getArray(), pData, 16 );
>     rVal <<= aSeq;
>-    return TRUE;
>+    return true;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items/svt_intitem.cxx b/binfilter/bf_svtools/source/items/svt_intitem.cxx
>index 6ad1c23..94009e4 100644
>--- a/binfilter/bf_svtools/source/items/svt_intitem.cxx
>+++ b/binfilter/bf_svtools/source/items/svt_intitem.cxx
>@@ -165,26 +165,26 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL SfxInt16Item::QueryValue(::com::sun::star::uno::Any& rVal, BYTE) const
>+bool SfxInt16Item::QueryValue(::com::sun::star::uno::Any& rVal, BYTE) const
> {
>     sal_Int16 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
> {
>     sal_Int16 nValue = sal_Int16();
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/binfilter/bf_svtools/source/items/svt_ptitem.cxx b/binfilter/bf_svtools/source/items/svt_ptitem.cxx
>index 6fcaf84..9d491d8 100644
>--- a/binfilter/bf_svtools/source/items/svt_ptitem.cxx
>+++ b/binfilter/bf_svtools/source/items/svt_ptitem.cxx
>@@ -143,7 +143,7 @@ SvStream& SfxPointItem::Store(SvStream &rStream, USHORT ) const
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPointItem::QueryValue( uno::Any& rVal,
>+bool SfxPointItem::QueryValue( uno::Any& rVal,
>                                BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -159,33 +159,33 @@ BOOL SfxPointItem::QueryValue( uno::Any& rVal,
>         case 0: rVal <<= aTmp; break;
>         case MID_X: rVal <<= aTmp.X; break;
>         case MID_Y: rVal <<= aTmp.Y; break;
>-        default: DBG_ERROR("Wrong MemberId!"); return FALSE;
>+    default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPointItem::PutValue( const uno::Any& rVal,
>+bool SfxPointItem::PutValue( const uno::Any& rVal,
>                              BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     awt::Point aValue;
>     sal_Int32 nVal = 0;
>     if ( !nMemberId )
>-    {        
>+    {
>         bRet = ( rVal >>= aValue );
>         if( bConvert )
>         {
>             aValue.X = MM100_TO_TWIP(aValue.X);
>             aValue.Y = MM100_TO_TWIP(aValue.Y);
>-        }        
>+        }
>     }
>     else
>-    {        
>+    {
>         bRet = ( rVal >>= nVal );
>         if( bConvert )
>             nVal = MM100_TO_TWIP( nVal );
>@@ -198,7 +198,7 @@ BOOL SfxPointItem::PutValue( const uno::Any& rVal,
>             case 0: aVal.setX( aValue.X ); aVal.setY( aValue.Y ); break;
>             case MID_X: aVal.setX( nVal ); break;
>             case MID_Y: aVal.setY( nVal ); break;
>-            default: DBG_ERROR("Wrong MemberId!"); return FALSE;
>+            default: DBG_ERROR("Wrong MemberId!"); return false;
>         }
>     }
> 
>diff --git a/binfilter/bf_svtools/source/items/svt_rectitem.cxx b/binfilter/bf_svtools/source/items/svt_rectitem.cxx
>index 179c715..e14a9de 100644
>--- a/binfilter/bf_svtools/source/items/svt_rectitem.cxx
>+++ b/binfilter/bf_svtools/source/items/svt_rectitem.cxx
>@@ -142,7 +142,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, USHORT ) const
> 
> 
> // -----------------------------------------------------------------------
>-BOOL SfxRectangleItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+bool SfxRectangleItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>                                    BYTE nMemberId) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -160,17 +160,17 @@ BOOL SfxRectangleItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>         case MID_RECT_RIGHT: rVal <<= aVal.getY(); break;
>         case MID_WIDTH: rVal <<= aVal.getWidth(); break;
>         case MID_HEIGHT: rVal <<= aVal.getHeight(); break;
>-        default: DBG_ERROR("Wrong MemberID!"); return FALSE;
>+        default: DBG_ERROR("Wrong MemberID!"); return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                  BYTE nMemberId  )
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     nMemberId &= ~CONVERT_TWIPS;
>     com::sun::star::awt::Rectangle aValue;
>     sal_Int32 nVal = 0;
>@@ -193,7 +193,7 @@ BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>             case MID_RECT_RIGHT: aVal.setY( nVal ); break;
>             case MID_WIDTH: aVal.setWidth( nVal ); break;
>             case MID_HEIGHT: aVal.setHeight( nVal ); break;
>-            default: DBG_ERROR("Wrong MemberID!"); return FALSE;
>+            default: DBG_ERROR("Wrong MemberID!"); return false;
>         }
>     }
> 
>diff --git a/binfilter/bf_svtools/source/items/svt_szitem.cxx b/binfilter/bf_svtools/source/items/svt_szitem.cxx
>index 5807974..a4f422c 100644
>--- a/binfilter/bf_svtools/source/items/svt_szitem.cxx
>+++ b/binfilter/bf_svtools/source/items/svt_szitem.cxx
>@@ -140,7 +140,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const
> }
> 
> // -----------------------------------------------------------------------
>-BOOL  SfxSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+bool  SfxSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>                                BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -164,20 +164,20 @@ BOOL  SfxSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>             rVal <<= aTmp.getWidth(); break;
>         case MID_HEIGHT:
>             rVal <<= aTmp.getHeight(); break;
>-        default: DBG_ERROR("Wrong MemberId!"); return FALSE;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return TRUE;
>+    return false;
> }
> 
> // -----------------------------------------------------------------------
>-BOOL SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
> 
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     com::sun::star::awt::Size aValue;
>     sal_Int32 nVal = 0;
>     if ( !nMemberId )
>diff --git a/binfilter/bf_svtools/source/items1/svt_bintitem.cxx b/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
>index 31a1419..4d5b284 100644
>--- a/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
>@@ -148,26 +148,26 @@ SfxFieldUnit SfxBigIntItem::GetUnit() const
> 
> //============================================================================
> // virtual
>-BOOL SfxBigIntItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxBigIntItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     double aValue = 0.0;
>     if ( rVal >>= aValue )
>     {
>         SetValue( aValue );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxBigIntItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
> // virtual
>-BOOL SfxBigIntItem::QueryValue( ::com::sun::star::uno::Any& rVal,	BYTE ) const
>+bool SfxBigIntItem::QueryValue( ::com::sun::star::uno::Any& rVal,	BYTE ) const
> {
>     double aValue = GetValue();
>     rVal <<= aValue;
>-    return TRUE;
>+    return true;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_cenumitm.cxx b/binfilter/bf_svtools/source/items1/svt_cenumitm.cxx
>index da3acf3..a8cdc7f 100644
>--- a/binfilter/bf_svtools/source/items1/svt_cenumitm.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_cenumitm.cxx
>@@ -84,7 +84,7 @@ SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit,
> 
> //============================================================================
> // virtual
>-BOOL SfxEnumItemInterface::QueryValue(::com::sun::star::uno::Any& rVal, BYTE)
>+bool SfxEnumItemInterface::QueryValue(::com::sun::star::uno::Any& rVal, BYTE)
>     const
> {
>     rVal <<= sal_Int32(GetEnumValue());
>@@ -93,7 +93,7 @@ BOOL SfxEnumItemInterface::QueryValue(::com::sun::star::uno::Any& rVal, BYTE)
> 
> //============================================================================
> // virtual
>-BOOL SfxEnumItemInterface::PutValue(const ::com::sun::star::uno::Any& rVal,
>+bool SfxEnumItemInterface::PutValue(const ::com::sun::star::uno::Any& rVal,
>                                     BYTE)
> {
>     sal_Int32 nTheValue = 0;
>@@ -247,7 +247,7 @@ SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
>+bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
> {
>     rVal <<= sal_Bool(m_bValue);
>     return true;
>@@ -255,7 +255,7 @@ BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
> 
> //============================================================================
> // virtual
>-BOOL CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
>+bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
> {
>     sal_Bool bTheValue = sal_Bool();
>     if (rVal >>= bTheValue)
>diff --git a/binfilter/bf_svtools/source/items1/svt_cintitem.cxx b/binfilter/bf_svtools/source/items1/svt_cintitem.cxx
>index 61eca8a..8cab660 100644
>--- a/binfilter/bf_svtools/source/items1/svt_cintitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_cintitem.cxx
>@@ -91,26 +91,26 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int8 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int8 nValue = sal_Int8();
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntByteItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -226,27 +226,27 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         DBG_ASSERT( nValue <= USHRT_MAX, "Overflow in UInt16 value!");
>         m_nValue = (sal_uInt16)nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -358,26 +358,26 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -491,28 +491,28 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
>index b903c02..ebf7a76 100644
>--- a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
>@@ -150,18 +150,18 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
>+bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
> {
>     DBG_ERROR("Not implemented!");
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
>+bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
> {
>     DBG_ERROR("Not implemented!");
>-    return FALSE;
>+    return false;
> }
> 
> 
>diff --git a/binfilter/bf_svtools/source/items1/svt_cstitem.cxx b/binfilter/bf_svtools/source/items1/svt_cstitem.cxx
>index 22b4ec6..0502227 100644
>--- a/binfilter/bf_svtools/source/items1/svt_cstitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_cstitem.cxx
>@@ -136,26 +136,26 @@ SfxItemPresentation SfxCrawlStatusItem::GetPresentation( SfxItemPresentation, Sf
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxCrawlStatusItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool SfxCrawlStatusItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     sal_Int16 aValue = sal_Int16();
>     if ( rVal >>= aValue )
>     {
>         SetStatus( static_cast< CrawlStatus >( aValue ) );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxCrawlStatusItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxCrawlStatusItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxCrawlStatusItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     sal_Int16 aValue = sal::static_int_cast< sal_Int16 >(GetStatus());
>     rVal <<= aValue;
>-    return TRUE;
>+    return true;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx b/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx
>index 7c6ba8c..98df161 100644
>--- a/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx
>@@ -220,7 +220,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType )
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     rVal <<= rtl::OUString(GetValue());
>     return true;
>@@ -228,7 +228,7 @@ BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     rtl::OUString aValue;
>     if ( rVal >>= aValue )
>diff --git a/binfilter/bf_svtools/source/items1/svt_custritm.cxx b/binfilter/bf_svtools/source/items1/svt_custritm.cxx
>index 508590d..a95b99e 100644
>--- a/binfilter/bf_svtools/source/items1/svt_custritm.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_custritm.cxx
>@@ -118,7 +118,7 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
> 
> //============================================================================
> // virtual
>-BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>+bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>     const
> {
>     rVal <<= rtl::OUString(m_aValue);
>@@ -127,7 +127,7 @@ BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
> 
> //============================================================================
> // virtual
>-BOOL CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
>+bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
>                                          BYTE)
> {
>     rtl::OUString aTheValue;
>diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
>index 6a483a8..8591ae2 100644
>--- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
>@@ -181,8 +181,8 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>-                                   BYTE nMemberId )
>+bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>+                                BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     com::sun::star::util::DateTime aValue;
>@@ -195,16 +195,16 @@ BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                       aValue.Minutes,
>                                       aValue.Seconds,
>                                       aValue.HundredthSeconds ) );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                    BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -216,7 +216,7 @@ BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                            aDateTime.GetMonth(),
>                                            aDateTime.GetYear() );
>     rVal <<= aValue;
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/binfilter/bf_svtools/source/items1/svt_dtritem.cxx b/binfilter/bf_svtools/source/items1/svt_dtritem.cxx
>index 89254b3..a436d23 100644
>--- a/binfilter/bf_svtools/source/items1/svt_dtritem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_dtritem.cxx
>@@ -187,7 +187,7 @@ SfxItemPresentation SfxDateTimeRangeItem::GetPresentation
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeRangeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool SfxDateTimeRangeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     com::sun::star::util::DateTimeRange aValue;
>     if ( rVal >>= aValue )
>@@ -206,35 +206,35 @@ BOOL SfxDateTimeRangeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>                                            aValue.EndMinutes,
>                                            aValue.EndSeconds,
>                                            aValue.EndHundredthSeconds ) );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxDateTimeRangeItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeRangeItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SfxDateTimeRangeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     com::sun::star::util::DateTimeRange aValue( aStartDateTime.Get100Sec(),
>-                                                   aStartDateTime.GetSec(),
>-                                                      aStartDateTime.GetMin(),
>-                                                   aStartDateTime.GetHour(),
>-                                                   aStartDateTime.GetDay(),
>-                                                   aStartDateTime.GetMonth(),
>-                                                   aStartDateTime.GetYear(),
>+                                                aStartDateTime.GetSec(),
>+                                                aStartDateTime.GetMin(),
>+                                                aStartDateTime.GetHour(),
>+                                                aStartDateTime.GetDay(),
>+                                                aStartDateTime.GetMonth(),
>+                                                aStartDateTime.GetYear(),
>                                                 aEndDateTime.Get100Sec(),
>-                                                   aEndDateTime.GetSec(),
>-                                                      aEndDateTime.GetMin(),
>-                                                   aEndDateTime.GetHour(),
>-                                                   aEndDateTime.GetDay(),
>-                                                   aEndDateTime.GetMonth(),
>-                                                   aEndDateTime.GetYear() );
>+                                                aEndDateTime.GetSec(),
>+                                                aEndDateTime.GetMin(),
>+                                                aEndDateTime.GetHour(),
>+                                                aEndDateTime.GetDay(),
>+                                                aEndDateTime.GetMonth(),
>+                                                aEndDateTime.GetYear() );
>     rVal <<= aValue;
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/binfilter/bf_svtools/source/items1/svt_ilstitem.cxx b/binfilter/bf_svtools/source/items1/svt_ilstitem.cxx
>index 266c7bf..10a9379 100644
>--- a/binfilter/bf_svtools/source/items1/svt_ilstitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_ilstitem.cxx
>@@ -75,7 +75,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const
>     return new SfxIntegerListItem( *this );
> }
> 
>-BOOL SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter
>             ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
>@@ -84,16 +84,16 @@ BOOL SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE
>     try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); }
>     catch (::com::sun::star::uno::Exception&)
>     {
>-        return FALSE;
>+        return false;
>     }
> 
>     return ( aNew >>= m_aList );
> }
> 
>-BOOL SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     rVal <<= m_aList;
>-    return TRUE;
>+    return true;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_lckbitem.cxx b/binfilter/bf_svtools/source/items1/svt_lckbitem.cxx
>index bbccc2b..b0604e8 100644
>--- a/binfilter/bf_svtools/source/items1/svt_lckbitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_lckbitem.cxx
>@@ -143,7 +143,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     com::sun::star::uno::Sequence< sal_Int8 > aSeq;
>     if ( rVal >>= aSeq )
>@@ -159,16 +159,16 @@ BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>         else
>             _xVal = NULL;
> 
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     if ( _xVal.Is() )
>     {
>@@ -178,7 +178,7 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>         if ( _xVal->Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
>             nLen = aStat.nSize;
>         else
>-            return FALSE;
>+            return false;
> 
>         ULONG nRead = 0;
>         com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );
>@@ -192,7 +192,7 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>         rVal <<= aSeq;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
>index 94b9b59..9bc1abb 100644
>--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
>@@ -391,18 +391,18 @@ void SfxPoolItem::Store(SvStream &rStream) const
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
>+bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
> {
>     DBG_ERROR("There is no implementation for QueryValue for this item!");
>-    return FALSE;
>+    return false;
> }
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
>+bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
> {
>     DBG_ERROR("There is no implementation for PutValue for this item!");
>-    return FALSE;
>+    return false;
> }
> 
> SfxVoidItem::~SfxVoidItem()
>diff --git a/binfilter/bf_svtools/source/items1/svt_slstitm.cxx b/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
>index 9f04191..c6061a9 100644
>--- a/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
>@@ -318,22 +318,22 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     com::sun::star::uno::Sequence< rtl::OUString > aValue;
>     if ( rVal >>= aValue )
>     {
>         SetStringList( aValue );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     // GetString() is not const!!!
>     SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this );
>@@ -341,7 +341,7 @@ BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>     com::sun::star::uno::Sequence< rtl::OUString > aStringList;
>     pThis->GetStringList( aStringList );
>     rVal = ::com::sun::star::uno::makeAny( aStringList );
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx b/binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx
>index 82acb95..3ff2b26 100644
>--- a/binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx
>@@ -130,7 +130,7 @@ SfxPoolItem* SfxTargetFrameItem::Clone( SfxItemPool* ) const
> 
> // -----------------------------------------------------------------------
> // virtual
>-BOOL SfxTargetFrameItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxTargetFrameItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     String aVal;
>     for ( int i = 0; i <= SfxOpenModeLast; i++ )
>@@ -140,12 +140,12 @@ BOOL SfxTargetFrameItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>     }
> 
>     rVal <<= rtl::OUString( aVal );
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> // virtual
>-BOOL SfxTargetFrameItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool SfxTargetFrameItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     rtl::OUString aValue;
>     if ( rVal >>= aValue )
>@@ -155,11 +155,11 @@ BOOL SfxTargetFrameItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>         for ( USHORT i = 0; i <= SfxOpenModeLast; i++ )
>             _aFrames[ i ] = aVal.GetToken( i );
> 
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxTargetFrameItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_tresitem.cxx b/binfilter/bf_svtools/source/items1/svt_tresitem.cxx
>index 4d05557..8918cbd 100644
>--- a/binfilter/bf_svtools/source/items1/svt_tresitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_tresitem.cxx
>@@ -59,7 +59,7 @@ int CntTransferResultItem::operator ==(SfxPoolItem const & rItem) const
> 
> //============================================================================
> // virtual
>-BOOL CntTransferResultItem::QueryValue(uno::Any & rVal, BYTE) const
>+bool CntTransferResultItem::QueryValue(uno::Any & rVal, BYTE) const
> {
>     rVal <<= m_aResult;
>     return true;
>@@ -67,7 +67,7 @@ BOOL CntTransferResultItem::QueryValue(uno::Any & rVal, BYTE) const
> 
> //============================================================================
> // virtual
>-BOOL CntTransferResultItem::PutValue(uno::Any const & rVal, BYTE)
>+bool CntTransferResultItem::PutValue(uno::Any const & rVal, BYTE)
> {
>     return rVal >>= m_aResult;
> }
>diff --git a/binfilter/bf_svtools/source/items1/svt_visitem.cxx b/binfilter/bf_svtools/source/items1/svt_visitem.cxx
>index a49d13b..d2c84bb 100644
>--- a/binfilter/bf_svtools/source/items1/svt_visitem.cxx
>+++ b/binfilter/bf_svtools/source/items1/svt_visitem.cxx
>@@ -95,21 +95,21 @@ SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     rVal <<= m_nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     if (rVal >>= m_nValue)
>-        return TRUE;
>+        return true;
> 
>     DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx b/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
>index 4b144d9..b341151 100644
>--- a/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
>+++ b/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
>@@ -394,149 +394,149 @@ using namespace ::com::sun::star;
> //////////////////////////////////////////////////////////////////////////////
> 
> // Svx3DNormalsKindItem: use drawing::NormalsKind
>-/*N*/ sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::NormalsKind)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::NormalsKind eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DNormalsKindItem(*this);
> /*N*/ }
> 
> // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
>-/*N*/ sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::TextureProjectionMode)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::TextureProjectionMode eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DTextureProjectionXItem(*this);
> /*N*/ }
> 
> // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
>-/*N*/ sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::TextureProjectionMode)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::TextureProjectionMode eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DTextureProjectionYItem(*this);
> /*N*/ }
> 
> // Svx3DTextureKindItem: use drawing::TextureKind
>-/*N*/ sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::TextureKind)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::TextureKind eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DTextureKindItem(*this);
> /*N*/ }
> 
> // Svx3DTextureModeItem: use drawing:TextureMode
>-/*N*/ sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::TextureMode)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::TextureMode eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DTextureModeItem(*this);
> /*N*/ }
> 
> // Svx3DPerspectiveItem: use drawing::ProjectionMode
>-/*N*/ sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::ProjectionMode)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::ProjectionMode eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DPerspectiveItem(*this);
> /*N*/ }
> 
> // Svx3DShadeModeItem: use drawing::ShadeMode
>-/*N*/ sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
>+/*N*/ bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
> /*N*/ {
> /*N*/ 	rVal <<= (drawing::ShadeMode)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	drawing::ShadeMode eVar;
> /*N*/ 	if(!(rVal >>= eVar))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	SetValue((sal_Int16)eVar);
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* pPool) const 
>-/*N*/ { 
>+/*N*/ SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* pPool) const
>+/*N*/ {
> /*N*/ 	return new Svx3DShadeModeItem(*this);
> /*N*/ }
> 
>diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx
>index c036cda..8b914e3 100644
>--- a/binfilter/bf_svx/source/items/svx_algitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_algitem.cxx
>@@ -84,7 +84,7 @@ using namespace ::com::sun::star;
> 
> /*N*/ //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -128,7 +128,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -218,7 +218,7 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
> /*N*/ 	switch ( (SvxCellVerJustify)GetValue() )
>@@ -232,7 +232,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	table::CellVertJustify eUno;
> /*N*/ 	if(!(rVal >>= eUno))
>@@ -295,7 +295,7 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	table::CellOrientation eUno = table::CellOrientation_STANDARD;
> /*N*/ 	switch ( (SvxCellOrientation)GetValue() )
>@@ -309,7 +309,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	table::CellOrientation eOrient;
> /*N*/ 	if(!(rVal >>= eOrient))
>@@ -450,7 +450,7 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -478,7 +478,7 @@ using namespace ::com::sun::star;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
> /*N*/ 	long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX;	// Members sind sal_Int16
>diff --git a/binfilter/bf_svx/source/items/svx_chrtitem.cxx b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
>index bcd8de3..7622b3a 100644
>--- a/binfilter/bf_svx/source/items/svx_chrtitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
>@@ -302,14 +302,14 @@ using namespace ::com::sun::star;
> 
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= fVal;
> /*N*/ 	return sal_True;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	return rVal >>= fVal;
> /*N*/ }
>diff --git a/binfilter/bf_svx/source/items/svx_e3ditem.cxx b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
>index 19f2a0e..85bebdc 100644
>--- a/binfilter/bf_svx/source/items/svx_e3ditem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
>@@ -118,7 +118,7 @@ using namespace ::com::sun::star;
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	drawing::Direction3D aDirection;
> /*N*/ 
>@@ -133,7 +133,7 @@ using namespace ::com::sun::star;
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxVector3DItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxVector3DItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	drawing::Direction3D aDirection;
> /*N*/ 	if(!(rVal >>= aDirection))
>diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
>index e72120f..4d35d2d 100644
>--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
>+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
>@@ -270,7 +270,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -293,7 +293,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -422,7 +422,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bRet = sal_True;
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -467,7 +467,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -723,7 +723,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -739,7 +739,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -910,7 +910,7 @@ using namespace ::com::sun::star;
> 
> /*-----------------16.03.98 12:42-------------------
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -931,7 +931,7 @@ using namespace ::com::sun::star;
> /*-----------------16.03.98 12:42-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -995,7 +995,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -1027,14 +1027,14 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
> /*N*/
> /*N*/     table::ShadowFormat aShadow;
> /*N*/     uno::Any aAny;
>-/*N*/     sal_Bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
>+/*N*/     bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
> /*N*/     switch ( nMemberId )
> /*N*/     {
> /*N*/         case MID_LOCATION:
>@@ -1307,7 +1307,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return aLine;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>+/*N*/ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	table::BorderLine aRetLine;
>@@ -1394,7 +1394,7 @@ using namespace ::com::sun::star;
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	sal_uInt16 nLine = BOX_LINE_TOP;
>@@ -1917,7 +1917,7 @@ using namespace ::com::sun::star;
> 
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	style::BreakType eBreak = style::BreakType_NONE;
> /*N*/ 	switch ( (SvxBreak)GetValue() )
>@@ -1933,7 +1933,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	style::BreakType nBreak;
> /*N*/
>@@ -2375,7 +2375,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
> /*?*/     return (nTrans * 100 + 127) / 254;
> /*?*/ }
> 
>-/*N*/ sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2437,7 +2437,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2867,7 +2867,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ )
> /*N*/ }
> 
> 
>-/*N*/ sal_Bool SvxFrameDirectionItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SvxFrameDirectionItem::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*N*/ 		 									BYTE )
> /*N*/ {
> /*N*/     sal_Int16 nVal;
>@@ -2901,7 +2901,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ )
> /*N*/ 	return bRet;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxFrameDirectionItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SvxFrameDirectionItem::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/ 											BYTE ) const
> /*N*/ {
> /*N*/     // translate SvxFrameDirection into WritingDirection2
>diff --git a/binfilter/bf_svx/source/items/svx_grfitem.cxx b/binfilter/bf_svx/source/items/svx_grfitem.cxx
>index 420ebd6..ac18fdc 100644
>--- a/binfilter/bf_svx/source/items/svx_grfitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_grfitem.cxx
>@@ -125,7 +125,7 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
> 
> 
> 
>-/*N*/ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -145,17 +145,17 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
> /*N*/ 
> /*N*/ 
> /*N*/ 	rVal <<= aRet;
>-/*N*/ 	return	 sal_True;
>+/*N*/ 	return	 true;
> /*N*/ }
> 
>-/*N*/ BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	text::GraphicCrop aVal;
> /*N*/ 
> /*N*/ 	if(!(rVal >>= aVal))
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/     if( bConvert )
> /*N*/ 	{
> /*N*/ 	   aVal.Right 	= MM100_TO_TWIP(aVal.Right );
>@@ -168,7 +168,7 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
> /*N*/ 	nRight  = aVal.Right ;
> /*N*/ 	nTop	= aVal.Top	 ;
> /*N*/ 	nBottom = aVal.Bottom;
>-/*N*/ 	return	sal_True;
>+/*N*/ 	return	true;
> /*N*/ }
> 
> 
>diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
>index c473a5d..6a4baf7 100644
>--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
>@@ -910,7 +910,7 @@ static SvxNumberFormat*	pStdOutlineNumFmt = 0;
>  * --------------------------------------------------*/
> 
> 
>-/*N*/ sal_Bool SvxNumBulletItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxNumBulletItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	uno::Reference< container::XIndexReplace > xRule;
> /*N*/ 	if( rVal >>= xRule )
>diff --git a/binfilter/bf_svx/source/items/svx_pageitem.cxx b/binfilter/bf_svx/source/items/svx_pageitem.cxx
>index 34af171..31be80b 100644
>--- a/binfilter/bf_svx/source/items/svx_pageitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx
>@@ -125,7 +125,7 @@ using namespace ::com::sun::star;
> 
> 
> //------------------------------------------------------------------------
>-/*N*/ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -162,7 +162,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> //------------------------------------------------------------------------
>-/*N*/ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	switch( nMemberId )
> /*N*/ 	{
>diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
>index 545d17c..cf11f6e 100644
>--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
>@@ -183,7 +183,7 @@ using namespace ::com::sun::star;
>         - ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -228,7 +228,7 @@ using namespace ::com::sun::star;
> /*-----------------18.03.98 16:32-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -384,7 +384,7 @@ using namespace ::com::sun::star;
> /*-----------------18.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -405,7 +405,7 @@ using namespace ::com::sun::star;
> 
> --------------------------------------------------*/
> 
>-/*N*/ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>+/*N*/ bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -589,7 +589,7 @@ using namespace ::com::sun::star;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -611,7 +611,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -793,7 +793,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
> 
> --------------------------------------------------*/
> 
>-/*N*/ sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -837,7 +837,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
> 
> --------------------------------------------------*/
> 
>-/*N*/ sal_Bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>diff --git a/binfilter/bf_svx/source/items/svx_rotmodit.cxx b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
>index 23a502c..d795b96 100644
>--- a/binfilter/bf_svx/source/items/svx_rotmodit.cxx
>+++ b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
>@@ -91,7 +91,7 @@ using namespace ::com::sun::star;
> 
> //	QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
> 
>-/*N*/ sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
> /*N*/ 	switch ( (SvxRotateMode)GetValue() )
>@@ -105,7 +105,7 @@ using namespace ::com::sun::star;
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	table::CellVertJustify eUno;
> /*N*/ 	if(!(rVal >>= eUno))
>diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
>index 96fe862..bd82dc4 100644
>--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
>@@ -255,7 +255,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -274,7 +274,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -480,7 +480,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:28-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -498,7 +498,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:28-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -606,7 +606,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:18-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -626,7 +626,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:18-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -728,7 +728,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:53-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	//	In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
> /*N*/ 	//	gesteuert, ob der Wert im Item 1/100mm oder Twips sind.
>@@ -821,7 +821,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
> /*-----------------13.03.98 14:53-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>@@ -986,7 +986,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:25-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxUnderlineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxUnderlineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1011,7 +1011,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:28-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxUnderlineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxUnderlineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1115,7 +1115,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:28-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1133,7 +1133,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1380,7 +1380,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)(mColor.GetColor());
> /*N*/ 	return sal_True;
>@@ -1388,7 +1388,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nColor;
> /*N*/ 	if(!(rVal >>= nColor))
>@@ -1528,7 +1528,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /* -----------------------------19.02.01 12:21--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-/*N*/ sal_Bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Int16 nVal = GetValue();
> /*N*/ 	if(nMemberId & CONVERT_TWIPS)
>@@ -1537,7 +1537,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*N*/ 	return sal_True;
> /*N*/ }
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+/*N*/ bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/ 	sal_Int16 nVal;
> /*N*/ 	if(!(rVal >>= nVal))
>@@ -1595,7 +1595,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Int16 nRet = style::CaseMap::NONE;
> /*N*/ 	switch( GetValue() )
>@@ -1612,7 +1612,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_uInt16 nVal;
> /*N*/ 	if(!(rVal >>= nVal))
>@@ -1728,7 +1728,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1749,7 +1749,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------13.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1838,7 +1838,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------14.03.98 14:13-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1857,7 +1857,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*-----------------14.03.98 14:13-------------------
> 
> --------------------------------------------------*/
>-/*N*/ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2023,7 +2023,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2050,7 +2050,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2127,7 +2127,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*NBFF*/	return new SvxTwoLinesItem( *this );
> /*?*/ }
> 
>-/*NBFF*/ sal_Bool SvxTwoLinesItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ bool SvxTwoLinesItem::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 								BYTE nMemberId ) const
> /*NBFF*/ {
> /*NBFF*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2161,7 +2161,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*NBFF*/ 	return bRet;
> /*NBFF*/ }
> 
>-/*NBFF*/ sal_Bool SvxTwoLinesItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ bool SvxTwoLinesItem::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 									BYTE nMemberId )
> /*NBFF*/ {
> /*NBFF*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2313,7 +2313,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*NBFF*/ 	return SFX_ITEM_PRESENTATION_NONE;
> /*NBFF*/ }
> 
>-/*NBFF*/ sal_Bool SvxCharRotateItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ bool SvxCharRotateItem::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 								BYTE nMemberId ) const
> /*NBFF*/ {
> /*NBFF*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2334,7 +2334,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*NBFF*/ 	return bRet;
> /*NBFF*/ }
> 
>-/*NBFF*/ sal_Bool SvxCharRotateItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ bool SvxCharRotateItem::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 									BYTE nMemberId )
> /*NBFF*/ {
> /*NBFF*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2428,7 +2428,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*N*/ }
> 
> 
>-/*N*/ sal_Bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
> /*N*/     // where we still want this to be a sal_Int16
>@@ -2443,7 +2443,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*N*/ 	return FALSE;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
> /*N*/     // where we still want this to be a sal_Int16
>@@ -2523,7 +2523,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*?*/     return eRet;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxCharReliefItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SvxCharReliefItem::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*N*/ 										BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2548,7 +2548,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
> /*N*/ 	return bRet;
> /*N*/ }
> 
>-/*N*/ sal_Bool SvxCharReliefItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SvxCharReliefItem::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/ 										BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>diff --git a/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx b/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
>index 597a1c2..49d3155 100644
>--- a/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
>+++ b/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
>@@ -79,7 +79,7 @@ using namespace ::com::sun::star::text;
> 
> 
> 
>-/*N*/ sal_Bool SvxWritingModeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SvxWritingModeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/ 											BYTE ) const
> /*N*/ {
> /*N*/ 	rVal <<= (WritingMode)GetValue();
>diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
>index 4d743a0..2da2b61 100644
>--- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
>+++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
>@@ -84,19 +84,19 @@ using namespace ::com::sun::star::xml;
> /*N*/ 	return USHRT_MAX;
> /*N*/ }
> 
>-/*N*/ BOOL  SvXMLAttrContainerItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool  SvXMLAttrContainerItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	Reference<XNameContainer> xContainer =
> /*N*/ 		new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
>-/*N*/ 
>+/*N*/
> /*N*/ 	rVal.setValue( &xContainer, ::getCppuType((Reference<XNameContainer>*)0) );
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
>-/*N*/ BOOL SvXMLAttrContainerItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SvXMLAttrContainerItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*NBFF*/{
> /*NBFF*/ 	Reference<XInterface> xRef;
> /*NBFF*/ 	SvUnoAttributeContainer* pContainer = NULL;
>-/*NBFF*/ 
>+/*NBFF*/
> /*NBFF*/ 	if( rVal.getValue() != NULL && rVal.getValueType().getTypeClass() == TypeClass_INTERFACE )
> /*NBFF*/ 	{
> /*NBFF*/ 		xRef = *(Reference<XInterface>*)rVal.getValue();
>@@ -118,7 +118,7 @@ using namespace ::com::sun::star::xml;
> /*NBFF*/ 		{
> /*NBFF*/ 			Reference<XNameContainer> xContainer( xRef, UNO_QUERY );
> /*NBFF*/ 			if( !xContainer.is() )
>-/*NBFF*/ 				return FALSE;
>+/*NBFF*/ 				return false;
> /*NBFF*/ 
> /*NBFF*/ 			const Sequence< OUString > aNameSequence( xContainer->getElementNames() );
> /*NBFF*/ 			const OUString* pNames = aNameSequence.getConstArray();
>@@ -132,7 +132,7 @@ using namespace ::com::sun::star::xml;
> /*NBFF*/ 
> /*NBFF*/ 				aAny = xContainer->getByName( aName );
> /*NBFF*/ 				if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) )
>-/*NBFF*/ 					return FALSE;
>+/*NBFF*/ 					return false;
> /*NBFF*/ 
> /*NBFF*/ 				pData = (AttributeData*)aAny.getValue();
> /*NBFF*/ 				USHORT pos = aName.indexOf( sal_Unicode(':') );
>@@ -163,7 +163,7 @@ using namespace ::com::sun::star::xml;
> /*NBFF*/ 			{
> /*NBFF*/ 				delete pImpl;
> /*NBFF*/ 				pImpl = pNewImpl;
>-/*NBFF*/ 				return FALSE;
>+/*NBFF*/ 				return false;
> /*NBFF*/ 			}
> /*NBFF*/ 			else
> /*NBFF*/ 			{
>@@ -173,10 +173,10 @@ using namespace ::com::sun::star::xml;
> /*NBFF*/ 		catch(...)
> /*NBFF*/ 		{
> /*NBFF*/ 			delete pNewImpl;
>-/*NBFF*/ 			return FALSE;
>+/*NBFF*/ 			return false;
> /*NBFF*/ 		}
> /*NBFF*/ 	}
>-/*NBFF*/ 	return TRUE;
>+/*NBFF*/ 	return true;
> /*N*/ }
> 
> 
>diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
>index 080019f..a5bbb03 100644
>--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
>+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
>@@ -115,7 +115,7 @@
> #include <svx3ditems.hxx>
> #endif
> #ifndef _LEGACYBINFILTERMGR_HXX
>-#include <legacysmgr/legacy_binfilters_smgr.hxx>	//STRIP002 
>+#include <legacysmgr/legacy_binfilters_smgr.hxx>    //STRIP002
> #endif
> namespace binfilter {
> 
>@@ -128,321 +128,321 @@ using namespace ::com::sun::star;
> |*
> \************************************************************************/
> 
>-/*N*/ SdrItemPool::SdrItemPool(USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
>-/*N*/ 	XOutdevItemPool(nAttrStart,nAttrEnd,bLoadRefCounts)
>-/*N*/ {
>-/*N*/ 	Ctor(NULL,nAttrStart,nAttrEnd);
>-/*N*/ }
>-
>-/*N*/ SdrItemPool::SdrItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
>-/*N*/ 	XOutdevItemPool(pMaster,nAttrStart,nAttrEnd,bLoadRefCounts)
>-/*N*/ {
>-/*N*/ 	Ctor(pMaster,nAttrStart,nAttrEnd);
>-/*N*/ }
>-
>-/*N*/ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
>-/*N*/ {
>-/*N*/ 	if (pMaster==NULL) {
>-/*N*/ 		pMaster=this;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	Color aNullCol(RGB_Color(COL_BLACK));
>-/*N*/ 	XubString aEmptyStr;
>-/*N*/ 
>-/*N*/ 	USHORT i;
>-/*N*/ 	for (i=SDRATTR_NOTPERSIST_FIRST; i<=SDRATTR_NOTPERSIST_LAST; i++) {
>-/*N*/ 		pItemInfos[i-SDRATTR_START]._nFlags=0;
>-/*N*/ 	}
>-/*N*/ 	// Schatten
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOW            -SDRATTR_START]=new SdrShadowItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOWCOLOR       -SDRATTR_START]=new SdrShadowColorItem(aEmptyStr,aNullCol);
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOWXDIST       -SDRATTR_START]=new SdrShadowXDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOWYDIST       -SDRATTR_START]=new SdrShadowYDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOWTRANSPARENCE-SDRATTR_START]=new SdrShadowTransparenceItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOW3D          -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOW3D    );
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHADOWPERSP       -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOWPERSP );
>-/*N*/ 	for (i=SDRATTR_SHADOWRESERVE1; i<=SDRATTR_SHADOWRESERVE5; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_SHADOW-SDRATTR_START]=new SdrShadowSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	// SID_ATTR_FILL_SHADOW = SID_SVX_START+299 = SID_LIB_START+299 = 10299
>-/*N*/ 	pItemInfos[SDRATTR_SHADOW-SDRATTR_START]._nSID=SID_ATTR_FILL_SHADOW;
>-/*N*/ 
>-/*N*/ 	// Legendenobjekt
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONTYPE      -SDRATTR_START]=new SdrCaptionTypeItem      ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new SdrCaptionFixedAngleItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONANGLE     -SDRATTR_START]=new SdrCaptionAngleItem     ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONGAP       -SDRATTR_START]=new SdrCaptionGapItem       ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONESCDIR    -SDRATTR_START]=new SdrCaptionEscDirItem    ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONESCISREL  -SDRATTR_START]=new SdrCaptionEscIsRelItem  ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONESCREL    -SDRATTR_START]=new SdrCaptionEscRelItem    ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONESCABS    -SDRATTR_START]=new SdrCaptionEscAbsItem    ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONLINELEN   -SDRATTR_START]=new SdrCaptionLineLenItem   ;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new SdrCaptionFitLineLenItem;
>-/*N*/ 	for (i=SDRATTR_CAPTIONRESERVE1; i<=SDRATTR_CAPTIONRESERVE5; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_CAPTION-SDRATTR_START]=new SdrCaptionSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	// Outliner-Attribute
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_OUTLINER-SDRATTR_START]=new SdrOutlinerSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	// Misc-Attribute
>-/*N*/ 	ppPoolDefaults[SDRATTR_ECKENRADIUS			-SDRATTR_START]=new SdrEckenradiusItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT	-SDRATTR_START]=new SdrTextMinFrameHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT	-SDRATTR_START]=new SdrTextAutoGrowHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_FITTOSIZE		-SDRATTR_START]=new SdrTextFitToSizeTypeItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_LEFTDIST		-SDRATTR_START]=new SdrTextLeftDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_RIGHTDIST		-SDRATTR_START]=new SdrTextRightDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_UPPERDIST		-SDRATTR_START]=new SdrTextUpperDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_LOWERDIST		-SDRATTR_START]=new SdrTextLowerDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_VERTADJUST		-SDRATTR_START]=new SdrTextVertAdjustItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT	-SDRATTR_START]=new SdrTextMaxFrameHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH	-SDRATTR_START]=new SdrTextMinFrameWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH	-SDRATTR_START]=new SdrTextMaxFrameWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_AUTOGROWWIDTH	-SDRATTR_START]=new SdrTextAutoGrowWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_HORZADJUST		-SDRATTR_START]=new SdrTextHorzAdjustItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANIKIND			-SDRATTR_START]=new SdrTextAniKindItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANIDIRECTION	-SDRATTR_START]=new SdrTextAniDirectionItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANISTARTINSIDE	-SDRATTR_START]=new SdrTextAniStartInsideItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANISTOPINSIDE	-SDRATTR_START]=new SdrTextAniStopInsideItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANICOUNT		-SDRATTR_START]=new SdrTextAniCountItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANIDELAY		-SDRATTR_START]=new SdrTextAniDelayItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_ANIAMOUNT		-SDRATTR_START]=new SdrTextAniAmountItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXT_CONTOURFRAME	-SDRATTR_START]=new SdrTextContourFrameItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_AUTOSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrAutoShapeAdjustmentItem;
>-/*N*/ #ifndef SVX_LIGHT
>-/*N*/ 	ppPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES );
>-/*N*/ #else
>-/*N*/     // no need to have alien attributes persistent in the player
>-/*N*/ 	ppPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SfxVoidItem( SDRATTR_XMLATTRIBUTES );
>-/*N*/ #endif // #ifndef SVX_LIGHT
>-/*N*/ 	for (i=SDRATTR_RESERVE15; i<=SDRATTR_RESERVE19; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_MISC-SDRATTR_START]=new SdrMiscSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	pItemInfos[SDRATTR_TEXT_FITTOSIZE-SDRATTR_START]._nSID=SID_ATTR_TEXT_FITTOSIZE;
>-/*N*/ 
>-/*N*/ 	// Objektverbinder
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGEKIND         -SDRATTR_START]=new SdrEdgeKindItem;
>-/*N*/ 	long nDefEdgeDist=500; // Erstmal hart defaulted fuer Draw (100TH_MM). hier muss noch der MapMode beruecksichtigt werden.
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist);
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE1VERTDIST-SDRATTR_START]=new SdrEdgeNode1VertDistItem(nDefEdgeDist);
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE2HORZDIST-SDRATTR_START]=new SdrEdgeNode2HorzDistItem(nDefEdgeDist);
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE2VERTDIST-SDRATTR_START]=new SdrEdgeNode2VertDistItem(nDefEdgeDist);
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaAnzItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGELINE1DELTA   -SDRATTR_START]=new SdrEdgeLine1DeltaItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGELINE2DELTA   -SDRATTR_START]=new SdrEdgeLine2DeltaItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_EDGELINE3DELTA   -SDRATTR_START]=new SdrEdgeLine3DeltaItem;
>-/*N*/ 	for (i=SDRATTR_EDGERESERVE02; i<=SDRATTR_EDGERESERVE09; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_EDGE-SDRATTR_START]=new SdrEdgeSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	 // Bemassungsobjekt
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREKIND             -SDRATTR_START]=new SdrMeasureKindItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTHPOS         -SDRATTR_START]=new SdrMeasureTextHPosItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTVPOS         -SDRATTR_START]=new SdrMeasureTextVPosItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURELINEDIST         -SDRATTR_START]=new SdrMeasureLineDistItem(800);
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREHELPLINEOVERHANG -SDRATTR_START]=new SdrMeasureHelplineOverhangItem(200);
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREHELPLINEDIST     -SDRATTR_START]=new SdrMeasureHelplineDistItem(100);
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREHELPLINE1LEN     -SDRATTR_START]=new SdrMeasureHelpline1LenItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREHELPLINE2LEN     -SDRATTR_START]=new SdrMeasureHelpline2LenItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREBELOWREFEDGE     -SDRATTR_START]=new SdrMeasureBelowRefEdgeItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTROTA90       -SDRATTR_START]=new SdrMeasureTextRota90Item;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTUPSIDEDOWN   -SDRATTR_START]=new SdrMeasureTextUpsideDownItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREOVERHANG         -SDRATTR_START]=new SdrMeasureOverhangItem(600);
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREUNIT             -SDRATTR_START]=new SdrMeasureUnitItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURESCALE            -SDRATTR_START]=new SdrMeasureScaleItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURESHOWUNIT         -SDRATTR_START]=new SdrMeasureShowUnitItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREFORMATSTRING     -SDRATTR_START]=new SdrMeasureFormatStringItem();
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTAUTOANGLE    -SDRATTR_START]=new SdrMeasureTextAutoAngleItem();
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTAUTOANGLEVIEW-SDRATTR_START]=new SdrMeasureTextAutoAngleViewItem();
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTISFIXEDANGLE -SDRATTR_START]=new SdrMeasureTextIsFixedAngleItem();
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASURETEXTFIXEDANGLE   -SDRATTR_START]=new SdrMeasureTextFixedAngleItem();
>-/*N*/ 	ppPoolDefaults[SDRATTR_MEASUREDECIMALPLACES    -SDRATTR_START]=new SdrMeasureDecimalPlacesItem();
>-/*N*/ 	for (i=SDRATTR_MEASURERESERVE05; i<=SDRATTR_MEASURERESERVE07; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_MEASURE-SDRATTR_START]=new SdrMeasureSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	 // Kreis
>-/*N*/ 	ppPoolDefaults[SDRATTR_CIRCKIND      -SDRATTR_START]=new SdrCircKindItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrCircStartAngleItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_CIRCENDANGLE  -SDRATTR_START]=new SdrCircEndAngleItem;
>-/*N*/ 	for (i=SDRATTR_CIRCRESERVE0; i<=SDRATTR_CIRCRESERVE3; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 	ppPoolDefaults[SDRATTRSET_CIRC-SDRATTR_START]=new SdrCircSetItem(pMaster);
>-/*N*/ 
>-/*N*/ 	 // Nichtpersistente-Items
>-/*N*/ 	ppPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrObjMoveProtectItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrObjSizeProtectItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_OBJPRINTABLE   -SDRATTR_START]=new SdrObjPrintableItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_LAYERID        -SDRATTR_START]=new SdrLayerIdItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_LAYERNAME      -SDRATTR_START]=new SdrLayerNameItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_OBJECTNAME     -SDRATTR_START]=new SdrObjectNameItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ALLPOSITIONX   -SDRATTR_START]=new SdrAllPositionXItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ALLPOSITIONY   -SDRATTR_START]=new SdrAllPositionYItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ALLSIZEWIDTH   -SDRATTR_START]=new SdrAllSizeWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ALLSIZEHEIGHT  -SDRATTR_START]=new SdrAllSizeHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ONEPOSITIONX   -SDRATTR_START]=new SdrOnePositionXItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ONEPOSITIONY   -SDRATTR_START]=new SdrOnePositionYItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ONESIZEWIDTH   -SDRATTR_START]=new SdrOneSizeWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ONESIZEHEIGHT  -SDRATTR_START]=new SdrOneSizeHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_LOGICSIZEWIDTH -SDRATTR_START]=new SdrLogicSizeWidthItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_LOGICSIZEHEIGHT-SDRATTR_START]=new SdrLogicSizeHeightItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ROTATEANGLE    -SDRATTR_START]=new SdrRotateAngleItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_SHEARANGLE     -SDRATTR_START]=new SdrShearAngleItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MOVEX          -SDRATTR_START]=new SdrMoveXItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_MOVEY          -SDRATTR_START]=new SdrMoveYItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_RESIZEXONE     -SDRATTR_START]=new SdrResizeXOneItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_RESIZEYONE     -SDRATTR_START]=new SdrResizeYOneItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ROTATEONE      -SDRATTR_START]=new SdrRotateOneItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_HORZSHEARONE   -SDRATTR_START]=new SdrHorzShearOneItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_VERTSHEARONE   -SDRATTR_START]=new SdrVertShearOneItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_RESIZEXALL     -SDRATTR_START]=new SdrResizeXAllItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_RESIZEYALL     -SDRATTR_START]=new SdrResizeYAllItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_ROTATEALL      -SDRATTR_START]=new SdrRotateAllItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_HORZSHEARALL   -SDRATTR_START]=new SdrHorzShearAllItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_VERTSHEARALL   -SDRATTR_START]=new SdrVertShearAllItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TRANSFORMREF1X -SDRATTR_START]=new SdrTransformRef1XItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TRANSFORMREF1Y -SDRATTR_START]=new SdrTransformRef1YItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TRANSFORMREF2X -SDRATTR_START]=new SdrTransformRef2XItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TRANSFORMREF2Y -SDRATTR_START]=new SdrTransformRef2YItem;
>-/*N*/ 	ppPoolDefaults[SDRATTR_TEXTDIRECTION  -SDRATTR_START]=new SvxWritingModeItem;
>-/*N*/ 
>-/*N*/ 	for (i=SDRATTR_NOTPERSISTRESERVE2; i<=SDRATTR_NOTPERSISTRESERVE15; i++) {
>-/*N*/ 		ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	// Grafik
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFRED				- SDRATTR_START] = new SdrGrafRedItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFGREEN			- SDRATTR_START] = new SdrGrafGreenItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFBLUE			- SDRATTR_START] = new SdrGrafBlueItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFLUMINANCE		- SDRATTR_START] = new SdrGrafLuminanceItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFCONTRAST		- SDRATTR_START] = new SdrGrafContrastItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFGAMMA			- SDRATTR_START] = new SdrGrafGamma100Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFTRANSPARENCE	- SDRATTR_START] = new SdrGrafTransparenceItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFINVERT			- SDRATTR_START] = new SdrGrafInvertItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFMODE			- SDRATTR_START] = new SdrGrafModeItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_GRAFCROP			- SDRATTR_START] = new SdrGrafCropItem;
>-/*N*/ 	for( i = SDRATTR_GRAFRESERVE3; i <= SDRATTR_GRAFRESERVE6; i++ )
>-/*N*/ 		ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>-/*N*/ 	ppPoolDefaults[ SDRATTRSET_GRAF - SDRATTR_START ] = new SdrGrafSetItem( pMaster );
>-/*N*/ 	pItemInfos[SDRATTR_GRAFCROP-SDRATTR_START]._nSID=SID_ATTR_GRAF_CROP;
>-/*N*/ 
>-/*N*/ 	// 3D Object Attr (28092000 AW)
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_PERCENT_DIAGONAL - SDRATTR_START ] = new Svx3DPercentDiagonalItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_BACKSCALE - SDRATTR_START ] = new Svx3DBackscaleItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_DEPTH - SDRATTR_START ] = new Svx3DDepthItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_HORZ_SEGS - SDRATTR_START ] = new Svx3DHorizontalSegmentsItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_VERT_SEGS - SDRATTR_START ] = new Svx3DVerticalSegmentsItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_END_ANGLE - SDRATTR_START ] = new Svx3DEndAngleItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_DOUBLE_SIDED - SDRATTR_START ] = new Svx3DDoubleSidedItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_NORMALS_KIND - SDRATTR_START ] = new Svx3DNormalsKindItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_NORMALS_INVERT - SDRATTR_START ] = new Svx3DNormalsInvertItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_X - SDRATTR_START ] = new Svx3DTextureProjectionXItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_Y - SDRATTR_START ] = new Svx3DTextureProjectionYItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_SHADOW_3D - SDRATTR_START ] = new Svx3DShadow3DItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_MAT_COLOR - SDRATTR_START ] = new Svx3DMaterialColorItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_MAT_EMISSION - SDRATTR_START ] = new Svx3DMaterialEmissionItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR - SDRATTR_START ] = new Svx3DMaterialSpecularItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY - SDRATTR_START ] = new Svx3DMaterialSpecularIntensityItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_KIND - SDRATTR_START ] = new Svx3DTextureKindItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_MODE - SDRATTR_START ] = new Svx3DTextureModeItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_FILTER - SDRATTR_START ] = new Svx3DTextureFilterItem;
>-/*N*/ 
>-/*N*/ 	// #107245# Add new items for 3d objects
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_NORMALS - SDRATTR_START ] = new Svx3DSmoothNormalsItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_LIDS - SDRATTR_START ] = new Svx3DSmoothLidsItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_CHARACTER_MODE - SDRATTR_START ] = new Svx3DCharacterModeItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_FRONT - SDRATTR_START ] = new Svx3DCloseFrontItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_BACK - SDRATTR_START ] = new Svx3DCloseBackItem;
>-/*N*/ 
>-/*N*/ 	// #107245# Start with SDRATTR_3DOBJ_RESERVED_06 now
>-/*N*/ 	for( i = SDRATTR_3DOBJ_RESERVED_06; i <= SDRATTR_3DOBJ_RESERVED_20; i++ )
>-/*N*/ 		ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>-/*N*/ 
>-/*N*/ 	// 3D Scene Attr (28092000 AW)
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_PERSPECTIVE - SDRATTR_START ] = new Svx3DPerspectiveItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_DISTANCE - SDRATTR_START ] = new Svx3DDistanceItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_FOCAL_LENGTH - SDRATTR_START ] = new Svx3DFocalLengthItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_TWO_SIDED_LIGHTING - SDRATTR_START ] = new Svx3DTwoSidedLightingItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_1 - SDRATTR_START ] = new Svx3DLightcolor1Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_2 - SDRATTR_START ] = new Svx3DLightcolor2Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_3 - SDRATTR_START ] = new Svx3DLightcolor3Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_4 - SDRATTR_START ] = new Svx3DLightcolor4Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_5 - SDRATTR_START ] = new Svx3DLightcolor5Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_6 - SDRATTR_START ] = new Svx3DLightcolor6Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_7 - SDRATTR_START ] = new Svx3DLightcolor7Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_8 - SDRATTR_START ] = new Svx3DLightcolor8Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_AMBIENTCOLOR - SDRATTR_START ] = new Svx3DAmbientcolorItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_1 - SDRATTR_START ] = new Svx3DLightOnOff1Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_2 - SDRATTR_START ] = new Svx3DLightOnOff2Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_3 - SDRATTR_START ] = new Svx3DLightOnOff3Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_4 - SDRATTR_START ] = new Svx3DLightOnOff4Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_5 - SDRATTR_START ] = new Svx3DLightOnOff5Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_6 - SDRATTR_START ] = new Svx3DLightOnOff6Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_7 - SDRATTR_START ] = new Svx3DLightOnOff7Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_8 - SDRATTR_START ] = new Svx3DLightOnOff8Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_1 - SDRATTR_START ] = new Svx3DLightDirection1Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_2 - SDRATTR_START ] = new Svx3DLightDirection2Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_3 - SDRATTR_START ] = new Svx3DLightDirection3Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_4 - SDRATTR_START ] = new Svx3DLightDirection4Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_5 - SDRATTR_START ] = new Svx3DLightDirection5Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_6 - SDRATTR_START ] = new Svx3DLightDirection6Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_7 - SDRATTR_START ] = new Svx3DLightDirection7Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_8 - SDRATTR_START ] = new Svx3DLightDirection8Item;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_SHADOW_SLANT - SDRATTR_START ] = new Svx3DShadowSlantItem;
>-/*N*/ 	ppPoolDefaults[ SDRATTR_3DSCENE_SHADE_MODE - SDRATTR_START ] = new Svx3DShadeModeItem;
>-/*N*/ 
>-/*N*/ 	for( i = SDRATTR_3DSCENE_RESERVED_01; i <= SDRATTR_3DSCENE_RESERVED_20; i++ )
>-/*N*/ 		ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>-/*N*/ 
>-/*N*/ 	////////////////////////////////
>-/*N*/ #ifdef DBG_UTIL
>-/*N*/ 	UINT16 nAnz(SDRATTR_END-SDRATTR_START + 1);
>-/*N*/ 
>-/*N*/ 	for(UINT16 nNum = 0; nNum < nAnz; nNum++)
>-/*N*/ 	{
>-/*N*/ 		const SfxPoolItem* pItem = ppPoolDefaults[nNum];
>-/*N*/ 
>-/*N*/ 		if(!pItem)
>-/*N*/ 		{
>-/*?*/ 			ByteString aStr("PoolDefaultItem not set: ");
>-/*?*/ 
>-/*?*/ 			aStr += "Num=";
>-/*?*/ 			aStr += ByteString::CreateFromInt32( nNum );
>-/*?*/ 			aStr += "Which=";
>-/*?*/ 			aStr += ByteString::CreateFromInt32( nNum + 1000 );
>-/*?*/ 
>-/*?*/ 			DBG_ERROR(aStr.GetBuffer());
>-/*N*/ 		}
>-/*N*/ 		else if(pItem->Which() != nNum + 1000)
>-/*N*/ 		{
>-/*?*/ 			ByteString aStr("PoolDefaultItem has wrong WhichId: ");
>-/*?*/ 
>-/*?*/ 			aStr += "Num=";
>-/*?*/ 			aStr += ByteString::CreateFromInt32( nNum );
>-/*?*/ 			aStr += " Which=";
>-/*?*/ 			aStr += ByteString::CreateFromInt32( pItem->Which() );
>-/*?*/ 
>-/*?*/ 			DBG_ERROR(aStr.GetBuffer());
>-/*N*/ 		}
>-/*N*/ 	}
>-/*N*/ #endif
>-/*N*/ 
>-/*N*/ 	if (nAttrStart==SDRATTR_START && nAttrEnd==SDRATTR_END) {
>-/*N*/ 		SetDefaults(ppPoolDefaults);
>-/*N*/ 		SetItemInfos(pItemInfos);
>-/*N*/ 	}
>-/*N*/ }
>+SdrItemPool::SdrItemPool(USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
>+    XOutdevItemPool(nAttrStart,nAttrEnd,bLoadRefCounts)
>+{
>+    Ctor(NULL,nAttrStart,nAttrEnd);
>+}
>+
>+SdrItemPool::SdrItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
>+    XOutdevItemPool(pMaster,nAttrStart,nAttrEnd,bLoadRefCounts)
>+{
>+    Ctor(pMaster,nAttrStart,nAttrEnd);
>+}
>+
>+void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
>+{
>+    if (pMaster==NULL) {
>+        pMaster=this;
>+    }
>+
>+    Color aNullCol(RGB_Color(COL_BLACK));
>+    XubString aEmptyStr;
>+
>+    USHORT i;
>+    for (i=SDRATTR_NOTPERSIST_FIRST; i<=SDRATTR_NOTPERSIST_LAST; i++) {
>+        pItemInfos[i-SDRATTR_START]._nFlags=0;
>+    }
>+    // Schatten
>+    ppPoolDefaults[SDRATTR_SHADOW            -SDRATTR_START]=new SdrShadowItem;
>+    ppPoolDefaults[SDRATTR_SHADOWCOLOR       -SDRATTR_START]=new SdrShadowColorItem(aEmptyStr,aNullCol);
>+    ppPoolDefaults[SDRATTR_SHADOWXDIST       -SDRATTR_START]=new SdrShadowXDistItem;
>+    ppPoolDefaults[SDRATTR_SHADOWYDIST       -SDRATTR_START]=new SdrShadowYDistItem;
>+    ppPoolDefaults[SDRATTR_SHADOWTRANSPARENCE-SDRATTR_START]=new SdrShadowTransparenceItem;
>+    ppPoolDefaults[SDRATTR_SHADOW3D          -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOW3D    );
>+    ppPoolDefaults[SDRATTR_SHADOWPERSP       -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOWPERSP );
>+    for (i=SDRATTR_SHADOWRESERVE1; i<=SDRATTR_SHADOWRESERVE5; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+
>+    ppPoolDefaults[SDRATTRSET_SHADOW-SDRATTR_START]=new SdrShadowSetItem(pMaster);
>+
>+    // SID_ATTR_FILL_SHADOW = SID_SVX_START+299 = SID_LIB_START+299 = 10299
>+    pItemInfos[SDRATTR_SHADOW-SDRATTR_START]._nSID=SID_ATTR_FILL_SHADOW;
>+
>+    // Legendenobjekt
>+    ppPoolDefaults[SDRATTR_CAPTIONTYPE      -SDRATTR_START]=new SdrCaptionTypeItem      ;
>+    ppPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new SdrCaptionFixedAngleItem;
>+    ppPoolDefaults[SDRATTR_CAPTIONANGLE     -SDRATTR_START]=new SdrCaptionAngleItem     ;
>+    ppPoolDefaults[SDRATTR_CAPTIONGAP       -SDRATTR_START]=new SdrCaptionGapItem       ;
>+    ppPoolDefaults[SDRATTR_CAPTIONESCDIR    -SDRATTR_START]=new SdrCaptionEscDirItem    ;
>+    ppPoolDefaults[SDRATTR_CAPTIONESCISREL  -SDRATTR_START]=new SdrCaptionEscIsRelItem  ;
>+    ppPoolDefaults[SDRATTR_CAPTIONESCREL    -SDRATTR_START]=new SdrCaptionEscRelItem    ;
>+    ppPoolDefaults[SDRATTR_CAPTIONESCABS    -SDRATTR_START]=new SdrCaptionEscAbsItem    ;
>+    ppPoolDefaults[SDRATTR_CAPTIONLINELEN   -SDRATTR_START]=new SdrCaptionLineLenItem   ;
>+    ppPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new SdrCaptionFitLineLenItem;
>+    for (i=SDRATTR_CAPTIONRESERVE1; i<=SDRATTR_CAPTIONRESERVE5; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+    ppPoolDefaults[SDRATTRSET_CAPTION-SDRATTR_START]=new SdrCaptionSetItem(pMaster);
>+
>+    // Outliner-Attribute
>+    ppPoolDefaults[SDRATTRSET_OUTLINER-SDRATTR_START]=new SdrOutlinerSetItem(pMaster);
>+
>+    // Misc-Attribute
>+    ppPoolDefaults[SDRATTR_ECKENRADIUS          -SDRATTR_START]=new SdrEckenradiusItem;
>+    ppPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT  -SDRATTR_START]=new SdrTextMinFrameHeightItem;
>+    ppPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT  -SDRATTR_START]=new SdrTextAutoGrowHeightItem;
>+    ppPoolDefaults[SDRATTR_TEXT_FITTOSIZE       -SDRATTR_START]=new SdrTextFitToSizeTypeItem;
>+    ppPoolDefaults[SDRATTR_TEXT_LEFTDIST        -SDRATTR_START]=new SdrTextLeftDistItem;
>+    ppPoolDefaults[SDRATTR_TEXT_RIGHTDIST       -SDRATTR_START]=new SdrTextRightDistItem;
>+    ppPoolDefaults[SDRATTR_TEXT_UPPERDIST       -SDRATTR_START]=new SdrTextUpperDistItem;
>+    ppPoolDefaults[SDRATTR_TEXT_LOWERDIST       -SDRATTR_START]=new SdrTextLowerDistItem;
>+    ppPoolDefaults[SDRATTR_TEXT_VERTADJUST      -SDRATTR_START]=new SdrTextVertAdjustItem;
>+    ppPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT  -SDRATTR_START]=new SdrTextMaxFrameHeightItem;
>+    ppPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH   -SDRATTR_START]=new SdrTextMinFrameWidthItem;
>+    ppPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH   -SDRATTR_START]=new SdrTextMaxFrameWidthItem;
>+    ppPoolDefaults[SDRATTR_TEXT_AUTOGROWWIDTH   -SDRATTR_START]=new SdrTextAutoGrowWidthItem;
>+    ppPoolDefaults[SDRATTR_TEXT_HORZADJUST      -SDRATTR_START]=new SdrTextHorzAdjustItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANIKIND         -SDRATTR_START]=new SdrTextAniKindItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANIDIRECTION    -SDRATTR_START]=new SdrTextAniDirectionItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANISTARTINSIDE  -SDRATTR_START]=new SdrTextAniStartInsideItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANISTOPINSIDE   -SDRATTR_START]=new SdrTextAniStopInsideItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANICOUNT        -SDRATTR_START]=new SdrTextAniCountItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANIDELAY        -SDRATTR_START]=new SdrTextAniDelayItem;
>+    ppPoolDefaults[SDRATTR_TEXT_ANIAMOUNT       -SDRATTR_START]=new SdrTextAniAmountItem;
>+    ppPoolDefaults[SDRATTR_TEXT_CONTOURFRAME    -SDRATTR_START]=new SdrTextContourFrameItem;
>+    ppPoolDefaults[SDRATTR_AUTOSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrAutoShapeAdjustmentItem;
>+#ifndef SVX_LIGHT
>+    ppPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES );
>+#else
>+    // no need to have alien attributes persistent in the player
>+    ppPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SfxVoidItem( SDRATTR_XMLATTRIBUTES );
>+#endif // #ifndef SVX_LIGHT
>+    for (i=SDRATTR_RESERVE15; i<=SDRATTR_RESERVE19; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+    ppPoolDefaults[SDRATTRSET_MISC-SDRATTR_START]=new SdrMiscSetItem(pMaster);
>+
>+    pItemInfos[SDRATTR_TEXT_FITTOSIZE-SDRATTR_START]._nSID=SID_ATTR_TEXT_FITTOSIZE;
>+
>+    // Objektverbinder
>+    ppPoolDefaults[SDRATTR_EDGEKIND         -SDRATTR_START]=new SdrEdgeKindItem;
>+    long nDefEdgeDist=500; // Erstmal hart defaulted fuer Draw (100TH_MM). hier muss noch der MapMode beruecksichtigt werden.
>+    ppPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist);
>+    ppPoolDefaults[SDRATTR_EDGENODE1VERTDIST-SDRATTR_START]=new SdrEdgeNode1VertDistItem(nDefEdgeDist);
>+    ppPoolDefaults[SDRATTR_EDGENODE2HORZDIST-SDRATTR_START]=new SdrEdgeNode2HorzDistItem(nDefEdgeDist);
>+    ppPoolDefaults[SDRATTR_EDGENODE2VERTDIST-SDRATTR_START]=new SdrEdgeNode2VertDistItem(nDefEdgeDist);
>+    ppPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem;
>+    ppPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem;
>+    ppPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaAnzItem;
>+    ppPoolDefaults[SDRATTR_EDGELINE1DELTA   -SDRATTR_START]=new SdrEdgeLine1DeltaItem;
>+    ppPoolDefaults[SDRATTR_EDGELINE2DELTA   -SDRATTR_START]=new SdrEdgeLine2DeltaItem;
>+    ppPoolDefaults[SDRATTR_EDGELINE3DELTA   -SDRATTR_START]=new SdrEdgeLine3DeltaItem;
>+    for (i=SDRATTR_EDGERESERVE02; i<=SDRATTR_EDGERESERVE09; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+    ppPoolDefaults[SDRATTRSET_EDGE-SDRATTR_START]=new SdrEdgeSetItem(pMaster);
>+
>+    // Bemassungsobjekt
>+    ppPoolDefaults[SDRATTR_MEASUREKIND             -SDRATTR_START]=new SdrMeasureKindItem;
>+    ppPoolDefaults[SDRATTR_MEASURETEXTHPOS         -SDRATTR_START]=new SdrMeasureTextHPosItem;
>+    ppPoolDefaults[SDRATTR_MEASURETEXTVPOS         -SDRATTR_START]=new SdrMeasureTextVPosItem;
>+    ppPoolDefaults[SDRATTR_MEASURELINEDIST         -SDRATTR_START]=new SdrMeasureLineDistItem(800);
>+    ppPoolDefaults[SDRATTR_MEASUREHELPLINEOVERHANG -SDRATTR_START]=new SdrMeasureHelplineOverhangItem(200);
>+    ppPoolDefaults[SDRATTR_MEASUREHELPLINEDIST     -SDRATTR_START]=new SdrMeasureHelplineDistItem(100);
>+    ppPoolDefaults[SDRATTR_MEASUREHELPLINE1LEN     -SDRATTR_START]=new SdrMeasureHelpline1LenItem;
>+    ppPoolDefaults[SDRATTR_MEASUREHELPLINE2LEN     -SDRATTR_START]=new SdrMeasureHelpline2LenItem;
>+    ppPoolDefaults[SDRATTR_MEASUREBELOWREFEDGE     -SDRATTR_START]=new SdrMeasureBelowRefEdgeItem;
>+    ppPoolDefaults[SDRATTR_MEASURETEXTROTA90       -SDRATTR_START]=new SdrMeasureTextRota90Item;
>+    ppPoolDefaults[SDRATTR_MEASURETEXTUPSIDEDOWN   -SDRATTR_START]=new SdrMeasureTextUpsideDownItem;
>+    ppPoolDefaults[SDRATTR_MEASUREOVERHANG         -SDRATTR_START]=new SdrMeasureOverhangItem(600);
>+    ppPoolDefaults[SDRATTR_MEASUREUNIT             -SDRATTR_START]=new SdrMeasureUnitItem;
>+    ppPoolDefaults[SDRATTR_MEASURESCALE            -SDRATTR_START]=new SdrMeasureScaleItem;
>+    ppPoolDefaults[SDRATTR_MEASURESHOWUNIT         -SDRATTR_START]=new SdrMeasureShowUnitItem;
>+    ppPoolDefaults[SDRATTR_MEASUREFORMATSTRING     -SDRATTR_START]=new SdrMeasureFormatStringItem();
>+    ppPoolDefaults[SDRATTR_MEASURETEXTAUTOANGLE    -SDRATTR_START]=new SdrMeasureTextAutoAngleItem();
>+    ppPoolDefaults[SDRATTR_MEASURETEXTAUTOANGLEVIEW-SDRATTR_START]=new SdrMeasureTextAutoAngleViewItem();
>+    ppPoolDefaults[SDRATTR_MEASURETEXTISFIXEDANGLE -SDRATTR_START]=new SdrMeasureTextIsFixedAngleItem();
>+    ppPoolDefaults[SDRATTR_MEASURETEXTFIXEDANGLE   -SDRATTR_START]=new SdrMeasureTextFixedAngleItem();
>+    ppPoolDefaults[SDRATTR_MEASUREDECIMALPLACES    -SDRATTR_START]=new SdrMeasureDecimalPlacesItem();
>+    for (i=SDRATTR_MEASURERESERVE05; i<=SDRATTR_MEASURERESERVE07; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+    ppPoolDefaults[SDRATTRSET_MEASURE-SDRATTR_START]=new SdrMeasureSetItem(pMaster);
>+
>+    // Kreis
>+    ppPoolDefaults[SDRATTR_CIRCKIND      -SDRATTR_START]=new SdrCircKindItem;
>+    ppPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrCircStartAngleItem;
>+    ppPoolDefaults[SDRATTR_CIRCENDANGLE  -SDRATTR_START]=new SdrCircEndAngleItem;
>+    for (i=SDRATTR_CIRCRESERVE0; i<=SDRATTR_CIRCRESERVE3; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+    ppPoolDefaults[SDRATTRSET_CIRC-SDRATTR_START]=new SdrCircSetItem(pMaster);
>+
>+    // Nichtpersistente-Items
>+    ppPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrObjMoveProtectItem;
>+    ppPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrObjSizeProtectItem;
>+    ppPoolDefaults[SDRATTR_OBJPRINTABLE   -SDRATTR_START]=new SdrObjPrintableItem;
>+    ppPoolDefaults[SDRATTR_LAYERID        -SDRATTR_START]=new SdrLayerIdItem;
>+    ppPoolDefaults[SDRATTR_LAYERNAME      -SDRATTR_START]=new SdrLayerNameItem;
>+    ppPoolDefaults[SDRATTR_OBJECTNAME     -SDRATTR_START]=new SdrObjectNameItem;
>+    ppPoolDefaults[SDRATTR_ALLPOSITIONX   -SDRATTR_START]=new SdrAllPositionXItem;
>+    ppPoolDefaults[SDRATTR_ALLPOSITIONY   -SDRATTR_START]=new SdrAllPositionYItem;
>+    ppPoolDefaults[SDRATTR_ALLSIZEWIDTH   -SDRATTR_START]=new SdrAllSizeWidthItem;
>+    ppPoolDefaults[SDRATTR_ALLSIZEHEIGHT  -SDRATTR_START]=new SdrAllSizeHeightItem;
>+    ppPoolDefaults[SDRATTR_ONEPOSITIONX   -SDRATTR_START]=new SdrOnePositionXItem;
>+    ppPoolDefaults[SDRATTR_ONEPOSITIONY   -SDRATTR_START]=new SdrOnePositionYItem;
>+    ppPoolDefaults[SDRATTR_ONESIZEWIDTH   -SDRATTR_START]=new SdrOneSizeWidthItem;
>+    ppPoolDefaults[SDRATTR_ONESIZEHEIGHT  -SDRATTR_START]=new SdrOneSizeHeightItem;
>+    ppPoolDefaults[SDRATTR_LOGICSIZEWIDTH -SDRATTR_START]=new SdrLogicSizeWidthItem;
>+    ppPoolDefaults[SDRATTR_LOGICSIZEHEIGHT-SDRATTR_START]=new SdrLogicSizeHeightItem;
>+    ppPoolDefaults[SDRATTR_ROTATEANGLE    -SDRATTR_START]=new SdrRotateAngleItem;
>+    ppPoolDefaults[SDRATTR_SHEARANGLE     -SDRATTR_START]=new SdrShearAngleItem;
>+    ppPoolDefaults[SDRATTR_MOVEX          -SDRATTR_START]=new SdrMoveXItem;
>+    ppPoolDefaults[SDRATTR_MOVEY          -SDRATTR_START]=new SdrMoveYItem;
>+    ppPoolDefaults[SDRATTR_RESIZEXONE     -SDRATTR_START]=new SdrResizeXOneItem;
>+    ppPoolDefaults[SDRATTR_RESIZEYONE     -SDRATTR_START]=new SdrResizeYOneItem;
>+    ppPoolDefaults[SDRATTR_ROTATEONE      -SDRATTR_START]=new SdrRotateOneItem;
>+    ppPoolDefaults[SDRATTR_HORZSHEARONE   -SDRATTR_START]=new SdrHorzShearOneItem;
>+    ppPoolDefaults[SDRATTR_VERTSHEARONE   -SDRATTR_START]=new SdrVertShearOneItem;
>+    ppPoolDefaults[SDRATTR_RESIZEXALL     -SDRATTR_START]=new SdrResizeXAllItem;
>+    ppPoolDefaults[SDRATTR_RESIZEYALL     -SDRATTR_START]=new SdrResizeYAllItem;
>+    ppPoolDefaults[SDRATTR_ROTATEALL      -SDRATTR_START]=new SdrRotateAllItem;
>+    ppPoolDefaults[SDRATTR_HORZSHEARALL   -SDRATTR_START]=new SdrHorzShearAllItem;
>+    ppPoolDefaults[SDRATTR_VERTSHEARALL   -SDRATTR_START]=new SdrVertShearAllItem;
>+    ppPoolDefaults[SDRATTR_TRANSFORMREF1X -SDRATTR_START]=new SdrTransformRef1XItem;
>+    ppPoolDefaults[SDRATTR_TRANSFORMREF1Y -SDRATTR_START]=new SdrTransformRef1YItem;
>+    ppPoolDefaults[SDRATTR_TRANSFORMREF2X -SDRATTR_START]=new SdrTransformRef2XItem;
>+    ppPoolDefaults[SDRATTR_TRANSFORMREF2Y -SDRATTR_START]=new SdrTransformRef2YItem;
>+    ppPoolDefaults[SDRATTR_TEXTDIRECTION  -SDRATTR_START]=new SvxWritingModeItem;
>+
>+    for (i=SDRATTR_NOTPERSISTRESERVE2; i<=SDRATTR_NOTPERSISTRESERVE15; i++) {
>+        ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
>+    }
>+
>+    // Grafik
>+    ppPoolDefaults[ SDRATTR_GRAFRED             - SDRATTR_START] = new SdrGrafRedItem;
>+    ppPoolDefaults[ SDRATTR_GRAFGREEN           - SDRATTR_START] = new SdrGrafGreenItem;
>+    ppPoolDefaults[ SDRATTR_GRAFBLUE            - SDRATTR_START] = new SdrGrafBlueItem;
>+    ppPoolDefaults[ SDRATTR_GRAFLUMINANCE       - SDRATTR_START] = new SdrGrafLuminanceItem;
>+    ppPoolDefaults[ SDRATTR_GRAFCONTRAST        - SDRATTR_START] = new SdrGrafContrastItem;
>+    ppPoolDefaults[ SDRATTR_GRAFGAMMA           - SDRATTR_START] = new SdrGrafGamma100Item;
>+    ppPoolDefaults[ SDRATTR_GRAFTRANSPARENCE    - SDRATTR_START] = new SdrGrafTransparenceItem;
>+    ppPoolDefaults[ SDRATTR_GRAFINVERT          - SDRATTR_START] = new SdrGrafInvertItem;
>+    ppPoolDefaults[ SDRATTR_GRAFMODE            - SDRATTR_START] = new SdrGrafModeItem;
>+    ppPoolDefaults[ SDRATTR_GRAFCROP            - SDRATTR_START] = new SdrGrafCropItem;
>+    for( i = SDRATTR_GRAFRESERVE3; i <= SDRATTR_GRAFRESERVE6; i++ )
>+        ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>+    ppPoolDefaults[ SDRATTRSET_GRAF - SDRATTR_START ] = new SdrGrafSetItem( pMaster );
>+    pItemInfos[SDRATTR_GRAFCROP-SDRATTR_START]._nSID=SID_ATTR_GRAF_CROP;
>+
>+    // 3D Object Attr (28092000 AW)
>+    ppPoolDefaults[ SDRATTR_3DOBJ_PERCENT_DIAGONAL - SDRATTR_START ] = new Svx3DPercentDiagonalItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_BACKSCALE - SDRATTR_START ] = new Svx3DBackscaleItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_DEPTH - SDRATTR_START ] = new Svx3DDepthItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_HORZ_SEGS - SDRATTR_START ] = new Svx3DHorizontalSegmentsItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_VERT_SEGS - SDRATTR_START ] = new Svx3DVerticalSegmentsItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_END_ANGLE - SDRATTR_START ] = new Svx3DEndAngleItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_DOUBLE_SIDED - SDRATTR_START ] = new Svx3DDoubleSidedItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_NORMALS_KIND - SDRATTR_START ] = new Svx3DNormalsKindItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_NORMALS_INVERT - SDRATTR_START ] = new Svx3DNormalsInvertItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_X - SDRATTR_START ] = new Svx3DTextureProjectionXItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_Y - SDRATTR_START ] = new Svx3DTextureProjectionYItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_SHADOW_3D - SDRATTR_START ] = new Svx3DShadow3DItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_MAT_COLOR - SDRATTR_START ] = new Svx3DMaterialColorItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_MAT_EMISSION - SDRATTR_START ] = new Svx3DMaterialEmissionItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR - SDRATTR_START ] = new Svx3DMaterialSpecularItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY - SDRATTR_START ] = new Svx3DMaterialSpecularIntensityItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_KIND - SDRATTR_START ] = new Svx3DTextureKindItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_MODE - SDRATTR_START ] = new Svx3DTextureModeItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_FILTER - SDRATTR_START ] = new Svx3DTextureFilterItem;
>+
>+    // #107245# Add new items for 3d objects
>+    ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_NORMALS - SDRATTR_START ] = new Svx3DSmoothNormalsItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_LIDS - SDRATTR_START ] = new Svx3DSmoothLidsItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_CHARACTER_MODE - SDRATTR_START ] = new Svx3DCharacterModeItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_FRONT - SDRATTR_START ] = new Svx3DCloseFrontItem;
>+    ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_BACK - SDRATTR_START ] = new Svx3DCloseBackItem;
>+
>+    // #107245# Start with SDRATTR_3DOBJ_RESERVED_06 now
>+    for( i = SDRATTR_3DOBJ_RESERVED_06; i <= SDRATTR_3DOBJ_RESERVED_20; i++ )
>+        ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>+
>+    // 3D Scene Attr (28092000 AW)
>+    ppPoolDefaults[ SDRATTR_3DSCENE_PERSPECTIVE - SDRATTR_START ] = new Svx3DPerspectiveItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_DISTANCE - SDRATTR_START ] = new Svx3DDistanceItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_FOCAL_LENGTH - SDRATTR_START ] = new Svx3DFocalLengthItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_TWO_SIDED_LIGHTING - SDRATTR_START ] = new Svx3DTwoSidedLightingItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_1 - SDRATTR_START ] = new Svx3DLightcolor1Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_2 - SDRATTR_START ] = new Svx3DLightcolor2Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_3 - SDRATTR_START ] = new Svx3DLightcolor3Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_4 - SDRATTR_START ] = new Svx3DLightcolor4Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_5 - SDRATTR_START ] = new Svx3DLightcolor5Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_6 - SDRATTR_START ] = new Svx3DLightcolor6Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_7 - SDRATTR_START ] = new Svx3DLightcolor7Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_8 - SDRATTR_START ] = new Svx3DLightcolor8Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_AMBIENTCOLOR - SDRATTR_START ] = new Svx3DAmbientcolorItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_1 - SDRATTR_START ] = new Svx3DLightOnOff1Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_2 - SDRATTR_START ] = new Svx3DLightOnOff2Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_3 - SDRATTR_START ] = new Svx3DLightOnOff3Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_4 - SDRATTR_START ] = new Svx3DLightOnOff4Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_5 - SDRATTR_START ] = new Svx3DLightOnOff5Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_6 - SDRATTR_START ] = new Svx3DLightOnOff6Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_7 - SDRATTR_START ] = new Svx3DLightOnOff7Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_8 - SDRATTR_START ] = new Svx3DLightOnOff8Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_1 - SDRATTR_START ] = new Svx3DLightDirection1Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_2 - SDRATTR_START ] = new Svx3DLightDirection2Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_3 - SDRATTR_START ] = new Svx3DLightDirection3Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_4 - SDRATTR_START ] = new Svx3DLightDirection4Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_5 - SDRATTR_START ] = new Svx3DLightDirection5Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_6 - SDRATTR_START ] = new Svx3DLightDirection6Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_7 - SDRATTR_START ] = new Svx3DLightDirection7Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_8 - SDRATTR_START ] = new Svx3DLightDirection8Item;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_SHADOW_SLANT - SDRATTR_START ] = new Svx3DShadowSlantItem;
>+    ppPoolDefaults[ SDRATTR_3DSCENE_SHADE_MODE - SDRATTR_START ] = new Svx3DShadeModeItem;
>+
>+    for( i = SDRATTR_3DSCENE_RESERVED_01; i <= SDRATTR_3DSCENE_RESERVED_20; i++ )
>+        ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
>+
>+    ////////////////////////////////
>+#ifdef DBG_UTIL
>+    UINT16 nAnz(SDRATTR_END-SDRATTR_START + 1);
>+
>+    for(UINT16 nNum = 0; nNum < nAnz; nNum++)
>+    {
>+        const SfxPoolItem* pItem = ppPoolDefaults[nNum];
>+
>+        if(!pItem)
>+        {
>+            ByteString aStr("PoolDefaultItem not set: ");
>+
>+            aStr += "Num=";
>+            aStr += ByteString::CreateFromInt32( nNum );
>+            aStr += "Which=";
>+            aStr += ByteString::CreateFromInt32( nNum + 1000 );
>+
>+            DBG_ERROR(aStr.GetBuffer());
>+        }
>+        else if(pItem->Which() != nNum + 1000)
>+        {
>+            ByteString aStr("PoolDefaultItem has wrong WhichId: ");
>+
>+            aStr += "Num=";
>+            aStr += ByteString::CreateFromInt32( nNum );
>+            aStr += " Which=";
>+            aStr += ByteString::CreateFromInt32( pItem->Which() );
>+
>+            DBG_ERROR(aStr.GetBuffer());
>+        }
>+    }
>+#endif
>+
>+    if (nAttrStart==SDRATTR_START && nAttrEnd==SDRATTR_END) {
>+        SetDefaults(ppPoolDefaults);
>+        SetItemInfos(pItemInfos);
>+    }
>+}
> 
> /*************************************************************************
> |*
>@@ -451,10 +451,10 @@ using namespace ::com::sun::star;
> |*
> \************************************************************************/
> 
>-/*N*/ SdrItemPool::SdrItemPool(const SdrItemPool& rPool):
>-/*N*/ 	XOutdevItemPool(rPool)
>-/*N*/ {
>-/*N*/ }
>+SdrItemPool::SdrItemPool(const SdrItemPool& rPool):
>+    XOutdevItemPool(rPool)
>+{
>+}
> 
> /*************************************************************************
> |*
>@@ -462,10 +462,10 @@ using namespace ::com::sun::star;
> |*
> \************************************************************************/
> 
>-/*N*/ SfxItemPool* __EXPORT SdrItemPool::Clone() const
>-/*N*/ {
>-/*N*/ 	return new SdrItemPool(*this);
>-/*N*/ }
>+SfxItemPool* __EXPORT SdrItemPool::Clone() const
>+{
>+    return new SdrItemPool(*this);
>+}
> 
> /*************************************************************************
> |*
>@@ -473,22 +473,22 @@ using namespace ::com::sun::star;
> |*
> \************************************************************************/
> 
>-/*N*/ SdrItemPool::~SdrItemPool()
>-/*N*/ {
>-/*N*/ 	Delete(); // erstmal den 'dtor' des SfxItemPools rufen
>-/*N*/ 	// und nun meine eigenen statischen Defaults abraeumen
>-/*N*/ 	if (ppPoolDefaults!=NULL) {
>-/*N*/ 		unsigned nBeg=SDRATTR_SHADOW-SDRATTR_START;
>-/*N*/ 		unsigned nEnd=SDRATTR_END-SDRATTR_START;
>-/*N*/ 		for (unsigned i=nBeg; i<=nEnd; i++) {
>-/*N*/ 			SetRefCount(*ppPoolDefaults[i],0);
>-/*N*/ 			delete ppPoolDefaults[i];
>-/*N*/ 			ppPoolDefaults[i]=NULL;
>-/*N*/ 		}
>-/*N*/ 	}
>-/*N*/ 	// Vor dem zerstoeren die Pools ggf. voneinander trennen
>-/*N*/ 	SetSecondaryPool(NULL);
>-/*N*/ }
>+SdrItemPool::~SdrItemPool()
>+{
>+    Delete(); // erstmal den 'dtor' des SfxItemPools rufen
>+    // und nun meine eigenen statischen Defaults abraeumen
>+    if (ppPoolDefaults!=NULL) {
>+        unsigned nBeg=SDRATTR_SHADOW-SDRATTR_START;
>+        unsigned nEnd=SDRATTR_END-SDRATTR_START;
>+        for (unsigned i=nBeg; i<=nEnd; i++) {
>+            SetRefCount(*ppPoolDefaults[i],0);
>+            delete ppPoolDefaults[i];
>+            ppPoolDefaults[i]=NULL;
>+        }
>+    }
>+    // Vor dem zerstoeren die Pools ggf. voneinander trennen
>+    SetSecondaryPool(NULL);
>+}
> 
> 
> 
>@@ -497,237 +497,237 @@ using namespace ::com::sun::star;
> // FractionItem
> ////////////////////////////////////////////////////////////////////////////////
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
>+TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
> 
>-/*N*/ SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
>-/*N*/ 	SfxPoolItem(nId)
>-/*N*/ {
>-/*N*/ 	INT32 nMul,nDiv;
>-/*N*/ 	rIn>>nMul;
>-/*N*/ 	rIn>>nDiv;
>-/*N*/ 	nValue=Fraction(nMul,nDiv);
>-/*N*/ }
>+SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
>+    SfxPoolItem(nId)
>+{
>+    INT32 nMul,nDiv;
>+    rIn>>nMul;
>+    rIn>>nDiv;
>+    nValue=Fraction(nMul,nDiv);
>+}
> 
>-/*N*/ int __EXPORT SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
>-/*N*/ {
>-/*N*/ 	return SfxPoolItem::operator==(rCmp) &&
>-/*N*/ 		   ((SdrFractionItem&)rCmp).GetValue()==nValue;
>-/*N*/ }
>+int __EXPORT SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
>+{
>+    return SfxPoolItem::operator==(rCmp) &&
>+        ((SdrFractionItem&)rCmp).GetValue()==nValue;
>+}
> 
> 
> 
>-/*?*/ SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, USHORT nItemVers) const
>-/*?*/ {
>-/*?*/ 	rOut<<INT32(nValue.GetNumerator());
>-/*?*/ 	rOut<<INT32(nValue.GetDenominator());
>-/*?*/ 	return rOut;
>-/*?*/ }
>+SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, USHORT nItemVers) const
>+{
>+    rOut<<INT32(nValue.GetNumerator());
>+    rOut<<INT32(nValue.GetDenominator());
>+    return rOut;
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool *pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrFractionItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool *pPool) const
>+{
>+    return new SdrFractionItem(Which(),GetValue());
>+}
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrFractionItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrFractionItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> ////////////////////////////////////////////////////////////////////////////////
> // ScaleItem
> ////////////////////////////////////////////////////////////////////////////////
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
>+TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
> 
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrScaleItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrScaleItem(Which(),rIn);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool *pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrScaleItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrScaleItem::Clone(SfxItemPool *pPool) const
>+{
>+    return new SdrScaleItem(Which(),GetValue());
>+}
> 
> ////////////////////////////////////////////////////////////////////////////////
> // OnOffItem
> ////////////////////////////////////////////////////////////////////////////////
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem);
>+TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrOnOffItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrOnOffItem(Which(),GetValue());
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrOnOffItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrOnOffItem(Which(),rIn);
>+}
> 
> 
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrOnOffItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrOnOffItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
>+TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrYesNoItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrYesNoItem(Which(),GetValue());
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrYesNoItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrYesNoItem(Which(),rIn);
>+}
> 
> 
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrYesNoItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrYesNoItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> //------------------------------------------------------------
> // class SdrPercentItem
> //------------------------------------------------------------
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
>+TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrPercentItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrPercentItem(Which(),GetValue());
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrPercentItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrPercentItem(Which(),rIn);
>+}
> 
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrPercentItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrPercentItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> //------------------------------------------------------------
> // class SdrAngleItem
> //------------------------------------------------------------
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
>+TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrAngleItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrAngleItem(Which(),GetValue());
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrAngleItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrAngleItem(Which(),rIn);
>+}
> 
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrAngleItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrAngleItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> //------------------------------------------------------------
> // class SdrMetricItem
> //------------------------------------------------------------
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
>+TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrMetricItem(Which(),GetValue());
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrMetricItem(Which(),GetValue());
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
>-/*N*/ {
>-/*N*/ 	return new SdrMetricItem(Which(),rIn);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
>+{
>+    return new SdrMetricItem(Which(),rIn);
>+}
> 
> 
> 
> 
> #ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrMetricItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrMetricItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // ShadowSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrShadowSetItem,SfxSetItem);
>+TYPEINIT1(SdrShadowSetItem,SfxSetItem);
> 
>-/*N*/ SdrShadowSetItem::SdrShadowSetItem(SfxItemSet* pItemSet):
>-/*N*/ 	SfxSetItem(SDRATTRSET_SHADOW,pItemSet)
>-/*N*/ {
>-/*N*/ }
>+SdrShadowSetItem::SdrShadowSetItem(SfxItemSet* pItemSet):
>+    SfxSetItem(SDRATTRSET_SHADOW,pItemSet)
>+{
>+}
> 
>-/*N*/ SdrShadowSetItem::SdrShadowSetItem(SfxItemPool* pItemPool):
>-/*N*/ 	SfxSetItem(SDRATTRSET_SHADOW,new SfxItemSet(*pItemPool,SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST))
>-/*N*/ {
>-/*N*/ }
>+SdrShadowSetItem::SdrShadowSetItem(SfxItemPool* pItemPool):
>+    SfxSetItem(SDRATTRSET_SHADOW,new SfxItemSet(*pItemPool,SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST))
>+{
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrShadowSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrShadowSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrShadowSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrShadowSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrShadowSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST);
>+    pSet->Load(rStream);
>+    return new SdrShadowSetItem(pSet);
>+}
> 
> ////////////////////////////////////////////////////////////////////////////////
> // Items des Legendenobjekts
> ////////////////////////////////////////////////////////////////////////////////
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* pPool) const                { return new SdrCaptionTypeItem(*this); }
>+SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* pPool) const                { return new SdrCaptionTypeItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, USHORT nVer) const       { return new SdrCaptionTypeItem(rIn); }
>+SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, USHORT nVer) const       { return new SdrCaptionTypeItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
>+USHORT __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
> 
> 
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* pPool) const              { return new SdrCaptionEscDirItem(*this); }
>+SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* pPool) const              { return new SdrCaptionEscDirItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT nVer) const     { return new SdrCaptionEscDirItem(rIn); }
>+SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT nVer) const     { return new SdrCaptionEscDirItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
>+USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
> 
> 
> 
>@@ -735,490 +735,465 @@ using namespace ::com::sun::star;
> // CaptionSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrCaptionSetItem,SfxSetItem);
>+TYPEINIT1(SdrCaptionSetItem,SfxSetItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrCaptionSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrCaptionSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrCaptionSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCaptionSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_CAPTION_FIRST, SDRATTR_CAPTION_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrCaptionSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrCaptionSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_CAPTION_FIRST, SDRATTR_CAPTION_LAST);
>+    pSet->Load(rStream);
>+    return new SdrCaptionSetItem(pSet);
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // OutlinerSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrOutlinerSetItem,SfxSetItem);
>+TYPEINIT1(SdrOutlinerSetItem,SfxSetItem);
> 
>-/*N*/ SdrOutlinerSetItem::SdrOutlinerSetItem(SfxItemPool* pItemPool):
>-/*N*/ 	SfxSetItem(SDRATTRSET_OUTLINER,new SfxItemSet(*pItemPool,EE_ITEMS_START,EE_ITEMS_END))
>-/*N*/ {
>-/*N*/ }
>+SdrOutlinerSetItem::SdrOutlinerSetItem(SfxItemPool* pItemPool):
>+    SfxSetItem(SDRATTRSET_OUTLINER,new SfxItemSet(*pItemPool,EE_ITEMS_START,EE_ITEMS_END))
>+{
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrOutlinerSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrOutlinerSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrOutlinerSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrOutlinerSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		EE_ITEMS_START, EE_ITEMS_END);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrOutlinerSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      EE_ITEMS_START, EE_ITEMS_END);
>+    pSet->Load(rStream);
>+    return new SdrOutlinerSetItem(pSet);
>+}
> 
> ////////////////////////////////////////////////////////////////////////////////
> // MiscItems
> ////////////////////////////////////////////////////////////////////////////////
> 
> // FitToSize
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* pPool) const         { return new SdrTextFitToSizeTypeItem(*this); }
>+SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* pPool) const         { return new SdrTextFitToSizeTypeItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextFitToSizeTypeItem(rIn); }
>+SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextFitToSizeTypeItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
>+USHORT __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
> 
> 
>+bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
>+    rVal <<= eFS;
> 
>+    return true;
>+}
> 
>+bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::TextFitToSizeType eFS;
>+    if(!(rVal >>= eFS))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
> 
>+        eFS = (drawing::TextFitToSizeType) nEnum;
>+    }
> 
>-/*N*/ sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
>-/*N*/ 	rVal <<= eFS;
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+    SetValue( (SdrFitToSizeType)eFS );
> 
>-/*N*/ sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::TextFitToSizeType eFS;
>-/*N*/ 	if(!(rVal >>= eFS))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eFS = (drawing::TextFitToSizeType) nEnum;
>-/*N*/ 	}
>+    return true;
>+}
> 
>-/*N*/ 	SetValue( (SdrFitToSizeType)eFS );
>+TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
> 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* pPool) const            { return new SdrTextVertAdjustItem(*this); }
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
>+SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextVertAdjustItem(rIn); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* pPool) const            { return new SdrTextVertAdjustItem(*this); }
>+USHORT __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextVertAdjustItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
> 
>+bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    rVal <<= (drawing::TextVerticalAdjust)GetValue();
>+    return true;
>+}
> 
>+bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::TextVerticalAdjust eAdj;
>+    if(!(rVal >>= eAdj))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
> 
>-/*N*/ sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	rVal <<= (drawing::TextVerticalAdjust)GetValue();
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+        eAdj = (drawing::TextVerticalAdjust)nEnum;
>+    }
> 
>-/*N*/ sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::TextVerticalAdjust eAdj;
>-/*N*/ 	if(!(rVal >>= eAdj))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eAdj = (drawing::TextVerticalAdjust)nEnum;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	SetValue( (SdrTextVertAdjust)eAdj );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+    SetValue( (SdrTextVertAdjust)eAdj );
>+
>+    return true;
>+}
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* pPool) const            { return new SdrTextHorzAdjustItem(*this); }
>+SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* pPool) const { return new SdrTextHorzAdjustItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextHorzAdjustItem(rIn); }
>+SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextHorzAdjustItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
>+USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
> 
>-/*N*/ XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
>-/*N*/ {DBG_BF_ASSERT(0, "STRIP");XubString a; return a; //STRIP001 
>-/*N*/ }
>+XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
>+{DBG_BF_ASSERT(0, "STRIP");XubString a; return a; //STRIP001
>+}
> 
> 
>-/*N*/ sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	rVal <<= (drawing::TextHorizontalAdjust)GetValue();
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    rVal <<= (drawing::TextHorizontalAdjust)GetValue();
>+    return sal_True;
>+}
> 
>-/*N*/ sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::TextHorizontalAdjust eAdj;
>-/*N*/ 	if(!(rVal >>= eAdj))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eAdj = (drawing::TextHorizontalAdjust)nEnum;
>-/*N*/ 	}
>+bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::TextHorizontalAdjust eAdj;
>+    if(!(rVal >>= eAdj))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
> 
>-/*N*/ 	SetValue( (SdrTextHorzAdjust)eAdj );
>+        eAdj = (drawing::TextHorizontalAdjust)nEnum;
>+    }
> 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+    SetValue( (SdrTextHorzAdjust)eAdj );
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
>+    return true;
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* pPool) const            { return new SdrTextAniKindItem(*this); }
>+TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniKindItem(rIn); }
>-
>-/*N*/ USHORT __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
>-
>-
>-
>-/*N*/ sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	rVal <<= (drawing::TextAnimationKind)GetValue();
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*N*/ sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::TextAnimationKind eKind;
>-/*N*/ 	if(!(rVal >>= eKind))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 		eKind = (drawing::TextAnimationKind)nEnum;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	SetValue( (SdrTextAniKind)eKind );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* pPool) const            { return new SdrTextAniDirectionItem(*this); }
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDirectionItem(rIn); }
>-
>-/*N*/ USHORT __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
>-
>-
>-
>-/*N*/ sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	rVal <<= (drawing::TextAnimationDirection)GetValue();
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*N*/ sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::TextAnimationDirection eDir;
>-/*N*/ 	if(!(rVal >>= eDir))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eDir = (drawing::TextAnimationDirection)nEnum;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	SetValue( (SdrTextAniDirection)eDir );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* pPool) const            { return new SdrTextAniDelayItem(*this); }
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDelayItem(rIn); }
>-
>-
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* pPool) const            { return new SdrTextAniAmountItem(*this); }
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniAmountItem(rIn); }
>-
>-
>-
>-
>-/*N*/ TYPEINIT1_AUTOFACTORY( SdrAutoShapeAdjustmentItem, SfxPoolItem );
>-
>-/*N*/ SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem() : SfxPoolItem( SDRATTR_AUTOSHAPE_ADJUSTMENT )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ):
>-/*N*/ 	SfxPoolItem( SDRATTR_AUTOSHAPE_ADJUSTMENT )
>-/*N*/ {
>-/*N*/ 	if ( nVersion )
>-/*N*/ 	{
>-/*N*/ 		SdrAutoShapeAdjustmentValue aVal;
>-/*N*/ 		sal_uInt32 i, nCount;
>-/*N*/ 		rIn >> nCount;
>-/*N*/ 		for ( i = 0; i < nCount; i++ )
>-/*N*/ 		{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
>-/*N*/ 		}
>-/*N*/ 	}
>-/*N*/ }
>-
>-/*N*/ SdrAutoShapeAdjustmentItem::~SdrAutoShapeAdjustmentItem()
>-/*N*/ {
>-/*N*/ 	void* pPtr;
>-/*N*/ 	for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() )
>-/*?*/ 		delete (SdrAutoShapeAdjustmentValue*)pPtr;
>-/*N*/ }
>-
>-/*N*/ int __EXPORT SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
>-/*N*/ {
>-/*N*/ 	int bRet = SfxPoolItem::operator==( rCmp );
>-/*N*/ 	if ( bRet )
>-/*N*/ 	{
>-/*N*/ 		bRet = ((SdrAutoShapeAdjustmentItem&)rCmp).GetCount() == GetCount();
>-/*N*/ 		if ( bRet )
>-/*N*/ 		{
>-/*N*/ 			sal_uInt32 i;
>-/*N*/ 			for ( i = 0; i < GetCount(); i++ )
>-/*N*/ 			{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
>-/*N*/ 			}
>-/*N*/ 		}
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
>-/*N*/ {
>-/*N*/ 	return new SdrAutoShapeAdjustmentItem( rIn, nItemVersion );
>-/*N*/ }
>-
>-/*N*/ SvStream& __EXPORT SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
>-/*N*/ {
>-/*N*/ 	if ( nItemVersion )
>-/*N*/ 	{
>-/*N*/ 		sal_uInt32 i, nCount = GetCount();
>-/*N*/ 		rOut << nCount;
>-/*N*/ 		for ( i = 0; i < nCount; i++ )
>-/*?*/ 		{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 	rOut << GetValue( i ).nValue;
>-/*N*/ 	}
>-/*N*/ 	return rOut;
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) const
>-/*N*/ {
>-/*N*/ 	sal_uInt32 i;
>-/*N*/ 	SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem;
>-/*N*/ 	for ( i = 0; i < GetCount(); i++ )
>-/*N*/ 	{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
>-/*N*/ 	}
>-/*N*/ 	return pItem;
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniKindItem(*this); }
> 
>-#ifdef SDR_ISPOOLABLE
>-/*?*/ int __EXPORT SdrAutoShapeAdjustmentItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>-#endif
>+SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniKindItem(rIn); }
> 
>+USHORT __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
> 
> 
>-/*N*/ sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
>-/*N*/ {
>-/*N*/ 	return 1;
>-/*N*/ }
> 
>+bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    rVal <<= (drawing::TextAnimationKind)GetValue();
>+    return true;
>+}
> 
>+bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::TextAnimationKind eKind;
>+    if(!(rVal >>= eKind))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
>+        eKind = (drawing::TextAnimationKind)nEnum;
>+    }
> 
>+    SetValue( (SdrTextAniKind)eKind );
> 
>-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>-// SdrMiscSetItem
>-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>+    return true;
>+}
> 
>-/*N*/ TYPEINIT1(SdrMiscSetItem,SfxSetItem);
>+TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMiscSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrMiscSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDirectionItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrMiscSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDirectionItem(rIn); }
>+
>+USHORT __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
> 
>-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>-// Edge
>-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-// EdgeKind
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* pPool) const            { return new SdrEdgeKindItem(*this); }
>+bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    rVal <<= (drawing::TextAnimationDirection)GetValue();
>+    return true;
>+}
>+
>+bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::TextAnimationDirection eDir;
>+    if(!(rVal >>= eDir))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
>+
>+        eDir = (drawing::TextAnimationDirection)nEnum;
>+    }
>+
>+    SetValue( (SdrTextAniDirection)eDir );
>+
>+    return true;
>+}
>+
>+TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrEdgeKindItem(rIn); }
>+SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDelayItem(*this); }
> 
>-/*N*/ USHORT __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
>+SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniDelayItem(rIn); }
> 
> 
>+TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
> 
>-/*N*/ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
>-/*N*/ 
>-/*N*/ 	switch( GetValue() )
>-/*N*/ 	{
>-/*N*/ 		case SDREDGE_ORTHOLINES :   eCT = drawing::ConnectorType_STANDARD; break;
>-/*N*/ 		case SDREDGE_THREELINES :   eCT = drawing::ConnectorType_LINES;	break;
>-/*N*/ 		case SDREDGE_ONELINE :		eCT = drawing::ConnectorType_LINE;	break;
>-/*N*/ 		case SDREDGE_BEZIER :		eCT = drawing::ConnectorType_CURVE;	break;
>-/*N*/ 		case SDREDGE_ARC :          eCT = drawing::ConnectorType_CURVE;	break;
>-/*N*/ 		default:
>-/*N*/ 			DBG_ERROR( "SdrEdgeKindItem::QueryValue : unknown enum" );
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	rVal <<= eCT;
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniAmountItem(*this); }
> 
>-/*N*/ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::ConnectorType eCT;
>-/*N*/ 	if(!(rVal >>= eCT))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eCT = (drawing::ConnectorType)nEnum;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	SdrEdgeKind eEK = SDREDGE_ORTHOLINES;
>-/*N*/ 	switch( eCT )
>-/*N*/ 	{
>-/*N*/ 		case drawing::ConnectorType_STANDARD :	eEK = SDREDGE_ORTHOLINES;	break;
>-/*N*/ 		case drawing::ConnectorType_CURVE :		eEK = SDREDGE_BEZIER;		break;
>-/*N*/ 		case drawing::ConnectorType_LINE :       eEK = SDREDGE_ONELINE;		break;
>-/*N*/ 		case drawing::ConnectorType_LINES :      eEK = SDREDGE_THREELINES;   break;
>-/*N*/ 		default:
>-/*N*/ 			DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" );
>-/*N*/ 	}
>-/*N*/ 	SetValue( eEK );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrTextAniAmountItem(rIn); }
> 
> 
> 
> 
>+TYPEINIT1_AUTOFACTORY( SdrAutoShapeAdjustmentItem, SfxPoolItem );
> 
>+SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem() : SfxPoolItem( SDRATTR_AUTOSHAPE_ADJUSTMENT )
>+{
>+}
>+
>+SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ):
>+    SfxPoolItem( SDRATTR_AUTOSHAPE_ADJUSTMENT )
>+{
>+    if ( nVersion )
>+    {
>+        SdrAutoShapeAdjustmentValue aVal;
>+        sal_uInt32 i, nCount;
>+        rIn >> nCount;
>+        for ( i = 0; i < nCount; i++ )
>+        {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
>+        }
>+    }
>+}
> 
>+SdrAutoShapeAdjustmentItem::~SdrAutoShapeAdjustmentItem()
>+{
>+    void* pPtr;
>+    for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() )
>+        delete (SdrAutoShapeAdjustmentValue*)pPtr;
>+}
> 
>+int __EXPORT SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
>+{
>+    int bRet = SfxPoolItem::operator==( rCmp );
>+    if ( bRet )
>+    {
>+        bRet = ((SdrAutoShapeAdjustmentItem&)rCmp).GetCount() == GetCount();
>+        if ( bRet )
>+        {
>+            sal_uInt32 i;
>+            for ( i = 0; i < GetCount(); i++ )
>+            {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
>+            }
>+        }
>+    }
>+    return bRet;
>+}
> 
> 
>+SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
>+{
>+    return new SdrAutoShapeAdjustmentItem( rIn, nItemVersion );
>+}
> 
>+SvStream& __EXPORT SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
>+{
>+    if ( nItemVersion )
>+    {
>+        sal_uInt32 i, nCount = GetCount();
>+        rOut << nCount;
>+        for ( i = 0; i < nCount; i++ )
>+        {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001     rOut << GetValue( i ).nValue;
>+    }
>+    return rOut;
>+}
> 
>+SfxPoolItem* __EXPORT SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) const
>+{
>+    sal_uInt32 i;
>+    SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem;
>+    for ( i = 0; i < GetCount(); i++ )
>+    {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
>+    }
>+    return pItem;
>+}
> 
>+#ifdef SDR_ISPOOLABLE
>+int __EXPORT SdrAutoShapeAdjustmentItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
>+}
>+#endif
> 
> 
>+sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
>+{
>+    return 1;
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>-// SdrEdgeSetItem
>+// SdrMiscSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrEdgeSetItem,SfxSetItem);
>+TYPEINIT1(SdrMiscSetItem,SfxSetItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrEdgeSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrEdgeSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMiscSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrMiscSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrEdgeSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
>+    pSet->Load(rStream);
>+    return new SdrMiscSetItem(pSet);
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>-// Measure
>+// Edge
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-// MeasureKind
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
>+// EdgeKind
>+TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
>+
>+SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* pPool) const            { return new SdrEdgeKindItem(*this); }
>+
>+SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrEdgeKindItem(rIn); }
>+
>+USHORT __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
>+
>+
>+
>+bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
>+
>+    switch( GetValue() )
>+    {
>+    case SDREDGE_ORTHOLINES :   eCT = drawing::ConnectorType_STANDARD; break;
>+    case SDREDGE_THREELINES :   eCT = drawing::ConnectorType_LINES; break;
>+    case SDREDGE_ONELINE :      eCT = drawing::ConnectorType_LINE;  break;
>+    case SDREDGE_BEZIER :       eCT = drawing::ConnectorType_CURVE; break;
>+    case SDREDGE_ARC :          eCT = drawing::ConnectorType_CURVE; break;
>+    default:
>+        DBG_ERROR( "SdrEdgeKindItem::QueryValue : unknown enum" );
>+    }
>+
>+    rVal <<= eCT;
>+
>+    return true;
>+}
>+
>+bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::ConnectorType eCT;
>+    if(!(rVal >>= eCT))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
>+
>+        eCT = (drawing::ConnectorType)nEnum;
>+    }
>+
>+    SdrEdgeKind eEK = SDREDGE_ORTHOLINES;
>+    switch( eCT )
>+    {
>+    case drawing::ConnectorType_STANDARD :  eEK = SDREDGE_ORTHOLINES;   break;
>+    case drawing::ConnectorType_CURVE :     eEK = SDREDGE_BEZIER;       break;
>+    case drawing::ConnectorType_LINE :       eEK = SDREDGE_ONELINE;     break;
>+    case drawing::ConnectorType_LINES :      eEK = SDREDGE_THREELINES;   break;
>+    default:
>+        DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" );
>+    }
>+    SetValue( eEK );
>+
>+    return true;
>+}
>+
>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>+// SdrEdgeSetItem
>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>+
>+TYPEINIT1(SdrEdgeSetItem,SfxSetItem);
>+
>+SfxPoolItem* __EXPORT SdrEdgeSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrEdgeSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureKindItem(*this); }
>+SfxPoolItem* __EXPORT SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST);
>+    pSet->Load(rStream);
>+    return new SdrEdgeSetItem(pSet);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureKindItem(rIn); }
>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>+// Measure
>+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
>+// MeasureKind
>+TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
> 
>+SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureKindItem(*this); }
> 
>+SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureKindItem(rIn); }
> 
>+USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
> 
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextHPosItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextHPosItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
>+TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
> 
>+SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextHPosItem(*this); }
> 
>+SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextHPosItem(rIn); }
> 
>+USHORT __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
> 
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextVPosItem(*this); }
>+SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureTextVPosItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextVPosItem(rIn); }
>+SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureTextVPosItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
>+USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
> 
> 
> 
> 
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
>+TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureUnitItem(*this); }
>+SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* pPool) const            { return new SdrMeasureUnitItem(*this); }
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureUnitItem(rIn); }
>+SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, USHORT nVer) const   { return new SdrMeasureUnitItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
>+USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
> 
> 
> 
>@@ -1228,274 +1203,268 @@ using namespace ::com::sun::star;
> // SdrMeasureSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrMeasureSetItem,SfxSetItem);
>+TYPEINIT1(SdrMeasureSetItem,SfxSetItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrMeasureSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMeasureSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrMeasureSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrMeasureSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST);
>+    pSet->Load(rStream);
>+    return new SdrMeasureSetItem(pSet);
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // Circ
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
> // CircKind
>-/*N*/ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* pPool) const          { return new SdrCircKindItem(*this); }
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCircKindItem(rIn); }
>+TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
>+
>+SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* pPool) const          { return new SdrCircKindItem(*this); }
>+
>+SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCircKindItem(rIn); }
> 
>-/*N*/ USHORT __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
>+USHORT __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
> 
> 
>+bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    drawing::CircleKind eKind;
>+    if(!(rVal >>= eKind))
>+    {
>+        sal_Int32 nEnum;
>+        if(!(rVal >>= nEnum))
>+            return false;
> 
>+        eKind = (drawing::CircleKind)nEnum;
>+    }
> 
>-/*N*/ sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	drawing::CircleKind eKind;
>-/*N*/ 	if(!(rVal >>= eKind))
>-/*N*/ 	{
>-/*?*/ 		sal_Int32 nEnum;
>-/*?*/ 		if(!(rVal >>= nEnum))
>-/*?*/ 			return sal_False;
>-/*?*/ 
>-/*?*/ 		eKind = (drawing::CircleKind)nEnum;
>-/*N*/ 	}
>-/*N*/ 
>-/*N*/ 	SetValue( (SdrCircKind)eKind );
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+    SetValue( (SdrCircKind)eKind );
>+    return true;
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrCircSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1(SdrCircSetItem,SfxSetItem);
>+TYPEINIT1(SdrCircSetItem,SfxSetItem);
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCircSetItem::Clone(SfxItemPool* pToPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrCircSetItem(*this,pToPool);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrCircSetItem::Clone(SfxItemPool* pToPool) const
>+{
>+    return new SdrCircSetItem(*this,pToPool);
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrCircSetItem::Create(SvStream& rStream, USHORT nVersion) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_CIRC_FIRST, SDRATTR_CIRC_LAST);
>-/*N*/ 	pSet->Load(rStream);
>-/*N*/ 	return new SdrCircSetItem(pSet);
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrCircSetItem::Create(SvStream& rStream, USHORT nVersion) const
>+{
>+    SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_CIRC_FIRST, SDRATTR_CIRC_LAST);
>+    pSet->Load(rStream);
>+    return new SdrCircSetItem(pSet);
>+}
> 
> //------------------------------------------------------------
> // class SdrSignedPercentItem
> //------------------------------------------------------------
> 
>-/*N*/ TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item );
>-
>-
>-
>-
>+TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item );
> 
> #ifdef SDR_ISPOOLABLE
> 
>-/*?*/ int __EXPORT SdrSignedPercentItem::IsPoolable() const
>-/*?*/ {
>-/*?*/ 	USHORT nId=Which();
>-/*?*/ 	return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
>-/*?*/ }
>+int __EXPORT SdrSignedPercentItem::IsPoolable() const
>+{
>+    USHORT nId=Which();
>+    return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
>+}
> #endif
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafSetItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafSetItem,SfxSetItem );
>+TYPEINIT1( SdrGrafSetItem,SfxSetItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafSetItem::Clone( SfxItemPool* pToPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafSetItem( *this, pToPool );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafSetItem::Clone( SfxItemPool* pToPool ) const
>+{
>+    return new SdrGrafSetItem( *this, pToPool );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafSetItem::Create( SvStream& rStream, USHORT nVersion ) const
>-/*N*/ {
>-/*N*/ 	SfxItemSet* pSet = new SfxItemSet(*GetItemSet().GetPool(),
>-/*N*/ 		SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST );
>-/*N*/ 	pSet->Load( rStream );
>-/*N*/ 	return new SdrGrafSetItem( pSet );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafSetItem::Create( SvStream& rStream, USHORT nVersion ) const
>+{
>+    SfxItemSet* pSet = new SfxItemSet(*GetItemSet().GetPool(),
>+                                      SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST );
>+    pSet->Load( rStream );
>+    return new SdrGrafSetItem( pSet );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafRedItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem );
>+TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafRedItem( *this );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafRedItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafRedItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafRedItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafGreenItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem );
>+TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafGreenItem( *this );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafGreenItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafGreenItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafGreenItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafBlueItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem );
>+TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafBlueItem( *this );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafBlueItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafBlueItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafBlueItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafLuminanceItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem );
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafLuminanceItem( *this );
>-/*N*/ }
>+TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafLuminanceItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafLuminanceItem( *this );
>+}
>+
>+SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafLuminanceItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafContrastItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem );
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafContrastItem( *this );
>-/*N*/ }
>+TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem );
>+
>+SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafContrastItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafContrastItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafContrastItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafGamma100Item
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item );
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafGamma100Item( *this );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafGamma100Item( rIn );
>-/*N*/ }
>-
>-/*N*/ sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	rVal <<= ((double)GetValue()) / 100.0;
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*N*/ sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	double nGamma;
>-/*N*/ 	if(!(rVal >>= nGamma))
>-/*N*/ 		return sal_False;
>-/*N*/ 
>-/*N*/ 	SetValue( (UINT32)(nGamma * 100.0  ) );
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item );
>+
>+SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafGamma100Item( *this );
>+}
>+
>+SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafGamma100Item( rIn );
>+}
>+
>+bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    rVal <<= ((double)GetValue()) / 100.0;
>+    return true;
>+}
>+
>+bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    double nGamma;
>+    if(!(rVal >>= nGamma))
>+        return false;
>+
>+    SetValue( (UINT32)(nGamma * 100.0  ) );
>+    return true;
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafInvertItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem );
>+TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafInvertItem( *this );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafInvertItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafInvertItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafInvertItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafTransparenceItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem );
>-/*N*/ 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafTransparenceItem( *this );
>-/*N*/ }
>+TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem );
>+
>+SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafTransparenceItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafTransparenceItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafTransparenceItem( rIn );
>+}
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> // SdrGrafModeItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafModeItem, SfxEnumItem );
>+TYPEINIT1( SdrGrafModeItem, SfxEnumItem );
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* pPool) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafModeItem( *this );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* pPool) const
>+{
>+    return new SdrGrafModeItem( *this );
>+}
> 
>-/*N*/ SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafModeItem( rIn );
>-/*N*/ }
>+SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return new SdrGrafModeItem( rIn );
>+}
> 
>-/*N*/ USHORT __EXPORT SdrGrafModeItem::GetValueCount() const
>-/*N*/ {
>-/*N*/ 	return 4;
>-/*N*/ }
>+USHORT __EXPORT SdrGrafModeItem::GetValueCount() const
>+{
>+    return 4;
>+}
> 
> 
> 
>@@ -1503,21 +1472,21 @@ using namespace ::com::sun::star;
> // SdrGrafCropItem
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>-/*N*/ TYPEINIT1( SdrGrafCropItem, SvxGrfCrop );
>-
>-/*N*/ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SdrGrafCropItem( *this );
>-/*N*/ }
>-/*N*/ 
>-/*N*/ SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
>-/*N*/ {
>-/*N*/ 	return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
>-/*N*/ }
>-/*N*/ 
>-/*N*/ USHORT SdrGrafCropItem::GetVersion( USHORT nFileVersion ) const
>-/*N*/ {
>-/*N*/ 	// GRFCROP_VERSION_MOVETOSVX is 1
>-/*N*/ 	return GRFCROP_VERSION_MOVETOSVX;
>-/*N*/ }
>+TYPEINIT1( SdrGrafCropItem, SvxGrfCrop );
>+
>+SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SdrGrafCropItem( *this );
>+}
>+
>+SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
>+{
>+    return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
>+}
>+
>+USHORT SdrGrafCropItem::GetVersion( USHORT nFileVersion ) const
>+{
>+    // GRFCROP_VERSION_MOVETOSVX is 1
>+    return GRFCROP_VERSION_MOVETOSVX;
>+}
> }
>diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
>index 8817d91..e508b5e 100644
>--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
>+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
>@@ -444,19 +444,19 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 
> /*N*/ }
> 
>-/*N*/ sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue().GetRGBColor();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue( nValue );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -532,14 +532,14 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
> /*N*/ 	rVal <<= eLS;
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	::com::sun::star::drawing::LineStyle eLS;
> /*N*/ 	if(!(rVal >>= eLS ))
>@@ -550,9 +550,9 @@ XubString aNameOrIndexEmptyString;
> /*?*/             return sal_False;
> /*?*/         eLS = (::com::sun::star::drawing::LineStyle)nLS;
> /*N*/     }
>-/*N*/ 
>+/*N*/
> /*N*/ 	SetValue( (XLineStyle)eLS );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> //------------------------------------------------------------------------
>@@ -775,11 +775,11 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch ( nMemberId )
> /*N*/ 	{
> /*N*/ 		case MID_NAME:
>@@ -789,124 +789,124 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			rVal <<= aApiName;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH:
> /*N*/ 		{
> /*N*/ 			const XDash& rXD = GetValue();
>-/*N*/ 
>+/*N*/
> /*N*/ 			::com::sun::star::drawing::LineDash aLineDash;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
> /*N*/ 			aLineDash.Dots = rXD.GetDots();
> /*N*/ 			aLineDash.DotLen = rXD.GetDotLen();
> /*N*/ 			aLineDash.Dashes = rXD.GetDashes();
> /*N*/ 			aLineDash.DashLen = rXD.GetDashLen();
> /*N*/ 			aLineDash.Distance = rXD.GetDistance();
>-/*N*/ 
>+/*N*/
> /*N*/ 			rVal <<= aLineDash;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_STYLE:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= (::com::sun::star::drawing::DashStyle)((sal_Int16)rXD.GetDashStyle());
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DOTS:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= rXD.GetDots();
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DOTLEN:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= rXD.GetDotLen();
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DASHES:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= rXD.GetDashes();
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DASHLEN:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= rXD.GetDashLen();
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DISTANCE:
> /*N*/ 		{
> /*?*/ 			const XDash& rXD = GetValue();
> /*?*/ 			rVal <<= rXD.GetDistance();
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>-/*?*/ 		default: DBG_ERROR("Wrong MemberId!"); return sal_False;	
>+/*N*/
>+/*?*/ 		default: DBG_ERROR("Wrong MemberId!"); return false;
> /*N*/ 	}
>-/*N*/ 	
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch ( nMemberId )
> /*N*/ 	{
> /*N*/ 		case MID_NAME:
> /*N*/ 		{
> /*?*/ 			::rtl::OUString aName;
> /*?*/ 			if (!(rVal >>= aName))
>-/*?*/ 				return sal_False;
>+/*?*/ 				return false;
> /*?*/ 			SetName( aName );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH:
> /*N*/ 		{
> /*N*/ 			::com::sun::star::drawing::LineDash aLineDash;
> /*N*/ 			if(!(rVal >>= aLineDash))
>-/*N*/ 				return sal_False;
>-/*N*/ 
>+/*N*/ 				return false;
>+/*N*/
> /*N*/ 			XDash aXDash;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
> /*N*/ 			aXDash.SetDots(aLineDash.Dots);
> /*N*/ 			aXDash.SetDotLen(aLineDash.DotLen);
> /*N*/ 			aXDash.SetDashes(aLineDash.Dashes);
> /*N*/ 			aXDash.SetDashLen(aLineDash.DashLen);
> /*N*/ 			aXDash.SetDistance(aLineDash.Distance);
>-/*N*/ 
>+/*N*/
> /*N*/ 			if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
> /*?*/ 				aXDash.SetDots(1);
>-/*N*/ 
>+/*N*/
> /*N*/ 			SetValue( aXDash );
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_STYLE:
> /*N*/ 		{
> /*?*/ 			sal_Int16 nVal;
> /*?*/ 			if(!(rVal >>= nVal))
>-/*?*/ 				return sal_False;
>-/*?*/ 
>+/*?*/ 				return false;
>+/*?*/
> /*?*/ 			XDash aXDash = GetValue();
> /*?*/ 			aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
>-/*?*/ 
>+/*?*/
> /*?*/ 			if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
> /*?*/ 				aXDash.SetDots(1);
>-/*?*/ 
>+/*?*/
> /*?*/ 			SetValue( aXDash );
>-/*?*/ 
>+/*?*/
> /*?*/ 			break;
> /*N*/ 		}
> 
>@@ -915,29 +915,29 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		{
> /*?*/ 			sal_Int16 nVal;
> /*?*/ 			if(!(rVal >>= nVal))
>-/*?*/ 				return sal_False;
>-/*?*/ 			
>+/*?*/ 				return false;
>+/*?*/
> /*?*/ 			XDash aXDash = GetValue();
> /*?*/ 			if ( nMemberId == MID_LINEDASH_DOTS )
> /*?*/ 				aXDash.SetDots( nVal );
> /*?*/ 			else
> /*?*/ 				aXDash.SetDashes( nVal );
>-/*?*/ 
>+/*?*/
> /*?*/ 			if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
> /*?*/ 				aXDash.SetDots(1);
>-/*?*/ 
>+/*?*/
> /*?*/ 			SetValue( aXDash );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_LINEDASH_DOTLEN:
> /*N*/ 		case MID_LINEDASH_DASHLEN:
> /*N*/ 		case MID_LINEDASH_DISTANCE:
> /*N*/ 		{
> /*?*/ 			sal_Int32 nVal;
> /*?*/ 			if(!(rVal >>= nVal))
>-/*?*/ 				return sal_False;
>-/*?*/ 			
>+/*?*/ 				return false;
>+/*?*/
> /*?*/ 			XDash aXDash = GetValue();
> /*?*/ 			if ( nMemberId == MID_LINEDASH_DOTLEN )
> /*?*/ 				aXDash.SetDotLen( nVal );
>@@ -945,16 +945,16 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 				aXDash.SetDashLen( nVal );
> /*?*/ 			else
> /*?*/ 				aXDash.SetDistance( nVal );
>-/*?*/ 
>+/*?*/
> /*?*/ 			if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
> /*?*/ 				aXDash.SetDots(1);
>-/*?*/ 
>+/*?*/
> /*?*/ 			SetValue( aXDash );
> /*?*/ 			break;
>-/*N*/ 		}		
>+/*N*/ 		}
> /*N*/ 	}
>-/*N*/ 	
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*N*/ BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>@@ -1052,19 +1052,19 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
>-/*N*/ 
>+/*N*/
> /*N*/ 	SetValue( nValue );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -------------------
>@@ -1135,20 +1135,20 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue().GetRGBColor();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	if(!(rVal >>= nValue))
>-/*N*/ 		return sal_False;
>-/*N*/ 
>+/*N*/ 		return false;
>+/*N*/
> /*N*/ 	SetValue( nValue );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------
>@@ -1338,7 +1338,7 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -1354,17 +1354,17 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		SvxConvertXPolygonToPolyPolygonBezier( aXPolygon, aBezier );
> /*N*/ 		rVal <<= aBezier;
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	if( nMemberId == MID_NAME )
> /*N*/ 	{
>-/*?*/ 		return sal_False;
>+/*?*/ 		return false;
> /*N*/ 	}
> /*N*/ 	else
> /*N*/ 	{
>@@ -1372,16 +1372,16 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		if( rVal.hasValue() && rVal.getValue() )
> /*N*/ 		{
> /*N*/ 			if( rVal.getValueType() != ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
>-/*?*/ 				return sal_False;
>-/*N*/ 
>+/*?*/ 				return false;
>+/*N*/
> /*N*/ 			aXPolygon.SetSize(0);
> /*N*/ 			::com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (::com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
> /*N*/ 			if( pCoords->Coordinates.getLength() > 0 )
> /*N*/ 				SvxConvertPolyPolygonBezierToXPolygon( pCoords, aXPolygon );
> /*N*/ 		}
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> /** this function searches in both the models pool and the styles pool for XLineStartItem
>@@ -2009,7 +2009,7 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ #ifndef SVX_LIGHT
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -2027,16 +2027,16 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		rVal <<= aBezier;
> /*N*/ 	}
> /*N*/ #endif
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	if( nMemberId == MID_NAME )
> /*N*/ 	{
>-/*N*/ 		return sal_False;
>+/*N*/ 		return false;
> /*N*/ 	}
> /*N*/ 	else
> /*N*/ 	{
>@@ -2044,16 +2044,16 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		if( rVal.hasValue() && rVal.getValue() )
> /*N*/ 		{
> /*N*/ 			if( rVal.getValueType() != ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
>-/*N*/ 				return sal_False;
>-/*N*/ 
>+/*N*/ 				return false;
>+/*N*/
> /*N*/ 			aXPolygon.SetSize(0);
> /*N*/ 			::com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (::com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
> /*N*/ 			if( pCoords->Coordinates.getLength() > 0 )
> /*N*/ 				SvxConvertPolyPolygonBezierToXPolygon( pCoords, aXPolygon );
> /*N*/ 		}
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // ----------------------------
>@@ -2125,18 +2125,18 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue( nValue );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2209,18 +2209,18 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue( nValue );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2293,20 +2293,20 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bValue = GetValue();
> /*N*/ 	rVal.setValue( &bValue, ::getCppuBooleanType()  );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
>-/*N*/ 		return sal_False;
>-/*N*/ 
>+/*N*/ 		return false;
>+/*N*/
> /*N*/ 	SetValue( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2379,20 +2379,20 @@ XubString aNameOrIndexEmptyString;
> //------------------------------------------------------------------------
> 
> 
>-/*N*/ sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	sal_Bool bValue = GetValue();
> /*N*/ 	rVal.setValue( &bValue, ::getCppuBooleanType()  );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
>-/*N*/ 		return sal_False;
>-/*N*/ 
>+/*N*/ 		return false;
>+/*N*/
> /*N*/ 	SetValue( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2476,17 +2476,17 @@ XubString aNameOrIndexEmptyString;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
>-/*N*/ 
>+/*N*/
> /*N*/ 	rVal <<= eFS;
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     ::com::sun::star::drawing::FillStyle eFS;
> /*N*/ 	if(!(rVal >>= eFS))
>@@ -2494,13 +2494,13 @@ XubString aNameOrIndexEmptyString;
> /*?*/         // also try an int (for Basic)
> /*?*/         sal_Int32 nFS;
> /*?*/         if(!(rVal >>= nFS))
>-/*?*/             return sal_False;
>+/*?*/             return false;
> /*?*/         eFS = (::com::sun::star::drawing::FillStyle)nFS;
> /*N*/     }
>-/*N*/ 
>+/*N*/
> /*N*/ 	SetValue( (XFillStyle)eFS );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2574,23 +2574,23 @@ XubString aNameOrIndexEmptyString;
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue().GetRGBColor();
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	if(!(rVal >>= nValue ))
>-/*N*/ 		return sal_False;
>-/*N*/ 
>+/*N*/ 		return false;
>+/*N*/
> /*N*/ 	SetValue( nValue );
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> 
>@@ -2897,7 +2897,7 @@ XubString aNameOrIndexEmptyString;
> 
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -2907,7 +2907,7 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		{
> /*N*/ 			const XGradient& aXGradient = GetValue();
> /*N*/ 			::com::sun::star::awt::Gradient aGradient;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aGradient.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
> /*N*/ 			aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
> /*N*/ 			aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
>@@ -2918,11 +2918,11 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			aGradient.StartIntensity = aXGradient.GetStartIntens();
> /*N*/ 			aGradient.EndIntensity = aXGradient.GetEndIntens();
> /*N*/ 			aGradient.StepCount = aXGradient.GetSteps();
>-/*N*/ 
>+/*N*/
> /*N*/ 			rVal <<= aGradient;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 	
>+/*N*/
> /*N*/ 		case MID_NAME:
> /*N*/ 		{
> /*N*/ 			::rtl::OUString aApiName;
>@@ -2930,7 +2930,7 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			rVal <<= aApiName;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 		
>+/*N*/
> /*N*/ 		case MID_GRADIENT_STYLE: rVal <<= (sal_Int16)GetValue().GetGradientStyle(); break;
> /*N*/ 		case MID_GRADIENT_STARTCOLOR: rVal <<= (sal_Int32)GetValue().GetStartColor().GetColor(); break;
> /*N*/ 		case MID_GRADIENT_ENDCOLOR: rVal <<= (sal_Int32)GetValue().GetEndColor().GetColor(); break;
>@@ -2941,19 +2941,19 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 		case MID_GRADIENT_STARTINTENSITY: rVal <<= GetValue().GetStartIntens(); break;
> /*N*/ 		case MID_GRADIENT_ENDINTENSITY: rVal <<= GetValue().GetEndIntens(); break;
> /*N*/ 		case MID_GRADIENT_STEPCOUNT: rVal <<= GetValue().GetSteps(); break;
>-/*N*/ 		
>-/*N*/ 		default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+/*N*/
>+/*N*/ 		default: DBG_ERROR("Wrong MemberId!"); return false;
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch ( nMemberId )
> /*N*/ 	{
> /*N*/ 		case MID_NAME:
>@@ -2964,15 +2964,15 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			SetName( aName );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_FILLGRADIENT:
> /*N*/ 		{
> /*N*/ 			::com::sun::star::awt::Gradient aGradient;
> /*N*/ 			if(!(rVal >>= aGradient))
> /*N*/ 				return sal_False;
>-/*N*/ 
>+/*N*/
> /*N*/ 			XGradient aXGradient;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aXGradient.SetGradientStyle( (XGradientStyle) aGradient.Style );
> /*N*/ 			aXGradient.SetStartColor( aGradient.StartColor );
> /*N*/ 			aXGradient.SetEndColor( aGradient.EndColor );
>@@ -2983,20 +2983,20 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			aXGradient.SetStartIntens( aGradient.StartIntensity );
> /*N*/ 			aXGradient.SetEndIntens( aGradient.EndIntensity );
> /*N*/ 			aXGradient.SetSteps( aGradient.StepCount );
>-/*N*/ 
>+/*N*/
> /*N*/ 			SetValue( aXGradient );
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_GRADIENT_STARTCOLOR:
> /*N*/ 		case MID_GRADIENT_ENDCOLOR:
> /*N*/ 		{
> /*?*/ 			sal_Int32 nVal;
> /*?*/ 			if(!(rVal >>= nVal ))
> /*?*/ 				return sal_False;
>-/*?*/ 			
>+/*?*/
> /*?*/ 			XGradient aXGradient = GetValue();
>-/*?*/ 			
>+/*?*/
> /*?*/ 			if ( nMemberId == MID_GRADIENT_STARTCOLOR )
> /*?*/ 				aXGradient.SetStartColor( nVal );
> /*?*/ 			else
>@@ -3004,7 +3004,7 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			SetValue( aXGradient );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_GRADIENT_STYLE:
> /*N*/ 		case MID_GRADIENT_ANGLE:
> /*N*/ 		case MID_GRADIENT_BORDER:
>@@ -3017,9 +3017,9 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			sal_Int16 nVal;
> /*?*/ 			if(!(rVal >>= nVal ))
> /*?*/ 				return sal_False;
>-/*?*/ 
>+/*?*/
> /*?*/ 			XGradient aXGradient = GetValue();
>-/*?*/ 			
>+/*?*/
> /*?*/ 			switch ( nMemberId )
> /*?*/ 			{
> /*?*/ 				case MID_GRADIENT_STYLE:
>@@ -3039,12 +3039,12 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 				case MID_GRADIENT_YOFFSET:
> /*?*/ 					aXGradient.SetYOffset( nVal ); break;
> /*?*/ 			}
>-/*?*/ 			
>+/*?*/
> /*?*/ 			SetValue( aXGradient );
> /*?*/ 			break;
> /*N*/ 		}
> /*N*/ 	}
>-/*N*/ 	
>+/*N*/
> /*N*/ 	return sal_True;
> /*N*/ }
> 
>@@ -3168,7 +3168,7 @@ XubString aNameOrIndexEmptyString;
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	return XFillGradientItem::QueryValue( rVal, nMemberId );
> /*N*/ }
>@@ -3442,17 +3442,17 @@ XubString aNameOrIndexEmptyString;
> 
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch ( nMemberId )
> /*N*/ 	{
> /*N*/ 		case MID_FILLHATCH:
> /*N*/ 		{
> /*N*/ 			::com::sun::star::drawing::Hatch aUnoHatch;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aUnoHatch.Style = (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle();
> /*N*/ 			aUnoHatch.Color = aHatch.GetColor().GetColor();
> /*N*/ 			aUnoHatch.Distance = aHatch.GetDistance();
>@@ -3460,7 +3460,7 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			rVal <<= aUnoHatch;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_NAME:
> /*N*/ 		{
> /*N*/ 			::rtl::OUString aApiName;
>@@ -3468,7 +3468,7 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			rVal <<= aApiName;
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_HATCH_STYLE:
> /*N*/ 			rVal <<= (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle(); break;
> /*N*/ 		case MID_HATCH_COLOR:
>@@ -3477,19 +3477,19 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			rVal <<= aHatch.GetDistance(); break;
> /*N*/ 		case MID_HATCH_ANGLE:
> /*N*/ 			rVal <<= aHatch.GetAngle(); break;
>-/*N*/ 
>+/*N*/
> /*N*/ 		default: DBG_ERROR("Wrong MemberId!"); return sal_False;
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------
>-/*N*/ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch ( nMemberId )
> /*N*/ 	{
> /*N*/ 		case MID_FILLHATCH:
>@@ -3497,14 +3497,14 @@ XubString aNameOrIndexEmptyString;
> /*N*/ 			::com::sun::star::drawing::Hatch aUnoHatch;
> /*N*/ 			if(!(rVal >>= aUnoHatch))
> /*N*/ 				return sal_False;
>-/*N*/ 
>+/*N*/
> /*N*/ 			aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
> /*N*/ 			aHatch.SetColor( aUnoHatch.Color );
> /*N*/ 			aHatch.SetDistance( aUnoHatch.Distance );
> /*N*/ 			aHatch.SetAngle( aUnoHatch.Angle );
> /*N*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_NAME:
> /*N*/ 		{
> /*?*/ 			::rtl::OUString aName;
>@@ -3513,7 +3513,7 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			SetName( aName );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_HATCH_STYLE:
> /*N*/ 		{
> /*?*/ 			sal_Int16 nVal;
>@@ -3522,7 +3522,7 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			aHatch.SetHatchStyle( (XHatchStyle)nVal );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 
>+/*N*/
> /*N*/ 		case MID_HATCH_COLOR:
> /*N*/ 		case MID_HATCH_DISTANCE:
> /*N*/ 		case MID_HATCH_ANGLE:
>@@ -3530,7 +3530,7 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 			sal_Int32 nVal;
> /*?*/ 			if (!(rVal >>= nVal ))
> /*?*/ 				return sal_False;
>-/*?*/ 
>+/*?*/
> /*?*/ 			if ( nMemberId == MID_HATCH_COLOR )
> /*?*/ 				aHatch.SetColor( nVal );
> /*?*/ 			else if ( nMemberId == MID_HATCH_DISTANCE )
>@@ -3539,11 +3539,11 @@ XubString aNameOrIndexEmptyString;
> /*?*/ 				aHatch.SetAngle( nVal );
> /*?*/ 			break;
> /*N*/ 		}
>-/*N*/ 		
>+/*N*/
> /*N*/ 		default: DBG_ERROR("Wrong MemberId!"); return sal_False;
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*N*/ BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>@@ -3660,10 +3660,10 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*************************************************************************
>@@ -3673,13 +3673,13 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue((XFormTextStyle)nValue);
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> //-------------------------
>@@ -3765,10 +3765,10 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*************************************************************************
>@@ -3778,13 +3778,13 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue((XFormTextAdjust)nValue);
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> //----------------------------
>@@ -4126,10 +4126,10 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*************************************************************************
>@@ -4139,13 +4139,13 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue((XFormTextShadow)nValue);
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -------------------------------
>@@ -4428,10 +4428,10 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= (sal_Int32)GetValue();
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*************************************************************************
>@@ -4441,13 +4441,13 @@ XubString aNameOrIndexEmptyString;
> \*************************************************************************/
> 
> // #FontWork#
>-/*N*/ sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	sal_Int32 nValue;
> /*N*/ 	rVal >>= nValue;
> /*N*/ 	SetValue((XFormTextStdForm)nValue);
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // --------------------------
>diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
>index 150f494..f272185 100644
>--- a/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
>+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx
>@@ -179,10 +179,10 @@ namespace binfilter {
> 
> // -----------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
>-/*N*/ 
>+/*N*/
> /*N*/ 	switch( GetValue() )
> /*N*/ 	{
> /*N*/ 	case XLINEJOINT_NONE:
>@@ -202,18 +202,18 @@ namespace binfilter {
> /*N*/ 	default:
> /*N*/ 		DBG_ERROR( "Unknown LineJoint enum value!" );
> /*N*/ 	}
>-/*N*/ 
>+/*N*/
> /*N*/ 	rVal <<= eJoint;
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------------
> 
>-/*N*/ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	XLineJoint eJoint = XLINEJOINT_NONE;
> /*N*/ 	::com::sun::star::drawing::LineJoint eUnoJoint;
>-/*N*/ 
>+/*N*/
> /*N*/ 	if(!(rVal >>= eUnoJoint))
> /*N*/     {
> /*?*/         // also try an int (for Basic)
>@@ -240,10 +240,10 @@ namespace binfilter {
> /*N*/ 		eJoint = XLINEJOINT_ROUND;
> /*N*/ 		break;
> /*N*/ 	}
>-/*N*/ 
>+/*N*/
> /*N*/ 	SetValue( eJoint );
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> // -----------------------------------------------------------------------------
>diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
>index f90c498..229f155 100644
>--- a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
>+++ b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
>@@ -665,7 +665,7 @@ namespace binfilter {
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -687,19 +687,19 @@ namespace binfilter {
> /*?*/ 		XOBitmap aXOBitmap( GetValue() );
> /*?*/ 		Bitmap aBmp( aXOBitmap.GetBitmap() );
> /*?*/ 		BitmapEx aBmpEx( aBmp );
>-/*?*/ 
>+/*?*/
> /*?*/ 		::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp(
> /*?*/ 			VCLUnoHelper::CreateBitmap( aBmpEx ) );
>-/*?*/ 
>+/*?*/
> /*?*/ 		rVal <<= xBmp;
> /*N*/ 	}
>-/*N*/ 
>-/*N*/ 	return sal_True;
>+/*N*/
>+/*N*/ 	return true;
> /*N*/ }
> 
> //------------------------------------------------------------------------
> 
>-/*N*/ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -709,7 +709,7 @@ namespace binfilter {
> /*?*/ 		if(rVal >>= aName)
> /*?*/ 		{
> /*?*/ 			SetName( aName );
>-/*?*/ 			return sal_True;
>+/*?*/ 			return true;
> /*?*/ 		}
> /*N*/ 	}
> /*N*/ 	else if( nMemberId == MID_GRAFURL )
>@@ -720,7 +720,7 @@ namespace binfilter {
> /*N*/ 			BfGraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
> /*N*/ 			XOBitmap aBMP( aGrafObj );
> /*N*/ 			SetValue( aBMP );
>-/*N*/ 			return sal_True;
>+/*N*/ 			return true;
> /*N*/ 		}
> /*N*/ 	}
> /*N*/ 	else
>@@ -730,20 +730,20 @@ namespace binfilter {
> /*?*/ 		{
> /*?*/ 			BitmapEx aInputEx( VCLUnoHelper::GetBitmap( xBmp ) );
> /*?*/ 			Bitmap aInput( aInputEx.GetBitmap() );
>-/*?*/ 
>+/*?*/
> /*?*/ 			// Bitmap einsetzen
> /*?*/ 			aXOBitmap.SetBitmap( aInput );
> /*?*/ 			aXOBitmap.SetBitmapType(XBITMAP_IMPORT);
>-/*?*/ 
>+/*?*/
> /*?*/ 			if(aInput.GetSizePixel().Width() == 8
> /*?*/ 				&& aInput.GetSizePixel().Height() == 8
> /*?*/ 				&& aInput.GetColorCount() == 2)
> /*?*/ 			{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
> /*?*/ 			}
>-/*?*/ 			return sal_True;
>+/*?*/ 			return true;
> /*?*/ 		}
> /*?*/ 	}
>-/*N*/ 	return sal_False;
>+/*N*/ 	return false;
> /*N*/ }
> 
> /*N*/ BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>diff --git a/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx b/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx
>index e5e1a5a..93cc0ec 100644
>--- a/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx
>+++ b/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx
>@@ -131,10 +131,10 @@ sal_uInt16 SwMirrorGrf::GetValueCount() const
> /*N*/ 				   nEnum == RES_MIRROR_GRF_BOTH;
> /*N*/ 			return bEnum;
> /*N*/ }
>-/*N*/ BOOL SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
>-/*N*/ 	sal_Bool bRet = sal_True,
>-/*N*/ 		 bVal;
>+    /*N*/ 	bool bRet = true;
>+/*N*/ 	sal_Bool bVal;
> /*N*/ 	// Vertikal und Horizontal sind mal getauscht worden!
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	switch ( nMemberId )
>@@ -157,9 +157,9 @@ sal_uInt16 SwMirrorGrf::GetValueCount() const
> /*N*/ 	return bRet;
> /*N*/ }
> 
>-/*N*/ BOOL SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
>-/*N*/ 	sal_Bool bRet = sal_True;
>+/*N*/ 	bool bRet = true;
> /*N*/ 	sal_Bool bVal = *(sal_Bool*)rVal.getValue();
> /*N*/ 	// Vertikal und Horizontal sind mal getauscht worden!
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>@@ -200,7 +200,7 @@ sal_uInt16 SwMirrorGrf::GetValueCount() const
> /*N*/ 			break;
> /*N*/ 		default:
> /*N*/ 			ASSERT( !this, "unknown MemberId" );
>-/*N*/ 			bRet = sal_False;
>+/*N*/ 			bRet = false;
> /*N*/ 	}
> /*N*/ 	return bRet;
> /*N*/ }
>@@ -238,28 +238,28 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB )
> /*N*/ }
> 
> 
>-/*N*/ BOOL SwRotationGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwRotationGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
> /*N*/     // where we still want this to be a sal_Int16
> /*N*/     rVal <<= (sal_Int16)GetValue();
>-/*N*/     return TRUE;
>+/*N*/     return true;
> /*N*/ }
> 
>-/*N*/ BOOL SwRotationGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
> /*N*/     // where we still want this to be a sal_Int16
> /*N*/     sal_Int16 nValue;
> /*N*/ 	if (rVal >>= nValue)
> /*N*/ 	{
>-/*N*/         // UINT16 argument needed
>-/*N*/         SetValue( (UINT16) nValue );
>-/*N*/ 		return TRUE;
>+/*N*/       // UINT16 argument needed
>+/*N*/       SetValue( (UINT16) nValue );
>+/*N*/ 		return true;
> /*N*/ 	}
> /*N*/
>-/*N*/     DBG_ERROR( "SwRotationGrf::PutValue - Wrong type!" );
>-/*N*/ 	return FALSE;
>+/*N*/   DBG_ERROR( "SwRotationGrf::PutValue - Wrong type!" );
>+/*N*/ 	return true;
> /*N*/ }
> 
> // ------------------------------------------------------------------
>@@ -310,13 +310,13 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB )
> /*N*/ 		nValue == ((SwGammaGrf&)rCmp).GetValue();
> /*N*/ }
> 
>-/*N*/ BOOL SwGammaGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwGammaGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	rVal <<= nValue;
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ BOOL SwGammaGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SwGammaGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	return rVal >>= nValue;
> /*N*/ }
>@@ -335,17 +335,17 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB )
> /*N*/ 	return new SwTransparencyGrf( *this );
> /*N*/ }
> // ------------------------------------------------------------------
>-/*N*/ BOOL SwTransparencyGrf::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SwTransparencyGrf::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/ 										BYTE nMemberId  ) const
> /*N*/ {
> /*N*/ 	DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!");
> /*N*/ 	sal_Int16 nRet = GetValue();
> /*N*/     DBG_ASSERT( 0 <= nRet && nRet <= 100, "value out of range" );
> /*N*/     rVal <<= nRet;
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> // ------------------------------------------------------------------
>-/*N*/ BOOL SwTransparencyGrf::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SwTransparencyGrf::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*N*/ 										BYTE nMemberId  )
> /*N*/ {
> /*N*/ 	//temporary conversion until this is a SfxInt16Item!
>@@ -363,7 +363,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB )
> /*N*/     }
> /*N*/     DBG_ASSERT( 0 <= nVal && nVal <= 100, "value out of range" );
> /*N*/ 	SetValue(nVal);
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> 
> // ------------------------------------------------------------------
>@@ -374,24 +374,24 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB )
> /*N*/ }
> 
> 
>-/*N*/ BOOL SwDrawModeGrf::QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SwDrawModeGrf::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/ 								BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	drawing::ColorMode eRet = (drawing::ColorMode)GetEnumValue();
> /*N*/ 	rVal <<= eRet;
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ BOOL SwDrawModeGrf::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SwDrawModeGrf::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*N*/ 								BYTE nMemberId  )
> /*N*/ {
> /*N*/ 	sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal );
> /*N*/ 	if(eVal >= 0 && eVal <= GRAPHICDRAWMODE_WATERMARK)
> /*N*/ 	{
> /*N*/ 		SetEnumValue((USHORT)eVal);
>-/*N*/ 		return TRUE;
>+/*N*/ 		return true;
> /*N*/ 	}
>-/*N*/ 	return FALSE;
>+/*N*/ 	return false;
> /*N*/ }
> 
> 
>diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
>index 746a763..1fbeb10 100644
>--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
>+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>+ *
>  * Copyright 2000, 2010 Oracle and/or its affiliates.
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>@@ -205,698 +205,698 @@ using namespace ::com::sun::star::uno;
> using namespace ::com::sun::star::container;
> using namespace ::rtl;
> 
>-/*N*/ SV_IMPL_PTRARR(SwColumns,SwColumn*)
>+SV_IMPL_PTRARR(SwColumns,SwColumn*)
> 
>-/*N*/ TYPEINIT1(SwFrmFmt, 	SwFmt );  //rtti fuer SwFrmFmt
>-/*N*/ TYPEINIT1(SwFlyFrmFmt,  SwFrmFmt);
>-/*N*/ TYPEINIT1(SwDrawFrmFmt, SwFrmFmt);
>-/*N*/ TYPEINIT1(SwFmtVertOrient, SfxPoolItem);
>-/*N*/ TYPEINIT1(SwFmtHoriOrient, SfxPoolItem);
>-/*N*/ TYPEINIT2(SwFmtHeader,  SfxPoolItem, SwClient );
>-/*N*/ TYPEINIT2(SwFmtFooter,  SfxPoolItem, SwClient );
>-/*N*/ TYPEINIT2(SwFmtPageDesc,  SfxPoolItem, SwClient );
>-/*N*/ TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem);
>+TYPEINIT1(SwFrmFmt,    SwFmt );  //rtti fuer SwFrmFmt
>+TYPEINIT1(SwFlyFrmFmt,  SwFrmFmt);
>+TYPEINIT1(SwDrawFrmFmt, SwFrmFmt);
>+TYPEINIT1(SwFmtVertOrient, SfxPoolItem);
>+TYPEINIT1(SwFmtHoriOrient, SfxPoolItem);
>+TYPEINIT2(SwFmtHeader,  SfxPoolItem, SwClient );
>+TYPEINIT2(SwFmtFooter,  SfxPoolItem, SwClient );
>+TYPEINIT2(SwFmtPageDesc,  SfxPoolItem, SwClient );
>+TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem);
> 
> /* -----------------19.05.98 09:26-------------------
>- * 	Umwandlung fuer QueryValue
>+ *  Umwandlung fuer QueryValue
>  * --------------------------------------------------*/
>-/*N*/ sal_Int16 lcl_RelToINT(SwRelationOrient eRelation)
>-/*N*/ {
>-/*N*/ 	sal_Int16 nRet = text::RelOrientation::FRAME;
>-/*N*/ 	switch(eRelation)
>-/*N*/ 	{
>-/*N*/ 	case  PRTAREA:			nRet = text::RelOrientation::PRINT_AREA; break;
>-/*?*/ 	case  REL_CHAR:			nRet = text::RelOrientation::CHAR; break;
>-/*?*/ 	case  REL_PG_LEFT:		nRet = text::RelOrientation::PAGE_LEFT; break;
>-/*N*/ 	case  REL_PG_RIGHT:		nRet = text::RelOrientation::PAGE_RIGHT; break;
>-/*?*/ 	case  REL_FRM_LEFT:		nRet = text::RelOrientation::FRAME_LEFT; break;
>-/*?*/ 	case  REL_FRM_RIGHT:	nRet = text::RelOrientation::FRAME_RIGHT; break;
>-/*N*/ 	case  REL_PG_FRAME:		nRet = text::RelOrientation::PAGE_FRAME; break;
>-/*N*/ 	case  REL_PG_PRTAREA:	nRet = text::RelOrientation::PAGE_PRINT_AREA; break;
>-/*N*/ 	}
>-/*N*/ 	return nRet;
>-/*N*/ }
>-/*N*/ SwRelationOrient	lcl_IntToRelation(const uno::Any& rVal)
>-/*N*/ {
>-/*N*/ 	SwRelationOrient eRet = FRAME;
>-/*N*/     sal_Int16 nVal;
>-/*N*/     rVal >>= nVal;
>-/*N*/     switch(nVal)
>-/*N*/ 	{
>-/*N*/ 		case  text::RelOrientation::PRINT_AREA: 	eRet =   PRTAREA           ; break;
>-/*?*/ 		case  text::RelOrientation::CHAR:    	eRet =   REL_CHAR          ; break;
>-/*?*/ 		case  text::RelOrientation::PAGE_LEFT:    eRet =   REL_PG_LEFT       ; break;
>-/*?*/ 		case  text::RelOrientation::PAGE_RIGHT:    eRet =   REL_PG_RIGHT      ; break;
>-/*?*/ 		case  text::RelOrientation::FRAME_LEFT:    eRet =   REL_FRM_LEFT      ; break;
>-/*?*/ 		case  text::RelOrientation::FRAME_RIGHT:    eRet =   REL_FRM_RIGHT     ; break;
>-/*N*/ 		case  text::RelOrientation::PAGE_FRAME:    eRet =   REL_PG_FRAME      ; break;
>-/*N*/ 		case  text::RelOrientation::PAGE_PRINT_AREA:    eRet =   REL_PG_PRTAREA    ; break;
>-/*N*/ 	}
>-/*N*/ 	return eRet;
>-/*N*/ }
>-
>-/*N*/ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
>-/*N*/ {
>-/*N*/ 	//Wenn der Client der letzte ist der das Format benutzt, so muss dieses
>-/*N*/ 	//vernichtet werden. Zuvor muss jedoch ggf. die Inhaltssection vernichtet
>-/*N*/ 	//werden.
>-/*N*/ 	SwDoc* pDoc = pFmt->GetDoc();
>-/*N*/ 	pFmt->Remove( pToRemove );
>-/*N*/ 	if( pDoc->IsInDtor() )
>-/*N*/ 	{
>-/*N*/ 		delete pFmt;
>-/*N*/ 		return;
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	//Nur noch Frms angemeldet?
>-/*N*/ 	sal_Bool bDel = sal_True;
>-/*N*/ 	{
>-/*N*/ 		// Klammer, weil im DTOR SwClientIter das Flag bTreeChg zurueck
>-/*N*/ 		// gesetzt wird. Unguenstig, wenn das Format vorher zerstoert wird.
>-/*N*/ 		SwClientIter aIter( *pFmt );
>-/*N*/ 		SwClient *pLast = aIter.GoStart();
>-/*N*/ 		if( pLast )
>-/*N*/ 			do {
>-/*M*/ 				bDel = pLast->IsA( TYPE(SwFrm) )|| pLast->IsA(TYPE(SwXHeadFootText));
>-/*N*/ 			} while( bDel && 0 != ( pLast = aIter++ ));
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	if ( bDel )
>-/*N*/ 	{
>-/*?*/ 		//Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das
>-/*?*/ 		//ParkCrsr einer (beliebigen) Shell gerufen werden.
>-/*?*/ 		SwFmtCntnt& rCnt = (SwFmtCntnt&)pFmt->GetCntnt();
>-/*?*/ 		if ( rCnt.GetCntntIdx() )
>-/*?*/ 		{
>-/*?*/ 			SwNode *pNode = 0;
>-/*?*/ 			{
>-/*?*/ 				SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 );
>-/*?*/ 				//Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das
>-/*?*/ 				//ParkCrsr einer (beliebigen) Shell gerufen werden.
>-/*?*/ 				pNode = pDoc->GetNodes()[ aIdx ];
>-/*?*/ 				sal_uInt32 nEnd = pNode->EndOfSectionIndex();
>-/*?*/ 				while ( aIdx < nEnd )
>-/*?*/ 				{
>-/*?*/ 					if ( pNode->IsCntntNode() &&
>-/*?*/ 						 ((SwCntntNode*)pNode)->GetDepends() )
>-/*?*/ 					{
>-/*?*/ 						SwClientIter aIter( *(SwCntntNode*)pNode );
>-/*?*/ 						do
>-/*?*/ 						{
>-/*?*/ 							if( aIter()->ISA( SwCrsrShell ) )
>-/*?*/ 							{
>-/*?*/ 								DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwCrsrShell*)aIter())->ParkCrsr( aIdx );
>-/*?*/ 							}
>-/*?*/ 						} while ( aIter++ );
>-/*?*/ 					}
>-/*?*/ 					aIdx++;
>-/*?*/ 					pNode = pDoc->GetNodes()[ aIdx ];
>-/*?*/ 				}
>-/*?*/ 			}
>-/*?*/ 			rCnt.SetNewCntntIdx( (const SwNodeIndex*)0 );
>-/*?*/
>-/*?*/ 			// beim Loeschen von Header/Footer-Formaten IMMER das Undo
>-/*?*/ 			// abschalten! (Bug 31069)
>-/*?*/
>-/*?*/ 			ASSERT( pNode, "Ein grosses Problem." );
>-/*?*/ 			pDoc->DeleteSection( pNode );
>-/*?*/
>-/*?*/ 		}
>-/*?*/ 		delete pFmt;
>-/*N*/ 	}
>-/*N*/ }
>-
>-//	class SwFmtFrmSize
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
>-/*N*/ 	: SfxPoolItem( RES_FRM_SIZE ),
>-/*N*/ 	aSize( nWidth, nHeight ),
>-/*N*/ 	eFrmSize( eSize )
>-/*N*/ {
>-/*N*/ 	nWidthPercent = nHeightPercent = 0;
>-/*N*/ }
>-
>-/*N*/ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy )
>-/*N*/ {
>-/*N*/ 	aSize = rCpy.GetSize();
>-/*N*/ 	eFrmSize = rCpy.GetSizeType();
>-/*N*/ 	nHeightPercent = rCpy.GetHeightPercent();
>-/*N*/ 	nWidthPercent  = rCpy.GetWidthPercent();
>-/*N*/ 	return *this;
>-/*N*/ }
>-
>-/*N*/ int  SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return( eFrmSize 		== ((SwFmtFrmSize&)rAttr).eFrmSize &&
>-/*N*/ 			aSize    		== ((SwFmtFrmSize&)rAttr).GetSize()&&
>-/*N*/ 			nWidthPercent	== ((SwFmtFrmSize&)rAttr).GetWidthPercent() &&
>-/*N*/ 			nHeightPercent	== ((SwFmtFrmSize&)rAttr).GetHeightPercent() );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtFrmSize::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtFrmSize( *this );
>-/*N*/ }
>+sal_Int16 lcl_RelToINT(SwRelationOrient eRelation)
>+{
>+    sal_Int16 nRet = text::RelOrientation::FRAME;
>+    switch(eRelation)
>+    {
>+    case  PRTAREA:          nRet = text::RelOrientation::PRINT_AREA; break;
>+    case  REL_CHAR:         nRet = text::RelOrientation::CHAR; break;
>+    case  REL_PG_LEFT:      nRet = text::RelOrientation::PAGE_LEFT; break;
>+    case  REL_PG_RIGHT:     nRet = text::RelOrientation::PAGE_RIGHT; break;
>+    case  REL_FRM_LEFT:     nRet = text::RelOrientation::FRAME_LEFT; break;
>+    case  REL_FRM_RIGHT:    nRet = text::RelOrientation::FRAME_RIGHT; break;
>+    case  REL_PG_FRAME:     nRet = text::RelOrientation::PAGE_FRAME; break;
>+    case  REL_PG_PRTAREA:   nRet = text::RelOrientation::PAGE_PRINT_AREA; break;
>+    }
>+    return nRet;
>+}
>+SwRelationOrient   lcl_IntToRelation(const uno::Any& rVal)
>+{
>+    SwRelationOrient eRet = FRAME;
>+    sal_Int16 nVal;
>+    rVal >>= nVal;
>+    switch(nVal)
>+    {
>+    case  text::RelOrientation::PRINT_AREA:     eRet =   PRTAREA           ; break;
>+    case  text::RelOrientation::CHAR:       eRet =   REL_CHAR          ; break;
>+    case  text::RelOrientation::PAGE_LEFT:    eRet =   REL_PG_LEFT       ; break;
>+    case  text::RelOrientation::PAGE_RIGHT:    eRet =   REL_PG_RIGHT      ; break;
>+    case  text::RelOrientation::FRAME_LEFT:    eRet =   REL_FRM_LEFT      ; break;
>+    case  text::RelOrientation::FRAME_RIGHT:    eRet =   REL_FRM_RIGHT     ; break;
>+    case  text::RelOrientation::PAGE_FRAME:    eRet =   REL_PG_FRAME      ; break;
>+    case  text::RelOrientation::PAGE_PRINT_AREA:    eRet =   REL_PG_PRTAREA    ; break;
>+    }
>+    return eRet;
>+}
>+
>+void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
>+{
>+    //Wenn der Client der letzte ist der das Format benutzt, so muss dieses
>+    //vernichtet werden. Zuvor muss jedoch ggf. die Inhaltssection vernichtet
>+    //werden.
>+    SwDoc* pDoc = pFmt->GetDoc();
>+    pFmt->Remove( pToRemove );
>+    if( pDoc->IsInDtor() )
>+    {
>+        delete pFmt;
>+        return;
>+    }
>+
>+    //Nur noch Frms angemeldet?
>+    sal_Bool bDel = sal_True;
>+    {
>+        // Klammer, weil im DTOR SwClientIter das Flag bTreeChg zurueck
>+        // gesetzt wird. Unguenstig, wenn das Format vorher zerstoert wird.
>+        SwClientIter aIter( *pFmt );
>+        SwClient *pLast = aIter.GoStart();
>+        if( pLast )
>+            do {
>+                bDel = pLast->IsA( TYPE(SwFrm) )|| pLast->IsA(TYPE(SwXHeadFootText));
>+            } while( bDel && 0 != ( pLast = aIter++ ));
>+    }
>+
>+    if ( bDel )
>+    {
>+        //Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das
>+        //ParkCrsr einer (beliebigen) Shell gerufen werden.
>+        SwFmtCntnt& rCnt = (SwFmtCntnt&)pFmt->GetCntnt();
>+        if ( rCnt.GetCntntIdx() )
>+        {
>+            SwNode *pNode = 0;
>+            {
>+                SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 );
>+                //Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das
>+                //ParkCrsr einer (beliebigen) Shell gerufen werden.
>+                pNode = pDoc->GetNodes()[ aIdx ];
>+                sal_uInt32 nEnd = pNode->EndOfSectionIndex();
>+                while ( aIdx < nEnd )
>+                {
>+                    if ( pNode->IsCntntNode() &&
>+                         ((SwCntntNode*)pNode)->GetDepends() )
>+                    {
>+                        SwClientIter aIter( *(SwCntntNode*)pNode );
>+                        do
>+                        {
>+                            if( aIter()->ISA( SwCrsrShell ) )
>+                            {
>+                                DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwCrsrShell*)aIter())->ParkCrsr( aIdx );
>+                            }
>+                        } while ( aIter++ );
>+                    }
>+                    aIdx++;
>+                    pNode = pDoc->GetNodes()[ aIdx ];
>+                }
>+            }
>+            rCnt.SetNewCntntIdx( (const SwNodeIndex*)0 );
>+
>+            // beim Loeschen von Header/Footer-Formaten IMMER das Undo
>+            // abschalten! (Bug 31069)
>+
>+            ASSERT( pNode, "Ein grosses Problem." );
>+            pDoc->DeleteSection( pNode );
>+
>+        }
>+        delete pFmt;
>+    }
>+}
>+
>+//  class SwFmtFrmSize
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
>+    : SfxPoolItem( RES_FRM_SIZE ),
>+      aSize( nWidth, nHeight ),
>+      eFrmSize( eSize )
>+{
>+    nWidthPercent = nHeightPercent = 0;
>+}
>+
>+SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy )
>+{
>+    aSize = rCpy.GetSize();
>+    eFrmSize = rCpy.GetSizeType();
>+    nHeightPercent = rCpy.GetHeightPercent();
>+    nWidthPercent  = rCpy.GetWidthPercent();
>+    return *this;
>+}
>+
>+int  SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return( eFrmSize        == ((SwFmtFrmSize&)rAttr).eFrmSize &&
>+            aSize           == ((SwFmtFrmSize&)rAttr).GetSize()&&
>+            nWidthPercent   == ((SwFmtFrmSize&)rAttr).GetWidthPercent() &&
>+            nHeightPercent  == ((SwFmtFrmSize&)rAttr).GetHeightPercent() );
>+}
>+
>+SfxPoolItem*  SwFmtFrmSize::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtFrmSize( *this );
>+}
> 
> 
> /* -----------------24.04.98 11:36-------------------
>  *
>  * --------------------------------------------------*/
>-/*N*/ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_FRMSIZE_SIZE:
>-/*N*/ 		{
>-/*?*/ 			awt::Size aTmp;
>-/*?*/ 			aTmp.Height = TWIP_TO_MM100(aSize.Height());
>-/*?*/ 			aTmp.Width = TWIP_TO_MM100(aSize.Width());
>-/*?*/ 			rVal.setValue(&aTmp, ::getCppuType((const awt::Size*)0));
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_REL_HEIGHT:
>-/*N*/ 			rVal <<= (sal_Int16)(GetHeightPercent() != 0xFF ? GetHeightPercent() : 0);
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_REL_WIDTH:
>-/*N*/ 			rVal <<= (sal_Int16)(GetWidthPercent() != 0xFF ? GetWidthPercent() : 0);
>-/*N*/ 		break;
>-/*N*/         case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = 0xFF == GetHeightPercent();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = 0xFF == GetWidthPercent();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_WIDTH :
>-/*N*/ 			rVal <<= (sal_Int32)TWIP_TO_MM100(aSize.Width());
>-/*N*/ 		break;
>-/*N*/         case MID_FRMSIZE_HEIGHT:
>-/*N*/             // #95848# returned size should never be zero.
>-/*N*/             // (there was a bug that allowed for setting height to 0.
>-/*N*/             // Thus there some documents existing with that not allowed
>-/*N*/             // attribut value which may cause problems on import.)
>-/*N*/             rVal <<= (sal_Int32)TWIP_TO_MM100(aSize.Height() < MINLAY ? MINLAY : aSize.Height() );
>-/*N*/         break;
>-/*N*/         case MID_FRMSIZE_SIZE_TYPE:
>-/*N*/ 			rVal <<= (sal_Int16)GetSizeType();
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_IS_AUTO_HEIGHT:
>-/*N*/ 		{
>-/*?*/ 			BOOL bTmp = ATT_FIX_SIZE != GetSizeType();
>-/*?*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 	}
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+bool SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    switch ( nMemberId )
>+    {
>+    case MID_FRMSIZE_SIZE:
>+    {
>+        awt::Size aTmp;
>+        aTmp.Height = TWIP_TO_MM100(aSize.Height());
>+        aTmp.Width = TWIP_TO_MM100(aSize.Width());
>+        rVal.setValue(&aTmp, ::getCppuType((const awt::Size*)0));
>+    }
>+    break;
>+    case MID_FRMSIZE_REL_HEIGHT:
>+        rVal <<= (sal_Int16)(GetHeightPercent() != 0xFF ? GetHeightPercent() : 0);
>+        break;
>+    case MID_FRMSIZE_REL_WIDTH:
>+        rVal <<= (sal_Int16)(GetWidthPercent() != 0xFF ? GetWidthPercent() : 0);
>+        break;
>+    case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
>+    {
>+        BOOL bTmp = 0xFF == GetHeightPercent();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
>+    {
>+        BOOL bTmp = 0xFF == GetWidthPercent();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_FRMSIZE_WIDTH :
>+        rVal <<= (sal_Int32)TWIP_TO_MM100(aSize.Width());
>+        break;
>+    case MID_FRMSIZE_HEIGHT:
>+        // #95848# returned size should never be zero.
>+        // (there was a bug that allowed for setting height to 0.
>+        // Thus there some documents existing with that not allowed
>+        // attribut value which may cause problems on import.)
>+        rVal <<= (sal_Int32)TWIP_TO_MM100(aSize.Height() < MINLAY ? MINLAY : aSize.Height() );
>+        break;
>+    case MID_FRMSIZE_SIZE_TYPE:
>+        rVal <<= (sal_Int16)GetSizeType();
>+        break;
>+    case MID_FRMSIZE_IS_AUTO_HEIGHT:
>+    {
>+        BOOL bTmp = ATT_FIX_SIZE != GetSizeType();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    }
>+    return true;
>+}
> 
> /* -----------------24.04.98 11:36-------------------
>  *
>  * --------------------------------------------------*/
>-/*N*/ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_FRMSIZE_SIZE:
>-/*N*/ 		{
>-/*?*/             awt::Size aVal;
>-/*?*/             if(!(rVal >>= aVal))
>-/*?*/                 bRet = sal_False;
>-/*?*/             else
>-/*?*/             {
>-/*?*/                 Size aTmp(aVal.Width, aVal.Height);
>-/*?*/                 if(bConvert)
>-/*?*/                 {
>-/*?*/                     aTmp.Height() = MM100_TO_TWIP(aTmp.Height());
>-/*?*/                     aTmp.Width() = MM100_TO_TWIP(aTmp.Width());
>-/*?*/                 }
>-/*?*/                 if(aTmp.Height() && aTmp.Width())
>-/*?*/                     aSize = aTmp;
>-/*?*/                 else
>-/*?*/                     bRet = sal_False;
>-/*?*/             }
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_REL_HEIGHT:
>-/*N*/ 		{
>-/*N*/ 			sal_Int16 nSet;
>-/*N*/ 			rVal >>= nSet;
>-/*N*/           if(nSet >= 0 && nSet <= 0xfe)
>-/*N*/ 				SetHeightPercent((BYTE)nSet);
>-/*N*/ 			else
>-/*?*/ 				bRet = sal_False;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_REL_WIDTH:
>-/*N*/ 		{
>-/*N*/ 			sal_Int16 nSet;
>-/*N*/ 			rVal >>= nSet;
>-/*N*/             if(nSet >= 0 && nSet <= 0xfe)
>-/*N*/ 				SetWidthPercent((BYTE)nSet);
>-/*N*/ 			else
>-/*?*/ 				bRet = sal_False;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
>-/*N*/ 		{
>-/*N*/ 			sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>-/*N*/ 			if(bSet)
>-/*?*/ 				SetHeightPercent(0xff);
>-/*N*/ 			else if( 0xff == GetHeightPercent() )
>-/*?*/ 				SetHeightPercent( 0 );
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
>-/*N*/ 		{
>-/*N*/ 			sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>-/*N*/ 			if(bSet)
>-/*?*/ 				SetWidthPercent(0xff);
>-/*N*/ 			else if( 0xff == GetWidthPercent() )
>-/*?*/ 				SetWidthPercent(0);
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_WIDTH :
>-/*N*/ 		{
>-/*N*/             sal_Int32 nWd;
>-/*N*/             if(rVal >>= nWd)
>-/*N*/             {
>-/*N*/                 if(bConvert)
>-/*N*/                     nWd = MM100_TO_TWIP(nWd);
>-/*N*/                 if(nWd > 0)
>-/*N*/                     aSize.Width() = nWd;
>-/*N*/                 else
>-/*?*/                     bRet = sal_False;
>-/*N*/             }
>-/*N*/             else
>-/*?*/                 bRet = sal_False;
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_HEIGHT:
>-/*N*/ 		{
>-/*N*/             sal_Int32 nHg;
>-/*N*/             if(rVal >>= nHg)
>-/*N*/             {
>-/*N*/                 if(bConvert)
>-/*N*/                     nHg = MM100_TO_TWIP(nHg);
>-/*N*/                 if(nHg > 0)
>-/*N*/                     aSize.Height() = nHg;
>-/*N*/                 else
>-/*?*/                     bRet = sal_False;
>-/*N*/             }
>-/*N*/             else
>-/*?*/                 bRet = sal_False;
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_SIZE_TYPE:
>-/*N*/ 		{
>-/*N*/             sal_Int16 nType;
>-/*N*/             if((rVal >>= nType) && nType >= 0 && nType <= ATT_MIN_SIZE )
>-/*N*/ 			{
>-/*N*/ 				SetSizeType((SwFrmSize)nType);
>-/*N*/ 			}
>-/*N*/             else
>-/*?*/                 bRet = sal_False;
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_FRMSIZE_IS_AUTO_HEIGHT:
>-/*N*/ 		{
>-/*?*/ 			sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>-/*?*/ 			SetSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
>-/*?*/  		}
>-/*?*/ 		break;
>-/*?*/ 		default:
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ Size  SwFmtFrmSize::GetSizeConvertedToSw31(
>-/*N*/ 				const SvxLRSpaceItem *pLRSpace,
>-/*N*/ 				const SvxULSpaceItem *pULSpace ) const
>-/*N*/ {
>-/*N*/ 	// Sw4.0: Groesse enthaelt keine Raender
>-/*N*/ 	// Sw3.x: Groesse enthaelt Raender
>-/*N*/ 	// ==> Raender addieren
>-/*N*/ 	Size aNewSize = GetSize();
>-/*N*/ 	if( pLRSpace )
>-/*N*/ 	{
>-/*N*/ 		aNewSize.Width() += pLRSpace->GetLeft();
>-/*N*/ 		aNewSize.Width() += pLRSpace->GetRight();
>-/*N*/ 	}
>-/*N*/ 	if( pULSpace )
>-/*N*/ 	{
>-/*N*/ 		aNewSize.Height() += pULSpace->GetUpper();
>-/*N*/ 		aNewSize.Height() +=  pULSpace->GetLower();
>-/*N*/ 	}
>-/*N*/ 	return aNewSize;
>-/*N*/ }
>-
>-/*N*/ Size  SwFmtFrmSize::GetSizeConvertedFromSw31(
>-/*N*/ 				const SvxLRSpaceItem *pLRSpace,
>-/*N*/ 				const SvxULSpaceItem *pULSpace ) const
>-/*N*/ {
>-/*N*/ 	// Sw4.0: Groesse enthaelt keine Raender
>-/*N*/ 	// Sw3.x: Groesse enthaelt Raender
>-/*N*/ 	// ==> Raender subtrahieren
>-/*N*/ 	Size aNewSize = GetSize();
>-/*N*/ 	if( pLRSpace )
>-/*N*/ 	{
>-/*N*/ 		aNewSize.Width() -= pLRSpace->GetLeft();
>-/*N*/ 		aNewSize.Width() -= pLRSpace->GetRight();
>-/*N*/ 	}
>-/*N*/ 	if( pULSpace )
>-/*N*/ 	{
>-/*N*/ 		aNewSize.Height() -= pULSpace->GetUpper();
>-/*N*/ 		aNewSize.Height() -=  pULSpace->GetLower();
>-/*N*/ 	}
>-/*N*/ 	return aNewSize;
>-/*N*/ }
>-
>-
>-//	class SwFmtFillOrder
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
>-/*N*/ 	: SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
>-/*N*/ {}
>-
>-/*N*/ SfxPoolItem*  SwFmtFillOrder::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtFillOrder( GetFillOrder() );
>-/*N*/ }
>-
>-
>-//	class SwFmtHeader
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt )
>-/*N*/ 	: SfxPoolItem( RES_HEADER ),
>-/*N*/ 	SwClient( pHeaderFmt ),
>-/*N*/ 	bActive( pHeaderFmt ? sal_True : sal_False )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy )
>-/*N*/ 	: SfxPoolItem( RES_HEADER ),
>-/*N*/ 	SwClient( (SwModify*)rCpy.GetRegisteredIn() ),
>-/*N*/ 	bActive( rCpy.IsActive() )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtHeader::SwFmtHeader( sal_Bool bOn )
>-/*N*/ 	: SfxPoolItem( RES_HEADER ),
>-/*N*/ 	SwClient( 0 ),
>-/*N*/ 	bActive( bOn )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/  SwFmtHeader::~SwFmtHeader()
>-/*N*/ {
>-/*N*/ 	if ( GetHeaderFmt() )
>-/*N*/ 		DelHFFormat( this, GetHeaderFmt() );
>-/*N*/ }
>-
>-/*N*/ int  SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( pRegisteredIn == ((SwFmtHeader&)rAttr).GetRegisteredIn() &&
>-/*N*/ 			 bActive == ((SwFmtHeader&)rAttr).IsActive() );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtHeader::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtHeader( *this );
>-/*N*/ }
>-
>-//	class SwFmtFooter
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt )
>-/*N*/ 	: SfxPoolItem( RES_FOOTER ),
>-/*N*/ 	SwClient( pFooterFmt ),
>-/*N*/ 	bActive( pFooterFmt ? sal_True : sal_False )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy )
>-/*N*/ 	: SfxPoolItem( RES_FOOTER ),
>-/*N*/ 	SwClient( (SwModify*)rCpy.GetRegisteredIn() ),
>-/*N*/ 	bActive( rCpy.IsActive() )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtFooter::SwFmtFooter( sal_Bool bOn )
>-/*N*/ 	: SfxPoolItem( RES_FOOTER ),
>-/*N*/ 	SwClient( 0 ),
>-/*N*/ 	bActive( bOn )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/  SwFmtFooter::~SwFmtFooter()
>-/*N*/ {
>-/*N*/ 	if ( GetFooterFmt() )
>-/*N*/ 		DelHFFormat( this, GetFooterFmt() );
>-/*N*/ }
>-
>-/*N*/ int  SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( pRegisteredIn == ((SwFmtFooter&)rAttr).GetRegisteredIn() &&
>-/*N*/ 			 bActive == ((SwFmtFooter&)rAttr).IsActive() );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtFooter::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtFooter( *this );
>-/*N*/ }
>-
>-//	class SwFmtCntnt
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy )
>-/*N*/ 	: SfxPoolItem( RES_CNTNT )
>-/*N*/ {
>-/*N*/ 	pStartNode = rCpy.GetCntntIdx() ?
>-/*N*/ 					new SwNodeIndex( *rCpy.GetCntntIdx() ) : 0;
>-/*N*/ }
>-
>-/*N*/ SwFmtCntnt::SwFmtCntnt( const SwStartNode *pStartNd )
>-/*N*/ 	: SfxPoolItem( RES_CNTNT )
>-/*N*/ {
>-/*N*/ 	pStartNode = pStartNd ? new SwNodeIndex( *pStartNd ) : 0;
>-/*N*/ }
>-
>-/*N*/  SwFmtCntnt::~SwFmtCntnt()
>-/*N*/ {
>-/*N*/ 	delete pStartNode;
>-/*N*/ }
>-
>-/*N*/ void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx )
>-/*N*/ {
>-/*N*/ 	delete pStartNode;
>-/*N*/ 	pStartNode = pIdx ? new SwNodeIndex( *pIdx ) : 0;
>-/*N*/ }
>-
>-/*N*/ int  SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	if( (long)pStartNode ^ (long)((SwFmtCntnt&)rAttr).pStartNode )
>-/*N*/ 		return 0;
>-/*?*/ 	if( pStartNode )
>-/*?*/ 		return ( *pStartNode == *((SwFmtCntnt&)rAttr).GetCntntIdx() );
>-/*?*/ 	return 1;
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtCntnt::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtCntnt( *this );
>-/*N*/ }
>-
>-//	class SwFmtPageDesc
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
>-/*N*/ 	: SfxPoolItem( RES_PAGEDESC ),
>-/*N*/ 	SwClient( (SwPageDesc*)rCpy.GetPageDesc() ),
>-/*N*/ 	pDefinedIn( 0 ),
>-/*N*/ 	nNumOffset( rCpy.nNumOffset ),
>-/*N*/ 	nDescNameIdx( rCpy.nDescNameIdx )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
>-/*N*/ 	: SfxPoolItem( RES_PAGEDESC ),
>-/*N*/ 	SwClient( (SwPageDesc*)pDesc ),
>-/*N*/ 	pDefinedIn( 0 ),
>-/*N*/ 	nNumOffset( 0 ),
>-/*N*/ 	nDescNameIdx( 0xFFFF )	// IDX_NO_VALUE
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/  SwFmtPageDesc::~SwFmtPageDesc() {}
>-
>-/*N*/ int  SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return	( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) &&
>-/*N*/ 			( nNumOffset == ((SwFmtPageDesc&)rAttr).nNumOffset ) &&
>-/*N*/ 			( GetPageDesc() == ((SwFmtPageDesc&)rAttr).GetPageDesc() );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtPageDesc::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtPageDesc( *this );
>-/*N*/ }
>-
>-/*N*/ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
>-/*N*/ {
>-/*N*/ 	if( !pDefinedIn )
>-/*N*/ 		return;
>-/*N*/
>-/*N*/ 	sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
>-/*N*/ 	switch( nWhich )
>-/*N*/ 	{
>-/*N*/ 		case RES_OBJECTDYING:
>-/*N*/ 				//Der Pagedesc, bei dem ich angemeldet bin stirbt, ich trage
>-/*N*/ 				//mich also bei meinem Format aus.
>-/*N*/ 				//Dabei werden ich Deletet!!!
>-/*N*/ 			if( IS_TYPE( SwFmt, pDefinedIn ))
>-/*N*/ #ifdef DBG_UTIL
>-/*N*/ 			{
>-/*?*/ 				sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>-/*?*/ 				ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
>-/*N*/ 			}
>-/*N*/ #else
>-/*N*/ 				((SwFmt*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>-/*N*/ #endif
>-/*N*/ 			else if( IS_TYPE( SwCntntNode, pDefinedIn ))
>-/*N*/ #ifdef DBG_UTIL
>-/*N*/ 			{
>-/*?*/ 				sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>-/*?*/ 				ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
>-/*N*/ 			}
>-/*N*/ #else
>-/*N*/ 				((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>-/*N*/ #endif
>-/*N*/ 			break;
>-/*N*/
>-/*N*/ 		default:
>-/*N*/ 			/* do nothing */;
>-/*N*/ 	}
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool	bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_PAGEDESC_PAGENUMOFFSET:
>-/*N*/ 			rVal <<= (sal_Int16)GetNumOffset();
>-/*N*/ 			break;
>-/*N*/
>-/*N*/ 		case MID_PAGEDESC_PAGEDESCNAME:
>-/*N*/ 			{
>-/*N*/ 				const SwPageDesc* pDesc = GetPageDesc();
>-/*N*/ 				if( pDesc )
>-/*N*/ 				{
>-/*N*/ 					String aString;
>-/*N*/ 					SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, GET_POOLID_PAGEDESC, sal_True );
>-/*N*/ 					rVal <<= OUString( aString );
>-/*N*/ 				}
>-/*N*/ 				else
>-/*N*/ 					rVal.clear();
>-/*N*/ 			}
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_PAGEDESC_PAGENUMOFFSET:
>-/*N*/         {
>-/*N*/             sal_Int16 nOffset;
>-/*N*/             if(rVal >>= nOffset)
>-/*N*/                 SetNumOffset( nOffset );
>-/*N*/             else
>-/*?*/                 bRet = sal_False;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/
>-/*N*/ 		case MID_PAGEDESC_PAGEDESCNAME:
>-            /* geht nicht, weil das Attribut eigentlich nicht den Namen
>-             * sondern einen Pointer auf den PageDesc braucht (ist Client davon).
>-             * Der Pointer waere aber ueber den Namen nur vom Dokument zu erfragen.
>-             */
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-
>-//	class SwFmtCol
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwColumn::SwColumn() :
>-/*N*/ 	nUpper( 0 ),
>-/*N*/ 	nLower( 0 ),
>-/*N*/ 	nLeft ( 0 ),
>-/*N*/ 	nRight( 0 ),
>-/*N*/ 	nWish ( 0 )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ sal_Bool SwColumn::operator==( const SwColumn &rCmp )
>-/*N*/ {
>-/*N*/ 	return (nWish    == rCmp.GetWishWidth() &&
>-/*N*/ 			GetLeft()  == rCmp.GetLeft() &&
>-/*N*/ 			GetRight() == rCmp.GetRight() &&
>-/*N*/ 			GetUpper() == rCmp.GetUpper() &&
>-/*N*/ 			GetLower() == rCmp.GetLower()) ? sal_True : sal_False;
>-/*N*/ }
>-
>-/*N*/ SwFmtCol::SwFmtCol( const SwFmtCol& rCpy )
>-/*N*/ 	: SfxPoolItem( RES_COL ),
>-/*N*/ 	nLineWidth( rCpy.nLineWidth),
>-/*N*/ 	aLineColor( rCpy.aLineColor),
>-/*N*/ 	nLineHeight( rCpy.GetLineHeight() ),
>-/*N*/ 	eAdj( rCpy.GetLineAdj() ),
>-/*N*/ 	nWidth( rCpy.GetWishWidth() ),
>-/*N*/ 	bOrtho( rCpy.IsOrtho() ),
>-/*N*/ 	aColumns( (sal_Int8)rCpy.GetNumCols(), 1 )
>-/*N*/ {
>-/*N*/ 	for ( sal_uInt16 i = 0; i < rCpy.GetNumCols(); ++i )
>-/*N*/ 	{
>-/*N*/ 		SwColumn *pCol = new SwColumn( *rCpy.GetColumns()[i] );
>-/*N*/ 		aColumns.Insert( pCol, aColumns.Count() );
>-/*N*/ 	}
>-/*N*/ }
>-
>-/*N*/ SwFmtCol::~SwFmtCol() {}
>+bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_FRMSIZE_SIZE:
>+    {
>+        awt::Size aVal;
>+        if(!(rVal >>= aVal))
>+            bRet = false;
>+        else
>+        {
>+            Size aTmp(aVal.Width, aVal.Height);
>+            if(bConvert)
>+            {
>+                aTmp.Height() = MM100_TO_TWIP(aTmp.Height());
>+                aTmp.Width() = MM100_TO_TWIP(aTmp.Width());
>+            }
>+            if(aTmp.Height() && aTmp.Width())
>+                aSize = aTmp;
>+            else
>+                bRet = false;
>+        }
>+    }
>+    break;
>+    case MID_FRMSIZE_REL_HEIGHT:
>+    {
>+        sal_Int16 nSet;
>+        rVal >>= nSet;
>+        if(nSet >= 0 && nSet <= 0xfe)
>+            SetHeightPercent((BYTE)nSet);
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_FRMSIZE_REL_WIDTH:
>+    {
>+        sal_Int16 nSet;
>+        rVal >>= nSet;
>+        if(nSet >= 0 && nSet <= 0xfe)
>+            SetWidthPercent((BYTE)nSet);
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
>+    {
>+        sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>+        if(bSet)
>+            SetHeightPercent(0xff);
>+        else if( 0xff == GetHeightPercent() )
>+            SetHeightPercent( 0 );
>+    }
>+    break;
>+    case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
>+    {
>+        sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>+        if(bSet)
>+            SetWidthPercent(0xff);
>+        else if( 0xff == GetWidthPercent() )
>+            SetWidthPercent(0);
>+    }
>+    break;
>+    case MID_FRMSIZE_WIDTH :
>+    {
>+        sal_Int32 nWd;
>+        if(rVal >>= nWd)
>+        {
>+            if(bConvert)
>+                nWd = MM100_TO_TWIP(nWd);
>+            if(nWd > 0)
>+                aSize.Width() = nWd;
>+            else
>+                bRet = false;
>+        }
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_FRMSIZE_HEIGHT:
>+    {
>+        sal_Int32 nHg;
>+        if(rVal >>= nHg)
>+        {
>+            if(bConvert)
>+                nHg = MM100_TO_TWIP(nHg);
>+            if(nHg > 0)
>+                aSize.Height() = nHg;
>+            else
>+                bRet = false;
>+        }
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_FRMSIZE_SIZE_TYPE:
>+    {
>+        sal_Int16 nType;
>+        if((rVal >>= nType) && nType >= 0 && nType <= ATT_MIN_SIZE )
>+        {
>+            SetSizeType((SwFrmSize)nType);
>+        }
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_FRMSIZE_IS_AUTO_HEIGHT:
>+    {
>+        sal_Bool bSet = *(sal_Bool*)rVal.getValue();
>+        SetSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
>+    }
>+    break;
>+    default:
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+Size  SwFmtFrmSize::GetSizeConvertedToSw31(
>+    const SvxLRSpaceItem *pLRSpace,
>+    const SvxULSpaceItem *pULSpace ) const
>+{
>+    // Sw4.0: Groesse enthaelt keine Raender
>+    // Sw3.x: Groesse enthaelt Raender
>+    // ==> Raender addieren
>+    Size aNewSize = GetSize();
>+    if( pLRSpace )
>+    {
>+        aNewSize.Width() += pLRSpace->GetLeft();
>+        aNewSize.Width() += pLRSpace->GetRight();
>+    }
>+    if( pULSpace )
>+    {
>+        aNewSize.Height() += pULSpace->GetUpper();
>+        aNewSize.Height() +=  pULSpace->GetLower();
>+    }
>+    return aNewSize;
>+}
>+
>+Size  SwFmtFrmSize::GetSizeConvertedFromSw31(
>+    const SvxLRSpaceItem *pLRSpace,
>+    const SvxULSpaceItem *pULSpace ) const
>+{
>+    // Sw4.0: Groesse enthaelt keine Raender
>+    // Sw3.x: Groesse enthaelt Raender
>+    // ==> Raender subtrahieren
>+    Size aNewSize = GetSize();
>+    if( pLRSpace )
>+    {
>+        aNewSize.Width() -= pLRSpace->GetLeft();
>+        aNewSize.Width() -= pLRSpace->GetRight();
>+    }
>+    if( pULSpace )
>+    {
>+        aNewSize.Height() -= pULSpace->GetUpper();
>+        aNewSize.Height() -=  pULSpace->GetLower();
>+    }
>+    return aNewSize;
>+}
>+
>+
>+//  class SwFmtFillOrder
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
>+    : SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
>+{}
>+
>+SfxPoolItem*  SwFmtFillOrder::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtFillOrder( GetFillOrder() );
>+}
>+
>+
>+//  class SwFmtHeader
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt )
>+    : SfxPoolItem( RES_HEADER ),
>+      SwClient( pHeaderFmt ),
>+      bActive( pHeaderFmt ? sal_True : sal_False )
>+{
>+}
>+
>+SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy )
>+    : SfxPoolItem( RES_HEADER ),
>+      SwClient( (SwModify*)rCpy.GetRegisteredIn() ),
>+      bActive( rCpy.IsActive() )
>+{
>+}
>+
>+SwFmtHeader::SwFmtHeader( sal_Bool bOn )
>+    : SfxPoolItem( RES_HEADER ),
>+      SwClient( 0 ),
>+      bActive( bOn )
>+{
>+}
>+
>+SwFmtHeader::~SwFmtHeader()
>+{
>+    if ( GetHeaderFmt() )
>+        DelHFFormat( this, GetHeaderFmt() );
>+}
>+
>+int  SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( pRegisteredIn == ((SwFmtHeader&)rAttr).GetRegisteredIn() &&
>+             bActive == ((SwFmtHeader&)rAttr).IsActive() );
>+}
>+
>+SfxPoolItem*  SwFmtHeader::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtHeader( *this );
>+}
>+
>+//  class SwFmtFooter
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt )
>+    : SfxPoolItem( RES_FOOTER ),
>+      SwClient( pFooterFmt ),
>+      bActive( pFooterFmt ? sal_True : sal_False )
>+{
>+}
>+
>+SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy )
>+    : SfxPoolItem( RES_FOOTER ),
>+      SwClient( (SwModify*)rCpy.GetRegisteredIn() ),
>+      bActive( rCpy.IsActive() )
>+{
>+}
>+
>+SwFmtFooter::SwFmtFooter( sal_Bool bOn )
>+    : SfxPoolItem( RES_FOOTER ),
>+      SwClient( 0 ),
>+      bActive( bOn )
>+{
>+}
>+
>+SwFmtFooter::~SwFmtFooter()
>+{
>+    if ( GetFooterFmt() )
>+        DelHFFormat( this, GetFooterFmt() );
>+}
>+
>+int  SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( pRegisteredIn == ((SwFmtFooter&)rAttr).GetRegisteredIn() &&
>+             bActive == ((SwFmtFooter&)rAttr).IsActive() );
>+}
>+
>+SfxPoolItem*  SwFmtFooter::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtFooter( *this );
>+}
>+
>+//  class SwFmtCntnt
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy )
>+    : SfxPoolItem( RES_CNTNT )
>+{
>+    pStartNode = rCpy.GetCntntIdx() ?
>+        new SwNodeIndex( *rCpy.GetCntntIdx() ) : 0;
>+}
>+
>+SwFmtCntnt::SwFmtCntnt( const SwStartNode *pStartNd )
>+    : SfxPoolItem( RES_CNTNT )
>+{
>+    pStartNode = pStartNd ? new SwNodeIndex( *pStartNd ) : 0;
>+}
>+
>+SwFmtCntnt::~SwFmtCntnt()
>+{
>+    delete pStartNode;
>+}
>+
>+void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx )
>+{
>+    delete pStartNode;
>+    pStartNode = pIdx ? new SwNodeIndex( *pIdx ) : 0;
>+}
>+
>+int  SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    if( (long)pStartNode ^ (long)((SwFmtCntnt&)rAttr).pStartNode )
>+        return 0;
>+    if( pStartNode )
>+        return ( *pStartNode == *((SwFmtCntnt&)rAttr).GetCntntIdx() );
>+    return 1;
>+}
>+
>+SfxPoolItem*  SwFmtCntnt::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtCntnt( *this );
>+}
>+
>+//  class SwFmtPageDesc
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
>+    : SfxPoolItem( RES_PAGEDESC ),
>+      SwClient( (SwPageDesc*)rCpy.GetPageDesc() ),
>+      pDefinedIn( 0 ),
>+      nNumOffset( rCpy.nNumOffset ),
>+      nDescNameIdx( rCpy.nDescNameIdx )
>+{
>+}
>+
>+SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
>+    : SfxPoolItem( RES_PAGEDESC ),
>+      SwClient( (SwPageDesc*)pDesc ),
>+      pDefinedIn( 0 ),
>+      nNumOffset( 0 ),
>+      nDescNameIdx( 0xFFFF )  // IDX_NO_VALUE
>+{
>+}
>+
>+SwFmtPageDesc::~SwFmtPageDesc() {}
>+
>+int  SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return  ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) &&
>+        ( nNumOffset == ((SwFmtPageDesc&)rAttr).nNumOffset ) &&
>+        ( GetPageDesc() == ((SwFmtPageDesc&)rAttr).GetPageDesc() );
>+}
>+
>+SfxPoolItem*  SwFmtPageDesc::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtPageDesc( *this );
>+}
>+
>+void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
>+{
>+    if( !pDefinedIn )
>+        return;
>+
>+    sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
>+    switch( nWhich )
>+    {
>+    case RES_OBJECTDYING:
>+        //Der Pagedesc, bei dem ich angemeldet bin stirbt, ich trage
>+        //mich also bei meinem Format aus.
>+        //Dabei werden ich Deletet!!!
>+        if( IS_TYPE( SwFmt, pDefinedIn ))
>+#ifdef DBG_UTIL
>+        {
>+            sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>+            ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
>+        }
>+#else
>+        ((SwFmt*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>+#endif
>+        else if( IS_TYPE( SwCntntNode, pDefinedIn ))
>+#ifdef DBG_UTIL
>+        {
>+            sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>+            ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
>+        }
>+#else
>+        ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
>+#endif
>+        break;
>+
>+    default:
>+        /* do nothing */;
>+    }
>+}
>+
>+bool SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool    bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_PAGEDESC_PAGENUMOFFSET:
>+        rVal <<= (sal_Int16)GetNumOffset();
>+        break;
>+
>+    case MID_PAGEDESC_PAGEDESCNAME:
>+    {
>+        const SwPageDesc* pDesc = GetPageDesc();
>+        if( pDesc )
>+        {
>+            String aString;
>+            SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, GET_POOLID_PAGEDESC, sal_True );
>+            rVal <<= OUString( aString );
>+        }
>+        else
>+            rVal.clear();
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+bool SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_PAGEDESC_PAGENUMOFFSET:
>+    {
>+        sal_Int16 nOffset;
>+        if(rVal >>= nOffset)
>+            SetNumOffset( nOffset );
>+        else
>+            bRet = false;
>+    }
>+    break;
>+
>+    case MID_PAGEDESC_PAGEDESCNAME:
>+        /* geht nicht, weil das Attribut eigentlich nicht den Namen
>+         * sondern einen Pointer auf den PageDesc braucht (ist Client davon).
>+         * Der Pointer waere aber ueber den Namen nur vom Dokument zu erfragen.
>+         */
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+
>+//  class SwFmtCol
>+//  Implementierung teilweise inline im hxx
>+
>+SwColumn::SwColumn() :
>+    nUpper( 0 ),
>+    nLower( 0 ),
>+    nLeft ( 0 ),
>+    nRight( 0 ),
>+    nWish ( 0 )
>+{
>+}
>+
>+sal_Bool SwColumn::operator==( const SwColumn &rCmp )
>+{
>+    return (nWish    == rCmp.GetWishWidth() &&
>+            GetLeft()  == rCmp.GetLeft() &&
>+            GetRight() == rCmp.GetRight() &&
>+            GetUpper() == rCmp.GetUpper() &&
>+            GetLower() == rCmp.GetLower()) ? sal_True : sal_False;
>+}
>+
>+SwFmtCol::SwFmtCol( const SwFmtCol& rCpy )
>+    : SfxPoolItem( RES_COL ),
>+      nLineWidth( rCpy.nLineWidth),
>+      aLineColor( rCpy.aLineColor),
>+      nLineHeight( rCpy.GetLineHeight() ),
>+      eAdj( rCpy.GetLineAdj() ),
>+      nWidth( rCpy.GetWishWidth() ),
>+      bOrtho( rCpy.IsOrtho() ),
>+      aColumns( (sal_Int8)rCpy.GetNumCols(), 1 )
>+{
>+    for ( sal_uInt16 i = 0; i < rCpy.GetNumCols(); ++i )
>+    {
>+        SwColumn *pCol = new SwColumn( *rCpy.GetColumns()[i] );
>+        aColumns.Insert( pCol, aColumns.Count() );
>+    }
>+}
>+
>+SwFmtCol::~SwFmtCol() {}
> 
> SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
> {
>@@ -917,70 +917,70 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
>     return *this;
> }
> 
>-/*N*/ SwFmtCol::SwFmtCol()
>-/*N*/ 	: SfxPoolItem( RES_COL ),
>-/*N*/ 	nLineHeight( 100 ),
>-/*N*/ 	eAdj( COLADJ_NONE ),
>-/*N*/ 	nWidth( USHRT_MAX ),
>-/*N*/ 	bOrtho( sal_True ),
>-/*N*/ 	nLineWidth(0)
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	const SwFmtCol &rCmp = (const SwFmtCol&)rAttr;
>-/*N*/ 	if( !(nLineWidth		== rCmp.nLineWidth  &&
>-/*N*/ 		  aLineColor        == rCmp.aLineColor	&&
>-/*N*/ 		  nLineHeight  		 == rCmp.GetLineHeight() &&
>-/*N*/ 		  eAdj		 		 == rCmp.GetLineAdj() &&
>-/*N*/ 		  nWidth  	 		 == rCmp.GetWishWidth() &&
>-/*N*/ 		  bOrtho  			 == rCmp.IsOrtho() &&
>-/*N*/ 		  aColumns.Count() == rCmp.GetNumCols()) )
>-/*N*/ 		return 0;
>-/*N*/
>-/*N*/ 	for ( sal_uInt16 i = 0; i < aColumns.Count(); ++i )
>-/*N*/ 		if ( !(*aColumns[i] == *rCmp.GetColumns()[i]) )
>-/*?*/ 			return 0;
>-/*N*/
>-/*N*/ 	return 1;
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtCol::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtCol( *this );
>-/*N*/ }
>-
>-/*N*/ sal_uInt16 SwFmtCol::GetGutterWidth( sal_Bool bMin ) const
>-/*N*/ {
>-/*N*/ 	sal_uInt16 nRet = 0;
>-/*N*/ 	if ( aColumns.Count() == 2 )
>-/*N*/ 		nRet = aColumns[0]->GetRight() + aColumns[1]->GetLeft();
>-/*N*/ 	else if ( aColumns.Count() > 2 )
>-/*N*/ 	{
>-/*N*/ 		sal_Bool bSet = sal_False;
>-/*N*/ 		for ( sal_uInt16 i = 1; i < aColumns.Count()-1; ++i )
>-/*N*/ 		{
>-/*N*/ 			const sal_uInt16 nTmp = aColumns[i]->GetRight() + aColumns[i+1]->GetLeft();
>-/*N*/ 			if ( bSet )
>-/*N*/ 			{
>-/*N*/ 				if ( nTmp != nRet )
>-/*N*/ 				{
>-/*?*/ 					if ( !bMin )
>-/*?*/ 						return USHRT_MAX;
>-/*?*/ 					if ( nRet > nTmp )
>-/*?*/ 						nRet = nTmp;
>-/*N*/ 				}
>-/*N*/ 			}
>-/*N*/ 			else
>-/*N*/ 			{	bSet = sal_True;
>-/*N*/ 				nRet = nTmp;
>-/*N*/ 			}
>-/*N*/ 		}
>-/*N*/ 	}
>-/*N*/ 	return nRet;
>-/*N*/ }
>+SwFmtCol::SwFmtCol()
>+    : SfxPoolItem( RES_COL ),
>+      nLineHeight( 100 ),
>+      eAdj( COLADJ_NONE ),
>+      nWidth( USHRT_MAX ),
>+      bOrtho( sal_True ),
>+      nLineWidth(0)
>+{
>+}
>+
>+int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    const SwFmtCol &rCmp = (const SwFmtCol&)rAttr;
>+    if( !(nLineWidth        == rCmp.nLineWidth  &&
>+          aLineColor        == rCmp.aLineColor  &&
>+          nLineHeight        == rCmp.GetLineHeight() &&
>+          eAdj               == rCmp.GetLineAdj() &&
>+          nWidth             == rCmp.GetWishWidth() &&
>+          bOrtho             == rCmp.IsOrtho() &&
>+          aColumns.Count() == rCmp.GetNumCols()) )
>+        return 0;
>+
>+    for ( sal_uInt16 i = 0; i < aColumns.Count(); ++i )
>+        if ( !(*aColumns[i] == *rCmp.GetColumns()[i]) )
>+            return 0;
>+
>+    return 1;
>+}
>+
>+SfxPoolItem*  SwFmtCol::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtCol( *this );
>+}
>+
>+sal_uInt16 SwFmtCol::GetGutterWidth( sal_Bool bMin ) const
>+{
>+    sal_uInt16 nRet = 0;
>+    if ( aColumns.Count() == 2 )
>+        nRet = aColumns[0]->GetRight() + aColumns[1]->GetLeft();
>+    else if ( aColumns.Count() > 2 )
>+    {
>+        sal_Bool bSet = sal_False;
>+        for ( sal_uInt16 i = 1; i < aColumns.Count()-1; ++i )
>+        {
>+            const sal_uInt16 nTmp = aColumns[i]->GetRight() + aColumns[i+1]->GetLeft();
>+            if ( bSet )
>+            {
>+                if ( nTmp != nRet )
>+                {
>+                    if ( !bMin )
>+                        return USHRT_MAX;
>+                    if ( nRet > nTmp )
>+                        nRet = nTmp;
>+                }
>+            }
>+            else
>+            {   bSet = sal_True;
>+                nRet = nTmp;
>+            }
>+        }
>+    }
>+    return nRet;
>+}
> 
> 
> void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
>@@ -1001,19 +1001,19 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA
> }
> 
> 
>-/*N*/ sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
>-/*N*/ 	if ( nWidth != nAct )
>-/*N*/ 	{
>-/*N*/ 		long nW = aColumns[nCol]->GetWishWidth();
>-/*N*/ 		nW *= nAct;
>-/*N*/ 		nW /= nWidth;
>-/*N*/ 		return sal_uInt16(nW);
>-/*N*/ 	}
>-/*N*/ 	else
>-/*?*/ 		return aColumns[nCol]->GetWishWidth();
>-/*N*/ }
>+sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
>+{
>+    ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
>+    if ( nWidth != nAct )
>+    {
>+        long nW = aColumns[nCol]->GetWishWidth();
>+        nW *= nAct;
>+        nW /= nWidth;
>+        return sal_uInt16(nW);
>+    }
>+    else
>+        return aColumns[nCol]->GetWishWidth();
>+}
> 
> 
> void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
>@@ -1025,7 +1025,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
> 
>     //Breite der PrtAreas ist Gesamtbreite - Zwischenraeume / Anzahl
>     const sal_uInt16 nPrtWidth =
>-                (nAct - ((GetNumCols()-1) * nGutterWidth)) / GetNumCols();
>+        (nAct - ((GetNumCols()-1) * nGutterWidth)) / GetNumCols();
>     sal_uInt16 nAvail = nAct;
> 
>     //Die erste Spalte ist PrtBreite + (Zwischenraumbreite/2)
>@@ -1039,13 +1039,13 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
>     //Spalte 2 bis n-1 ist PrtBreite + Zwischenraumbreite
>     const sal_uInt16 nMidWidth = nPrtWidth + nGutterWidth;
>     sal_uInt16 i; for ( i = 1; i < GetNumCols()-1; ++i )
>-    {
>-        pCol = aColumns[i];
>-        pCol->SetWishWidth( nMidWidth );
>-        pCol->SetLeft ( nGutterHalf );
>-        pCol->SetRight( nGutterHalf );
>-        nAvail -= nMidWidth;
>-    }
>+                  {
>+                      pCol = aColumns[i];
>+                      pCol->SetWishWidth( nMidWidth );
>+                      pCol->SetLeft ( nGutterHalf );
>+                      pCol->SetRight( nGutterHalf );
>+                      nAvail -= nMidWidth;
>+                  }
> 
>     //Die Letzte Spalte entspricht wieder der ersten, um Rundungsfehler
>     //auszugleichen wird der letzten Spalte alles zugeschlagen was die
>@@ -1066,975 +1066,975 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
>     }
> }
> 
>-/*N*/ BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
>-/*N*/ 	{
>-/*?*/ 		DBG_ERROR("not implemented");
>-/*N*/ 	}
>-/*N*/ 	else
>-/*N*/ 	{
>-/*N*/ 		uno::Reference< text::XTextColumns >  xCols = new SwXTextColumns(*this);
>-/*N*/ 		rVal.setValue(&xCols, ::getCppuType((uno::Reference< text::XTextColumns>*)0));
>-/*N*/ 	}
>-/*N*/ 	return sal_True;
>-/*N*/ }
>-
>-/*M*/ BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*M*/ {
>-/*M*/ 	// hier wird immer konvertiert!
>-/*M*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*M*/ 	sal_Bool bRet = sal_False;
>-/*M*/ 	if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
>-/*M*/ 	{
>-/*M*/ 		DBG_ERROR("not implemented");
>-/*M*/ 	}
>-/*M*/ 	else
>-/*M*/ 	{
>-/*M*/         uno::Reference< text::XTextColumns > xCols;
>-/*M*/         rVal >>= xCols;
>-/*M*/         if(xCols.is())
>-/*M*/ 		{
>-/*M*/             uno::Sequence<text::TextColumn> aSetColumns = xCols->getColumns();
>-/*M*/ 			const text::TextColumn* pArray = aSetColumns.getConstArray();
>-/*M*/ 			aColumns.DeleteAndDestroy(0, aColumns.Count());
>-/*M*/ 			//max. Count ist hier 64K - das kann das Array aber nicht
>-/*M*/ 			sal_uInt16 nCount = Min( (sal_uInt16)aSetColumns.getLength(),
>-/*M*/ 									 (sal_uInt16) 0x3fff );
>-/*M*/ 			sal_uInt16 nWidthSum = 0;
>-/*M*/             // #101224# one column is no column
>-/*M*/             //
>-/*M*/             if(nCount > 1)
>-/*M*/                 for(sal_uInt16 i = 0; i < nCount; i++)
>-/*M*/                 {
>-/*M*/                     SwColumn* pCol = new SwColumn;
>-/*M*/                     pCol->SetWishWidth( pArray[i].Width );
>-/*M*/                     nWidthSum += pArray[i].Width;
>-/*M*/                     pCol->SetLeft ( MM100_TO_TWIP(pArray[i].LeftMargin) );
>-/*M*/                     pCol->SetRight( MM100_TO_TWIP(pArray[i].RightMargin) );
>-/*M*/                     aColumns.Insert(pCol, i);
>-/*M*/                 }
>-/*M*/ 			bRet = sal_True;
>-/*M*/ 			nWidth = nWidthSum;
>-/*M*/             bOrtho = sal_False;
>-/*M*/
>-/*M*/             uno::Reference<lang::XUnoTunnel> xNumTunnel(xCols, uno::UNO_QUERY);
>-/*M*/ 			SwXTextColumns* pSwColums = 0;
>-/*M*/ 			if(xNumTunnel.is())
>-/*M*/ 			{
>-/*M*/ 				pSwColums = (SwXTextColumns*)
>-/*M*/ 					xNumTunnel->getSomething( SwXTextColumns::getUnoTunnelId() );
>-/*M*/ 			}
>-/*M*/ 			if(pSwColums)
>-/*M*/ 			{
>-/*M*/                 bOrtho = pSwColums->IsAutomaticWidth();
>-/*M*/                 nLineWidth = pSwColums->GetSepLineWidth();
>-/*M*/ 				aLineColor.SetColor(pSwColums->GetSepLineColor());
>-/*M*/ 				nLineHeight = pSwColums->GetSepLineHeightRelative();
>-/*M*/ 				if(!pSwColums->GetSepLineIsOn())
>-/*M*/ 					eAdj = COLADJ_NONE;
>-/*M*/ 				else switch(pSwColums->GetSepLineVertAlign())
>-/*M*/ 				{
>-/*M*/ 					case 0: eAdj = COLADJ_TOP;	break;	//VerticalAlignment_TOP
>-/*M*/ 					case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
>-/*M*/ 					case 2: eAdj = COLADJ_BOTTOM;break;	//VerticalAlignment_BOTTOM
>-/*M*/ 				}
>-/*M*/ 			}
>-/*M*/ 		}
>-/*M*/ 	}
>-/*M*/ 	return bRet;
>-/*M*/ }
>-
>-
>-//	class SwFmtSurround
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
>-/*N*/ 	SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
>-/*N*/ {
>-/*N*/ 	bAnchorOnly = bContour = bOutside = sal_False;
>-/*N*/ }
>-
>-/*N*/ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
>-/*N*/ 	SfxEnumItem( RES_SURROUND, rCpy.GetValue() )
>-/*N*/ {
>-/*N*/ 	bAnchorOnly = rCpy.bAnchorOnly;
>-/*N*/ 	bContour = rCpy.bContour;
>-/*N*/ 	bOutside = rCpy.bOutside;
>-/*N*/ }
>-
>-/*N*/ int  SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( GetValue() == ((SwFmtSurround&)rAttr).GetValue() &&
>-/*N*/ 			 bAnchorOnly== ((SwFmtSurround&)rAttr).bAnchorOnly &&
>-/*N*/ 			 bContour== ((SwFmtSurround&)rAttr).bContour &&
>-/*N*/ 			 bOutside== ((SwFmtSurround&)rAttr).bOutside );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtSurround::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtSurround( *this );
>-/*N*/ }
>-
>-
>-
>-/*N*/ BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_SURROUND_SURROUNDTYPE:
>-/*N*/ 				rVal <<= (text::WrapTextMode)GetSurround();
>-/*N*/ 		break;
>-/*N*/ 		case MID_SURROUND_ANCHORONLY:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsAnchorOnly();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 				break;
>-/*N*/ 		case MID_SURROUND_CONTOUR:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsContour();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 				break;
>-/*N*/ 		case MID_SURROUND_CONTOUROUTSIDE:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsOutside();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 				break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_SURROUND_SURROUNDTYPE:
>-/*N*/ 		{
>-/*N*/ 			sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal );
>-/*N*/ 			if( eVal >= 0 && eVal < (sal_Int16)SURROUND_END )
>-/*N*/ 				SetValue( eVal );
>-/*N*/ 			else
>-/*N*/ 				//exception
>-/*N*/ 				;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/
>-/*N*/ 		case MID_SURROUND_ANCHORONLY:
>-/*N*/ 			SetAnchorOnly( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 			break;
>-/*N*/ 		case MID_SURROUND_CONTOUR:
>-/*N*/ 			SetContour( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 			break;
>-/*N*/ 		case MID_SURROUND_CONTOUROUTSIDE:
>-/*N*/ 			SetOutside( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-//	class SwFmtVertOrient
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, SwVertOrient eVert,
>-/*N*/ 								  SwRelationOrient eRel )
>-/*N*/ 	: SfxPoolItem( RES_VERT_ORIENT ),
>-/*N*/ 	nYPos( nY ),
>-/*N*/ 	eOrient( eVert ),
>-/*N*/ 	eRelation( eRel )
>-/*N*/ {}
>-
>-/*N*/ int  SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( nYPos     == ((SwFmtVertOrient&)rAttr).nYPos &&
>-/*N*/ 			 eOrient   == ((SwFmtVertOrient&)rAttr).eOrient &&
>-/*N*/ 			 eRelation == ((SwFmtVertOrient&)rAttr).eRelation );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtVertOrient::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtVertOrient( nYPos, eOrient, eRelation );
>-/*N*/ }
>-
>-
>-/*N*/ SwTwips  SwFmtVertOrient::GetPosConvertedToSw31(
>-/*N*/ 	const SvxULSpaceItem *pULSpace ) const
>-/*N*/ {
>-/*N*/ 	SwTwips nNewPos = GetPos();
>-/*N*/
>-/*N*/ 	if( VERT_NONE==GetVertOrient() && pULSpace )
>-/*N*/ 	{
>-/*N*/ 		nNewPos -= pULSpace->GetUpper();
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	return nNewPos;
>-/*N*/ }
>-
>-/*N*/ SwTwips  SwFmtVertOrient::GetPosConvertedFromSw31(
>-/*N*/ 	const SvxULSpaceItem *pULSpace ) const
>-/*N*/ {
>-/*N*/ 	SwTwips nNewPos = GetPos();
>-/*N*/
>-/*N*/ 	if( VERT_NONE==GetVertOrient() && pULSpace )
>-/*N*/ 	{
>-/*N*/ 		nNewPos += pULSpace->GetUpper();
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	return nNewPos;
>-/*N*/ }
>-
>-
>-/*N*/ BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_VERTORIENT_ORIENT:
>-/*N*/ 		{
>-/*N*/ 			sal_Int16 nRet = text::VertOrientation::NONE;
>-/*N*/ 			switch( eOrient )
>-/*N*/ 			{
>-/*N*/ 				case VERT_TOP		 :	nRet = text::VertOrientation::TOP		 ;break;
>-/*N*/ 				case VERT_CENTER     : 	nRet = text::VertOrientation::CENTER     ;break;
>-/*N*/ 				case VERT_BOTTOM     : 	nRet = text::VertOrientation::BOTTOM     ;break;
>-/*?*/ 				case VERT_CHAR_TOP   : 	nRet = text::VertOrientation::CHAR_TOP   ;break;
>-/*N*/ 				case VERT_CHAR_CENTER: 	nRet = text::VertOrientation::CHAR_CENTER;break;
>-/*?*/ 				case VERT_CHAR_BOTTOM: 	nRet = text::VertOrientation::CHAR_BOTTOM;break;
>-/*N*/ 				case VERT_LINE_TOP	 : 	nRet = text::VertOrientation::LINE_TOP   ;break;
>-/*N*/ 				case VERT_LINE_CENTER: 	nRet = text::VertOrientation::LINE_CENTER;break;
>-/*?*/ 				case VERT_LINE_BOTTOM: 	nRet = text::VertOrientation::LINE_BOTTOM;break;
>-/*N*/ 			}
>-/*N*/ 			rVal <<= nRet;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_VERTORIENT_RELATION:
>-/*N*/ 				rVal <<= lcl_RelToINT(eRelation);
>-/*N*/ 		break;
>-/*N*/ 		case MID_VERTORIENT_POSITION:
>-/*N*/ 				rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
>-/*N*/ 				break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_VERTORIENT_ORIENT:
>-/*N*/ 		{
>-/*N*/ 			sal_uInt16 nVal;
>-/*N*/ 			rVal >>= nVal;
>-/*N*/ 			switch( nVal )
>-/*N*/ 			{
>-/*N*/ 				case text::VertOrientation::NONE:			eOrient = VERT_NONE;	break;
>-/*N*/ 				case text::VertOrientation::TOP		   :	eOrient = VERT_TOP;		break;
>-/*N*/ 				case text::VertOrientation::CENTER     : 	eOrient = VERT_CENTER;     break;
>-/*N*/ 				case text::VertOrientation::BOTTOM     : 	eOrient = VERT_BOTTOM;     break;
>-/*?*/ 				case text::VertOrientation::CHAR_TOP   : 	eOrient = VERT_CHAR_TOP;   break;
>-/*N*/ 				case text::VertOrientation::CHAR_CENTER: 	eOrient = VERT_CHAR_CENTER;break;
>-/*?*/ 				case text::VertOrientation::CHAR_BOTTOM:  	eOrient = VERT_CHAR_BOTTOM;break;
>-/*N*/ 				case text::VertOrientation::LINE_TOP   :  	eOrient = VERT_LINE_TOP;	break;
>-/*N*/ 				case text::VertOrientation::LINE_CENTER:  	eOrient = VERT_LINE_CENTER;break;
>-/*?*/ 				case text::VertOrientation::LINE_BOTTOM:  	eOrient = VERT_LINE_BOTTOM;break;
>-/*N*/ 			}
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_VERTORIENT_RELATION:
>-/*N*/ 		{
>-/*N*/ 			eRelation = lcl_IntToRelation(rVal);
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_VERTORIENT_POSITION:
>-/*N*/ 		{
>-/*N*/ 			sal_Int32 nVal;
>-/*N*/ 			rVal >>= nVal;
>-/*N*/ 			if(bConvert)
>-/*N*/ 				nVal = MM100_TO_TWIP(nVal);
>-/*N*/ 			SetPos( nVal );
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-
>-
>-//	class SwFmtHoriOrient
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, SwHoriOrient eHori,
>-/*N*/ 							  SwRelationOrient eRel, sal_Bool bPos )
>-/*N*/ 	: SfxPoolItem( RES_HORI_ORIENT ),
>-/*N*/ 	nXPos( nX ),
>-/*N*/ 	eOrient( eHori ),
>-/*N*/ 	eRelation( eRel ),
>-/*N*/ 	bPosToggle( bPos )
>-/*N*/ {}
>-
>-/*N*/ int  SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( nXPos == ((SwFmtHoriOrient&)rAttr).nXPos &&
>-/*N*/ 			 eOrient == ((SwFmtHoriOrient&)rAttr).eOrient &&
>-/*N*/ 			 eRelation == ((SwFmtHoriOrient&)rAttr).eRelation &&
>-/*N*/ 			 bPosToggle == ((SwFmtHoriOrient&)rAttr).bPosToggle );
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtHoriOrient::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle );
>-/*N*/ }
>-
>-
>-/*N*/ SwTwips  SwFmtHoriOrient::GetPosConvertedToSw31(
>-/*N*/ 	const SvxLRSpaceItem *pLRSpace ) const
>-/*N*/ {
>-/*N*/ 	SwTwips nNewPos = GetPos();
>-/*N*/
>-/*N*/ 	if( HORI_NONE==GetHoriOrient() && pLRSpace )
>-/*N*/ 	{
>-/*N*/ 		nNewPos -= pLRSpace->GetLeft();
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	return nNewPos;
>-/*N*/ }
>-
>-/*N*/ SwTwips  SwFmtHoriOrient::GetPosConvertedFromSw31(
>-/*N*/ 	const SvxLRSpaceItem *pLRSpace ) const
>-/*N*/ {
>-/*N*/ 	SwTwips nNewPos = GetPos();
>-/*N*/
>-/*N*/ 	if( HORI_NONE==GetHoriOrient() && pLRSpace )
>-/*N*/ 	{
>-/*N*/ 		nNewPos += pLRSpace->GetLeft();
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	return nNewPos;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_HORIORIENT_ORIENT:
>-/*N*/ 		{
>-/*N*/ 			sal_Int16 nRet = text::HoriOrientation::NONE;
>-/*N*/ 			switch( eOrient )
>-/*N*/ 			{
>-/*N*/ 				case HORI_RIGHT:	nRet = text::HoriOrientation::RIGHT; break;
>-/*N*/ 				case HORI_CENTER : 	nRet = text::HoriOrientation::CENTER; break;
>-/*N*/ 				case HORI_LEFT   : 	nRet = text::HoriOrientation::LEFT; break;
>-/*?*/ 				case HORI_INSIDE : 	nRet = text::HoriOrientation::INSIDE; break;
>-/*?*/ 				case HORI_OUTSIDE: 	nRet = text::HoriOrientation::OUTSIDE; break;
>-/*?*/ 				case HORI_FULL:    	nRet = text::HoriOrientation::FULL; break;
>-/*?*/ 				case HORI_LEFT_AND_WIDTH :
>-/*?*/ 					nRet = text::HoriOrientation::LEFT_AND_WIDTH;
>-/*N*/ 				break;
>-/*N*/ 			}
>-/*N*/ 			rVal <<= nRet;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_HORIORIENT_RELATION:
>-/*N*/ 			rVal <<= lcl_RelToINT(eRelation);
>-/*N*/ 		break;
>-/*N*/ 		case MID_HORIORIENT_POSITION:
>-/*N*/ 				rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
>-/*N*/ 				break;
>-/*N*/ 		case MID_HORIORIENT_PAGETOGGLE:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsPosToggle();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 				break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_HORIORIENT_ORIENT:
>-/*N*/ 		{
>-/*N*/             sal_Int16 nVal;
>-/*N*/             rVal >>= nVal;
>-/*N*/             switch( nVal )
>-/*N*/ 			{
>-/*N*/ 				case text::HoriOrientation::NONE:   	eOrient = HORI_NONE ;	break;
>-/*N*/ 				case text::HoriOrientation::RIGHT: 	eOrient = HORI_RIGHT; 	break;
>-/*N*/ 				case text::HoriOrientation::CENTER : 	eOrient = HORI_CENTER;	break;
>-/*N*/ 				case text::HoriOrientation::LEFT   : 	eOrient = HORI_LEFT;  	break;
>-/*?*/ 				case text::HoriOrientation::INSIDE : 	eOrient = HORI_INSIDE;	break;
>-/*?*/ 				case text::HoriOrientation::OUTSIDE: 	eOrient = HORI_OUTSIDE;	break;
>-/*?*/ 				case text::HoriOrientation::FULL:      eOrient = HORI_FULL; 	break;
>-/*?*/ 				case text::HoriOrientation::LEFT_AND_WIDTH:
>-/*?*/ 					eOrient = HORI_LEFT_AND_WIDTH;
>-/*N*/ 				break;
>-/*N*/ 			}
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_HORIORIENT_RELATION:
>-/*N*/ 		{
>-/*N*/ 			eRelation = lcl_IntToRelation(rVal);
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_HORIORIENT_POSITION:
>-/*N*/ 		{
>-/*N*/             sal_Int32 nVal;
>-/*N*/             if(!(rVal >>= nVal))
>-/*?*/                 bRet = sal_False;
>-/*N*/ 			if(bConvert)
>-/*N*/ 				nVal = MM100_TO_TWIP(nVal);
>-/*N*/ 			SetPos( nVal );
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_HORIORIENT_PAGETOGGLE:
>-/*N*/ 				SetPosToggle( *(sal_Bool*)rVal.getValue());
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-
>-
>-//	class SwFmtAnchor
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
>-/*N*/ 	: SfxPoolItem( RES_ANCHOR ),
>-/*N*/ 	pCntntAnchor( 0 ),
>-/*N*/ 	nAnchorId( nRnd ),
>-/*N*/ 	nPageNum( nPage )
>-/*N*/ {}
>-
>-/*N*/ SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy )
>-/*N*/ 	: SfxPoolItem( RES_ANCHOR ),
>-/*N*/ 	nAnchorId( rCpy.GetAnchorId() ),
>-/*N*/ 	nPageNum( rCpy.GetPageNum() )
>-/*N*/ {
>-/*N*/ 	pCntntAnchor = rCpy.GetCntntAnchor() ?
>-/*N*/ 						new SwPosition( *rCpy.GetCntntAnchor() ) : 0;
>-/*N*/ }
>-
>-/*N*/  SwFmtAnchor::~SwFmtAnchor()
>-/*N*/ {
>-/*N*/ 	delete pCntntAnchor;
>-/*N*/ }
>-
>-/*N*/ void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
>-/*N*/ {
>-/*N*/ 	if ( pCntntAnchor )
>-/*N*/ 		delete pCntntAnchor;
>-/*N*/ 	pCntntAnchor = pPos ? new SwPosition( *pPos ) : 0;
>-/*N*/ 		//AM Absatz gebundene Flys sollten nie in den Absatz hineinzeigen.
>-/*N*/ 	if ( pCntntAnchor && ( FLY_AT_CNTNT == nAnchorId ||
>-/*N*/ 						   FLY_AT_FLY == nAnchorId ))
>-/*N*/ 		pCntntAnchor->nContent.Assign( 0, 0 );
>-/*N*/ }
>-
>-/*N*/ SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor)
>-/*N*/ {
>-/*N*/ 	nAnchorId  = rAnchor.GetAnchorId();
>-/*N*/ 	nPageNum   = rAnchor.GetPageNum();
>-/*N*/
>-/*N*/ 	delete pCntntAnchor;
>-/*N*/ 	pCntntAnchor = rAnchor.pCntntAnchor ?
>-/*N*/ 									new SwPosition(*(rAnchor.pCntntAnchor)) : 0;
>-/*N*/ 	return *this;
>-/*N*/ }
>-
>-/*N*/ int  SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	return ( nAnchorId == ((SwFmtAnchor&)rAttr).GetAnchorId() &&
>-/*N*/ 			 nPageNum == ((SwFmtAnchor&)rAttr).GetPageNum()   &&
>-/*N*/ 					//Anker vergleichen. Entweder zeigen beide auf das gleiche
>-/*N*/ 					//Attribut bzw. sind 0 oder die SwPosition* sind beide
>-/*N*/ 					//gueltig und die SwPositions sind gleich.
>-/*N*/ 			 (pCntntAnchor == ((SwFmtAnchor&)rAttr).GetCntntAnchor() ||
>-/*N*/ 			  (pCntntAnchor && ((SwFmtAnchor&)rAttr).GetCntntAnchor() &&
>-/*N*/ 			   *pCntntAnchor == *((SwFmtAnchor&)rAttr).GetCntntAnchor())));
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem*  SwFmtAnchor::Clone( SfxItemPool* ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtAnchor( *this );
>-/*N*/ }
>+bool SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
>+    {
>+        DBG_ERROR("not implemented");
>+    }
>+    else
>+    {
>+        uno::Reference< text::XTextColumns >  xCols = new SwXTextColumns(*this);
>+        rVal.setValue(&xCols, ::getCppuType((uno::Reference< text::XTextColumns>*)0));
>+    }
>+    return true;
>+}
> 
>-/*-----------------16.02.98 15:21-------------------
>+bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = false;
>+    if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
>+    {
>+        DBG_ERROR("not implemented");
>+    }
>+    else
>+    {
>+        uno::Reference< text::XTextColumns > xCols;
>+        rVal >>= xCols;
>+        if(xCols.is())
>+        {
>+            uno::Sequence<text::TextColumn> aSetColumns = xCols->getColumns();
>+            const text::TextColumn* pArray = aSetColumns.getConstArray();
>+            aColumns.DeleteAndDestroy(0, aColumns.Count());
>+            //max. Count ist hier 64K - das kann das Array aber nicht
>+            sal_uInt16 nCount = Min( (sal_uInt16)aSetColumns.getLength(),
>+                                     (sal_uInt16) 0x3fff );
>+            sal_uInt16 nWidthSum = 0;
>+            // #101224# one column is no column
>+            //
>+            if(nCount > 1)
>+                for(sal_uInt16 i = 0; i < nCount; i++)
>+                {
>+                    SwColumn* pCol = new SwColumn;
>+                    pCol->SetWishWidth( pArray[i].Width );
>+                    nWidthSum += pArray[i].Width;
>+                    pCol->SetLeft ( MM100_TO_TWIP(pArray[i].LeftMargin) );
>+                    pCol->SetRight( MM100_TO_TWIP(pArray[i].RightMargin) );
>+                    aColumns.Insert(pCol, i);
>+                }
>+            bRet = true;
>+            nWidth = nWidthSum;
>+            bOrtho = sal_False;
> 
>---------------------------------------------------*/
>-/*N*/ BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_ANCHOR_ANCHORTYPE:
>-/*N*/
>-/*N*/ 			text::TextContentAnchorType eRet;
>-/*N*/ 			switch((sal_Int16)GetAnchorId())
>-/*N*/ 			{
>-/*?*/ 				case  FLY_AUTO_CNTNT : eRet = text::TextContentAnchorType_AT_CHARACTER;break;
>-/*N*/ 				case  FLY_PAGE    	 : eRet = text::TextContentAnchorType_AT_PAGE;		break;
>-/*?*/ 				case  FLY_AT_FLY     : eRet = text::TextContentAnchorType_AT_FRAME;    break;
>-/*N*/ 				case  FLY_IN_CNTNT   : eRet = text::TextContentAnchorType_AS_CHARACTER;break;
>-/*N*/ 				//case  FLY_AT_CNTNT  :
>-/*N*/ 				default: eRet = text::TextContentAnchorType_AT_PARAGRAPH;
>-/*N*/ 			}
>-/*N*/ 			rVal <<= eRet;
>-/*N*/ 		break;
>-/*N*/ 		case MID_ANCHOR_PAGENUM:
>-/*N*/ 			rVal <<= (sal_Int16)GetPageNum();
>-/*N*/         break;
>-/*N*/         case MID_ANCHOR_ANCHORFRAME:
>-/*N*/         {
>-/*?*/             if(pCntntAnchor && FLY_AT_FLY == nAnchorId)
>-/*?*/             {
>-/*?*/                 SwFrmFmt* pFmt = pCntntAnchor->nNode.GetNode().GetFlyFmt();
>-/*?*/                 if(pFmt)
>-/*?*/                 {
>-/*?*/                     Reference<XNamed> xNamed = SwXFrames::GetObject( *pFmt, FLYCNTTYPE_FRM );
>-/*?*/                     Reference<XTextFrame> xRet(xNamed, UNO_QUERY);
>-/*?*/                     rVal <<= xRet;
>-/*?*/                 }
>-/*?*/             }
>-/*?*/         }
>-/*?*/         break;
>-/*?*/         default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_ANCHOR_ANCHORTYPE:
>-/*N*/ 		{
>-/*N*/ 			RndStdIds	eAnchor;
>-/*N*/ 			switch( SWUnoHelper::GetEnumAsInt32( rVal ) )
>-/*N*/ 			{
>-/*N*/ 				case  text::TextContentAnchorType_AS_CHARACTER:
>-/*N*/ 					eAnchor = FLY_IN_CNTNT;
>-/*N*/ 					break;
>-/*N*/ 				case  text::TextContentAnchorType_AT_PAGE:
>-/*N*/ 					eAnchor = FLY_PAGE;
>-/*N*/ 					if( GetPageNum() > 0 && pCntntAnchor )
>-/*N*/ 					{
>-/*?*/ 						// If the anchor type is page and a valid page number
>-/*?*/ 						// has been set, the content position isn't required
>-/*?*/ 						// any longer.
>-/*?*/ 						delete pCntntAnchor;
>-/*?*/ 						pCntntAnchor = 0;
>-/*N*/ 					}
>-/*N*/ 					break;
>-/*N*/ 				case  text::TextContentAnchorType_AT_FRAME:
>-/*?*/ 					eAnchor = FLY_AT_FLY;
>-/*?*/ 					break;
>-/*?*/ 				case  text::TextContentAnchorType_AT_CHARACTER:
>-/*?*/ 					eAnchor = FLY_AUTO_CNTNT;
>-/*?*/ 					break;
>-/*N*/ 				//case  text::TextContentAnchorType_AT_PARAGRAPH:
>-/*N*/ 				default:
>-/*N*/ 					eAnchor = FLY_AT_CNTNT;
>-/*N*/ 					break;
>-/*N*/ 			}
>-/*N*/ 			SetType( eAnchor );
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_ANCHOR_PAGENUM:
>-/*N*/ 		{
>-/*N*/             sal_Int16 nVal;
>-/*N*/             if((rVal >>= nVal) && nVal > 0)
>-/*N*/ 			{
>-/*N*/ 				SetPageNum( nVal );
>-/*N*/ 				if( FLY_PAGE == GetAnchorId() && pCntntAnchor )
>-/*N*/ 				{
>-/*N*/ 					// If the anchor type is page and a valid page number
>-/*N*/ 					// is set, the content paoition has to be deleted to not
>-/*N*/ 					// confuse the layout (frmtool.cxx). However, if the
>-/*N*/ 					// anchor type is not page, any content position will
>-/*N*/ 					// be kept.
>-/*N*/ 					delete pCntntAnchor;
>-/*N*/ 					pCntntAnchor = 0;
>-/*N*/ 				}
>-/*N*/ 			}
>-/*N*/ 			else
>-/*?*/ 				bRet = sal_False;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/         case MID_ANCHOR_ANCHORFRAME:
>-/*N*/         //no break here!;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-//	class SwFmtURL
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFmtURL::SwFmtURL() :
>-/*N*/ 	SfxPoolItem( RES_URL ),
>-/*N*/ 	pMap( 0 ),
>-/*N*/ 	bIsServerMap( sal_False )
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ SwFmtURL::SwFmtURL( const SwFmtURL &rURL) :
>-/*N*/ 	SfxPoolItem( RES_URL ),
>-/*N*/ 	sURL( rURL.GetURL() ),
>-/*N*/ 	sTargetFrameName( rURL.GetTargetFrameName() ),
>-/*N*/ 	sName( rURL.GetName() ),
>-/*N*/ 	bIsServerMap( rURL.IsServerMap() )
>-/*N*/ {
>-/*N*/ 	pMap = rURL.GetMap() ? new ImageMap( *rURL.GetMap() ) : 0;
>-/*N*/ }
>-
>-/*N*/ SwFmtURL::~SwFmtURL()
>-/*N*/ {
>-/*N*/ 	if ( pMap )
>-/*?*/ 		delete pMap;
>-/*N*/ }
>-
>-/*N*/ int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/ 	const SwFmtURL &rCmp = (SwFmtURL&)rAttr;
>-/*N*/ 	sal_Bool bRet = bIsServerMap  	 == rCmp.IsServerMap() &&
>-/*N*/ 				sURL			 == rCmp.GetURL() &&
>-/*N*/ 				sTargetFrameName == rCmp.GetTargetFrameName() &&
>-/*N*/ 				sName 			 == rCmp.GetName();
>-/*N*/ 	if ( bRet )
>-/*N*/ 	{
>-/*N*/ 		if ( pMap && rCmp.GetMap() )
>-/*?*/ 			bRet = *pMap == *rCmp.GetMap();
>-/*N*/ 		else
>-/*N*/ 			bRet = pMap == rCmp.GetMap();
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem* SwFmtURL::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtURL( *this );
>-/*N*/ }
>-
>-/*N*/ void SwFmtURL::SetURL( const XubString &rURL, sal_Bool bServerMap )
>-/*N*/ {
>-/*N*/ 	sURL = rURL;
>-/*N*/ 	bIsServerMap = bServerMap;
>-/*N*/ }
>-
>-/*N*/ void SwFmtURL::SetMap( const ImageMap *pM )
>-/*N*/ {
>-/*N*/ 	if ( pMap )
>-/*?*/ 		delete pMap;
>-/*N*/ 	pMap = pM ? new ImageMap( *pM ) : 0;
>-/*N*/ }
>-/*N*/ extern const SvEventDescription* lcl_GetSupportedMacroItems();
>-
>-/*N*/ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_URL_URL:
>-/*N*/ 		{
>-/*N*/ 			OUString sRet = GetURL();
>-/*N*/ 			rVal <<= sRet;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_URL_TARGET:
>-/*N*/ 		{
>-/*N*/ 			OUString sRet = GetTargetFrameName();
>-/*N*/ 			rVal <<= sRet;
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_URL_HYPERLINKNAME:
>-/*N*/ 			rVal <<= OUString( GetName() );
>-/*N*/ 			break;
>-/*N*/ 		case MID_URL_CLIENTMAP:
>-/*N*/         {
>-/*N*/             Reference< XInterface > xInt;
>-/*N*/             if(pMap)
>-/*N*/             {
>-/*?*/                 xInt = SvUnoImageMap_createInstance( *pMap, lcl_GetSupportedMacroItems() );
>-/*N*/             }
>-/*N*/             else
>-/*N*/             {
>-/*N*/                 ImageMap aEmptyMap;
>-/*N*/                 xInt = SvUnoImageMap_createInstance( aEmptyMap, lcl_GetSupportedMacroItems() );
>-/*N*/             }
>-/*N*/             Reference< XIndexContainer > xCont(xInt, UNO_QUERY);
>-/*N*/             rVal <<= xCont;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/ 		case MID_URL_SERVERMAP:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsServerMap();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_URL_URL:
>-/*N*/         {
>-/*N*/             OUString sTmp;
>-/*N*/             rVal >>= sTmp;
>-/*N*/             SetURL( sTmp, bIsServerMap );
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_URL_TARGET:
>-/*N*/         {
>-/*N*/             OUString sTmp;
>-/*N*/             rVal >>= sTmp;
>-/*N*/             SetTargetFrameName( sTmp );
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_URL_HYPERLINKNAME:
>-/*N*/         {
>-/*N*/             OUString sTmp;
>-/*N*/             rVal >>= sTmp;
>-/*N*/             SetName( sTmp );
>-/*N*/         }
>-/*N*/ 		break;
>-/*N*/ 		case MID_URL_CLIENTMAP:
>-/*N*/         {
>-/*N*/             Reference<XIndexContainer> xCont;
>-/*N*/             if(!rVal.hasValue())
>-/*N*/                 DELETEZ(pMap);
>-/*N*/             else if(rVal >>= xCont)
>-/*N*/             {
>-/*N*/                 if(!pMap)
>-/*N*/                     pMap = new ImageMap;
>-/*N*/                 bRet = SvUnoImageMap_fillImageMap( xCont, *pMap );
>-/*N*/             }
>-/*N*/             else
>-/*N*/                 bRet = FALSE;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/ 		case MID_URL_SERVERMAP:
>-/*N*/ 			bIsServerMap = *(sal_Bool*)rVal.getValue();
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*N*/ 			ASSERT( !this, "unknown MemberId" );
>-/*N*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>+            uno::Reference<lang::XUnoTunnel> xNumTunnel(xCols, uno::UNO_QUERY);
>+            SwXTextColumns* pSwColums = 0;
>+            if(xNumTunnel.is())
>+            {
>+                pSwColums = (SwXTextColumns*)
>+                    xNumTunnel->getSomething( SwXTextColumns::getUnoTunnelId() );
>+            }
>+            if(pSwColums)
>+            {
>+                bOrtho = pSwColums->IsAutomaticWidth();
>+                nLineWidth = pSwColums->GetSepLineWidth();
>+                aLineColor.SetColor(pSwColums->GetSepLineColor());
>+                nLineHeight = pSwColums->GetSepLineHeightRelative();
>+                if(!pSwColums->GetSepLineIsOn())
>+                    eAdj = COLADJ_NONE;
>+                else switch(pSwColums->GetSepLineVertAlign())
>+                     {
>+                     case 0: eAdj = COLADJ_TOP;  break;  //VerticalAlignment_TOP
>+                     case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
>+                     case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
>+                     }
>+            }
>+        }
>+    }
>+    return bRet;
>+}
> 
> 
>-// class SwNoReadOnly
>+//  class SwFmtSurround
>+//  Implementierung teilweise inline im hxx
> 
>-SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* pPool ) const
>+SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
>+    SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
> {
>-    return new SwFmtEditInReadonly( Which(), GetValue() );
>+    bAnchorOnly = bContour = bOutside = sal_False;
> }
> 
>-// class SwFmtLayoutSplit
>+SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
>+    SfxEnumItem( RES_SURROUND, rCpy.GetValue() )
>+{
>+    bAnchorOnly = rCpy.bAnchorOnly;
>+    bContour = rCpy.bContour;
>+    bOutside = rCpy.bOutside;
>+}
> 
>-SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* pPool ) const
>+int  SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const
> {
>-    return new SwFmtLayoutSplit( GetValue() );
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( GetValue() == ((SwFmtSurround&)rAttr).GetValue() &&
>+             bAnchorOnly== ((SwFmtSurround&)rAttr).bAnchorOnly &&
>+             bContour== ((SwFmtSurround&)rAttr).bContour &&
>+             bOutside== ((SwFmtSurround&)rAttr).bOutside );
> }
> 
>-// class SwFmtNoBalancedColumns
>+SfxPoolItem*  SwFmtSurround::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtSurround( *this );
>+}
> 
>-/*N*/ SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtNoBalancedColumns( GetValue() );
>-/*N*/ }
> 
>-// class SwFmtFtnEndAtTxtEnd
> 
>+bool SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_SURROUND_SURROUNDTYPE:
>+        rVal <<= (text::WrapTextMode)GetSurround();
>+        break;
>+    case MID_SURROUND_ANCHORONLY:
>+    {
>+        BOOL bTmp = IsAnchorOnly();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_SURROUND_CONTOUR:
>+    {
>+        BOOL bTmp = IsContour();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_SURROUND_CONTOUROUTSIDE:
>+    {
>+        BOOL bTmp = IsOutside();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
> 
>-SwFmtFtnEndAtTxtEnd& SwFmtFtnEndAtTxtEnd::operator=(
>-                        const SwFmtFtnEndAtTxtEnd& rAttr )
>+bool SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    SfxEnumItem::SetValue( rAttr.GetValue() );
>-    aFmt = rAttr.aFmt;
>-    nOffset = rAttr.nOffset;
>-    sPrefix = rAttr.sPrefix;
>-    sSuffix = rAttr.sSuffix;
>-    return *this;
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    sal_Bool bRet = sal_True;
>+    switch ( nMemberId )
>+    {
>+    case MID_SURROUND_SURROUNDTYPE:
>+    {
>+        sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal );
>+        if( eVal >= 0 && eVal < (sal_Int16)SURROUND_END )
>+            SetValue( eVal );
>+        else
>+            //exception
>+            ;
>+    }
>+    break;
>+
>+    case MID_SURROUND_ANCHORONLY:
>+        SetAnchorOnly( *(sal_Bool*)rVal.getValue() );
>+        break;
>+    case MID_SURROUND_CONTOUR:
>+        SetContour( *(sal_Bool*)rVal.getValue() );
>+        break;
>+    case MID_SURROUND_CONTOUROUTSIDE:
>+        SetOutside( *(sal_Bool*)rVal.getValue() );
>+        break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
> }
> 
>-int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const
>+//  class SwFmtVertOrient
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, SwVertOrient eVert,
>+                                  SwRelationOrient eRel )
>+    : SfxPoolItem( RES_VERT_ORIENT ),
>+      nYPos( nY ),
>+      eOrient( eVert ),
>+      eRelation( eRel )
>+{}
>+
>+int  SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const
> {
>-    const SwFmtFtnEndAtTxtEnd& rAttr = (SwFmtFtnEndAtTxtEnd&)rItem;
>-    return SfxEnumItem::operator==( rAttr ) &&
>-            aFmt.GetNumberingType() == rAttr.aFmt.GetNumberingType() &&
>-            nOffset == rAttr.nOffset &&
>-            sPrefix == rAttr.sPrefix &&
>-            sSuffix == rAttr.sSuffix;
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( nYPos     == ((SwFmtVertOrient&)rAttr).nYPos &&
>+             eOrient   == ((SwFmtVertOrient&)rAttr).eOrient &&
>+             eRelation == ((SwFmtVertOrient&)rAttr).eRelation );
>+}
>+
>+SfxPoolItem*  SwFmtVertOrient::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtVertOrient( nYPos, eOrient, eRelation );
>+}
>+
>+
>+SwTwips  SwFmtVertOrient::GetPosConvertedToSw31(
>+    const SvxULSpaceItem *pULSpace ) const
>+{
>+    SwTwips nNewPos = GetPos();
>+
>+    if( VERT_NONE==GetVertOrient() && pULSpace )
>+    {
>+        nNewPos -= pULSpace->GetUpper();
>+    }
>+
>+    return nNewPos;
> }
> 
>-BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+SwTwips  SwFmtVertOrient::GetPosConvertedFromSw31(
>+    const SvxULSpaceItem *pULSpace ) const
> {
>+    SwTwips nNewPos = GetPos();
>+
>+    if( VERT_NONE==GetVertOrient() && pULSpace )
>+    {
>+        nNewPos += pULSpace->GetUpper();
>+    }
>+
>+    return nNewPos;
>+}
>+
>+
>+bool SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    switch(nMemberId)
>+    bool bRet = true;
>+    switch ( nMemberId )
>     {
>-        case MID_COLLECT     :
>+    case MID_VERTORIENT_ORIENT:
>+    {
>+        sal_Int16 nRet = text::VertOrientation::NONE;
>+        switch( eOrient )
>         {
>-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND;
>-            rVal.setValue(&bVal, ::getBooleanCppuType());
>+        case VERT_TOP        :  nRet = text::VertOrientation::TOP        ;break;
>+        case VERT_CENTER     :  nRet = text::VertOrientation::CENTER     ;break;
>+        case VERT_BOTTOM     :  nRet = text::VertOrientation::BOTTOM     ;break;
>+        case VERT_CHAR_TOP   :  nRet = text::VertOrientation::CHAR_TOP   ;break;
>+        case VERT_CHAR_CENTER:  nRet = text::VertOrientation::CHAR_CENTER;break;
>+        case VERT_CHAR_BOTTOM:  nRet = text::VertOrientation::CHAR_BOTTOM;break;
>+        case VERT_LINE_TOP   :  nRet = text::VertOrientation::LINE_TOP   ;break;
>+        case VERT_LINE_CENTER:  nRet = text::VertOrientation::LINE_CENTER;break;
>+        case VERT_LINE_BOTTOM:  nRet = text::VertOrientation::LINE_BOTTOM;break;
>         }
>+        rVal <<= nRet;
>+    }
>+    break;
>+    case MID_VERTORIENT_RELATION:
>+        rVal <<= lcl_RelToINT(eRelation);
>         break;
>-        case MID_RESTART_NUM :
>+    case MID_VERTORIENT_POSITION:
>+        rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
>+        break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+bool SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_VERTORIENT_ORIENT:
>+    {
>+        sal_uInt16 nVal;
>+        rVal >>= nVal;
>+        switch( nVal )
>         {
>-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
>-            rVal.setValue(&bVal, ::getBooleanCppuType());
>+        case text::VertOrientation::NONE:           eOrient = VERT_NONE;    break;
>+        case text::VertOrientation::TOP        :    eOrient = VERT_TOP;     break;
>+        case text::VertOrientation::CENTER     :    eOrient = VERT_CENTER;     break;
>+        case text::VertOrientation::BOTTOM     :    eOrient = VERT_BOTTOM;     break;
>+        case text::VertOrientation::CHAR_TOP   :    eOrient = VERT_CHAR_TOP;   break;
>+        case text::VertOrientation::CHAR_CENTER:    eOrient = VERT_CHAR_CENTER;break;
>+        case text::VertOrientation::CHAR_BOTTOM:    eOrient = VERT_CHAR_BOTTOM;break;
>+        case text::VertOrientation::LINE_TOP   :    eOrient = VERT_LINE_TOP;    break;
>+        case text::VertOrientation::LINE_CENTER:    eOrient = VERT_LINE_CENTER;break;
>+        case text::VertOrientation::LINE_BOTTOM:    eOrient = VERT_LINE_BOTTOM;break;
>         }
>-        break;
>-        case MID_NUM_START_AT: rVal <<= (sal_Int16) nOffset; break;
>-        case MID_OWN_NUM     :
>+    }
>+    break;
>+    case MID_VERTORIENT_RELATION:
>+    {
>+        eRelation = lcl_IntToRelation(rVal);
>+    }
>+    break;
>+    case MID_VERTORIENT_POSITION:
>+    {
>+        sal_Int32 nVal;
>+        rVal >>= nVal;
>+        if(bConvert)
>+            nVal = MM100_TO_TWIP(nVal);
>+        SetPos( nVal );
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+
>+
>+//  class SwFmtHoriOrient
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, SwHoriOrient eHori,
>+                                  SwRelationOrient eRel, sal_Bool bPos )
>+    : SfxPoolItem( RES_HORI_ORIENT ),
>+      nXPos( nX ),
>+      eOrient( eHori ),
>+      eRelation( eRel ),
>+      bPosToggle( bPos )
>+{}
>+
>+int  SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( nXPos == ((SwFmtHoriOrient&)rAttr).nXPos &&
>+             eOrient == ((SwFmtHoriOrient&)rAttr).eOrient &&
>+             eRelation == ((SwFmtHoriOrient&)rAttr).eRelation &&
>+             bPosToggle == ((SwFmtHoriOrient&)rAttr).bPosToggle );
>+}
>+
>+SfxPoolItem*  SwFmtHoriOrient::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle );
>+}
>+
>+
>+SwTwips  SwFmtHoriOrient::GetPosConvertedToSw31(
>+    const SvxLRSpaceItem *pLRSpace ) const
>+{
>+    SwTwips nNewPos = GetPos();
>+
>+    if( HORI_NONE==GetHoriOrient() && pLRSpace )
>+    {
>+        nNewPos -= pLRSpace->GetLeft();
>+    }
>+
>+    return nNewPos;
>+}
>+
>+SwTwips  SwFmtHoriOrient::GetPosConvertedFromSw31(
>+    const SvxLRSpaceItem *pLRSpace ) const
>+{
>+    SwTwips nNewPos = GetPos();
>+
>+    if( HORI_NONE==GetHoriOrient() && pLRSpace )
>+    {
>+        nNewPos += pLRSpace->GetLeft();
>+    }
>+
>+    return nNewPos;
>+}
>+
>+bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_HORIORIENT_ORIENT:
>+    {
>+        sal_Int16 nRet = text::HoriOrientation::NONE;
>+        switch( eOrient )
>         {
>-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
>-            rVal.setValue(&bVal, ::getBooleanCppuType());
>+        case HORI_RIGHT:    nRet = text::HoriOrientation::RIGHT; break;
>+        case HORI_CENTER :  nRet = text::HoriOrientation::CENTER; break;
>+        case HORI_LEFT   :  nRet = text::HoriOrientation::LEFT; break;
>+        case HORI_INSIDE :  nRet = text::HoriOrientation::INSIDE; break;
>+        case HORI_OUTSIDE:  nRet = text::HoriOrientation::OUTSIDE; break;
>+        case HORI_FULL:     nRet = text::HoriOrientation::FULL; break;
>+        case HORI_LEFT_AND_WIDTH :
>+            nRet = text::HoriOrientation::LEFT_AND_WIDTH;
>+            break;
>         }
>+        rVal <<= nRet;
>+    }
>+    break;
>+    case MID_HORIORIENT_RELATION:
>+        rVal <<= lcl_RelToINT(eRelation);
>+        break;
>+    case MID_HORIORIENT_POSITION:
>+        rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
>         break;
>-        case MID_NUM_TYPE    : rVal <<= aFmt.GetNumberingType(); break;
>-        case MID_PREFIX      : rVal <<= OUString(sPrefix); break;
>-        case MID_SUFFIX      : rVal <<= OUString(sSuffix); break;
>-        default: return FALSE;
>+    case MID_HORIORIENT_PAGETOGGLE:
>+    {
>+        BOOL bTmp = IsPosToggle();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>     }
>-    return TRUE;
>+    return bRet;
> }
> 
>-BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    BOOL bRet = TRUE;
>+    sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    switch(nMemberId)
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_HORIORIENT_ORIENT:
>     {
>-        case MID_COLLECT     :
>+        sal_Int16 nVal;
>+        rVal >>= nVal;
>+        switch( nVal )
>         {
>-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>-            if(!bVal && GetValue() >= FTNEND_ATTXTEND)
>-                SetValue(FTNEND_ATPGORDOCEND);
>-            else if(bVal && GetValue() < FTNEND_ATTXTEND)
>-                SetValue(FTNEND_ATTXTEND);
>+        case text::HoriOrientation::NONE:       eOrient = HORI_NONE ;   break;
>+        case text::HoriOrientation::RIGHT:  eOrient = HORI_RIGHT;   break;
>+        case text::HoriOrientation::CENTER :    eOrient = HORI_CENTER;  break;
>+        case text::HoriOrientation::LEFT   :    eOrient = HORI_LEFT;    break;
>+        case text::HoriOrientation::INSIDE :    eOrient = HORI_INSIDE;  break;
>+        case text::HoriOrientation::OUTSIDE:    eOrient = HORI_OUTSIDE; break;
>+        case text::HoriOrientation::FULL:      eOrient = HORI_FULL;     break;
>+        case text::HoriOrientation::LEFT_AND_WIDTH:
>+            eOrient = HORI_LEFT_AND_WIDTH;
>+            break;
>         }
>+    }
>+    break;
>+    case MID_HORIORIENT_RELATION:
>+    {
>+        eRelation = lcl_IntToRelation(rVal);
>+    }
>+    break;
>+    case MID_HORIORIENT_POSITION:
>+    {
>+        sal_Int32 nVal;
>+        if(!(rVal >>= nVal))
>+            bRet = false;
>+        if(bConvert)
>+            nVal = MM100_TO_TWIP(nVal);
>+        SetPos( nVal );
>+    }
>+    break;
>+    case MID_HORIORIENT_PAGETOGGLE:
>+        SetPosToggle( *(sal_Bool*)rVal.getValue());
>         break;
>-        case MID_RESTART_NUM :
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+
>+
>+//  class SwFmtAnchor
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
>+    : SfxPoolItem( RES_ANCHOR ),
>+      pCntntAnchor( 0 ),
>+      nAnchorId( nRnd ),
>+      nPageNum( nPage )
>+{}
>+
>+SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy )
>+    : SfxPoolItem( RES_ANCHOR ),
>+      nAnchorId( rCpy.GetAnchorId() ),
>+      nPageNum( rCpy.GetPageNum() )
>+{
>+    pCntntAnchor = rCpy.GetCntntAnchor() ?
>+        new SwPosition( *rCpy.GetCntntAnchor() ) : 0;
>+}
>+
>+SwFmtAnchor::~SwFmtAnchor()
>+{
>+    delete pCntntAnchor;
>+}
>+
>+void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
>+{
>+    if ( pCntntAnchor )
>+        delete pCntntAnchor;
>+    pCntntAnchor = pPos ? new SwPosition( *pPos ) : 0;
>+    //AM Absatz gebundene Flys sollten nie in den Absatz hineinzeigen.
>+    if ( pCntntAnchor && ( FLY_AT_CNTNT == nAnchorId ||
>+                           FLY_AT_FLY == nAnchorId ))
>+        pCntntAnchor->nContent.Assign( 0, 0 );
>+}
>+
>+SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor)
>+{
>+    nAnchorId  = rAnchor.GetAnchorId();
>+    nPageNum   = rAnchor.GetPageNum();
>+
>+    delete pCntntAnchor;
>+    pCntntAnchor = rAnchor.pCntntAnchor ?
>+        new SwPosition(*(rAnchor.pCntntAnchor)) : 0;
>+    return *this;
>+}
>+
>+int  SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    return ( nAnchorId == ((SwFmtAnchor&)rAttr).GetAnchorId() &&
>+             nPageNum == ((SwFmtAnchor&)rAttr).GetPageNum()   &&
>+             //Anker vergleichen. Entweder zeigen beide auf das gleiche
>+             //Attribut bzw. sind 0 oder die SwPosition* sind beide
>+             //gueltig und die SwPositions sind gleich.
>+             (pCntntAnchor == ((SwFmtAnchor&)rAttr).GetCntntAnchor() ||
>+              (pCntntAnchor && ((SwFmtAnchor&)rAttr).GetCntntAnchor() &&
>+               *pCntntAnchor == *((SwFmtAnchor&)rAttr).GetCntntAnchor())));
>+}
>+
>+SfxPoolItem*  SwFmtAnchor::Clone( SfxItemPool* ) const
>+{
>+    return new SwFmtAnchor( *this );
>+}
>+
>+/*-----------------16.02.98 15:21-------------------
>+
>+  --------------------------------------------------*/
>+bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_ANCHOR_ANCHORTYPE:
>+
>+        text::TextContentAnchorType eRet;
>+        switch((sal_Int16)GetAnchorId())
>         {
>-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>-            if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ)
>-                SetValue(FTNEND_ATTXTEND);
>-            else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMSEQ)
>-                SetValue(FTNEND_ATTXTEND_OWNNUMSEQ);
>+        case  FLY_AUTO_CNTNT : eRet = text::TextContentAnchorType_AT_CHARACTER;break;
>+        case  FLY_PAGE       : eRet = text::TextContentAnchorType_AT_PAGE;      break;
>+        case  FLY_AT_FLY     : eRet = text::TextContentAnchorType_AT_FRAME;    break;
>+        case  FLY_IN_CNTNT   : eRet = text::TextContentAnchorType_AS_CHARACTER;break;
>+            //case  FLY_AT_CNTNT  :
>+        default: eRet = text::TextContentAnchorType_AT_PARAGRAPH;
>         }
>+        rVal <<= eRet;
>+        break;
>+    case MID_ANCHOR_PAGENUM:
>+        rVal <<= (sal_Int16)GetPageNum();
>         break;
>-        case MID_NUM_START_AT:
>+    case MID_ANCHOR_ANCHORFRAME:
>+    {
>+        if(pCntntAnchor && FLY_AT_FLY == nAnchorId)
>         {
>-            sal_Int16 nVal;
>-            rVal >>= nVal;
>-            if(nVal >= 0)
>-                nOffset = nVal;
>-            else
>-                bRet = FALSE;
>+            SwFrmFmt* pFmt = pCntntAnchor->nNode.GetNode().GetFlyFmt();
>+            if(pFmt)
>+            {
>+                Reference<XNamed> xNamed = SwXFrames::GetObject( *pFmt, FLYCNTTYPE_FRM );
>+                Reference<XTextFrame> xRet(xNamed, UNO_QUERY);
>+                rVal <<= xRet;
>+            }
>         }
>-        break;
>-        case MID_OWN_NUM     :
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_ANCHOR_ANCHORTYPE:
>+    {
>+        RndStdIds   eAnchor;
>+        switch( SWUnoHelper::GetEnumAsInt32( rVal ) )
>         {
>-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>-            if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT)
>-                SetValue(FTNEND_ATTXTEND_OWNNUMSEQ);
>-            else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMANDFMT)
>-                SetValue(FTNEND_ATTXTEND_OWNNUMANDFMT);
>+        case  text::TextContentAnchorType_AS_CHARACTER:
>+            eAnchor = FLY_IN_CNTNT;
>+            break;
>+        case  text::TextContentAnchorType_AT_PAGE:
>+            eAnchor = FLY_PAGE;
>+            if( GetPageNum() > 0 && pCntntAnchor )
>+            {
>+                // If the anchor type is page and a valid page number
>+                // has been set, the content position isn't required
>+                // any longer.
>+                delete pCntntAnchor;
>+                pCntntAnchor = 0;
>+            }
>+            break;
>+        case  text::TextContentAnchorType_AT_FRAME:
>+            eAnchor = FLY_AT_FLY;
>+            break;
>+        case  text::TextContentAnchorType_AT_CHARACTER:
>+            eAnchor = FLY_AUTO_CNTNT;
>+            break;
>+            //case  text::TextContentAnchorType_AT_PARAGRAPH:
>+        default:
>+            eAnchor = FLY_AT_CNTNT;
>+            break;
>         }
>-        break;
>-        case MID_NUM_TYPE    :
>+        SetType( eAnchor );
>+    }
>+    break;
>+    case MID_ANCHOR_PAGENUM:
>+    {
>+        sal_Int16 nVal;
>+        if((rVal >>= nVal) && nVal > 0)
>         {
>-            sal_Int16 nVal;
>-            rVal >>= nVal;
>-            if(nVal >= 0 &&
>-                (nVal <= SVX_NUM_ARABIC ||
>-                    SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
>-                        SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
>-                aFmt.SetNumberingType(nVal);
>-            else
>-                bRet = FALSE;
>+            SetPageNum( nVal );
>+            if( FLY_PAGE == GetAnchorId() && pCntntAnchor )
>+            {
>+                // If the anchor type is page and a valid page number
>+                // is set, the content paoition has to be deleted to not
>+                // confuse the layout (frmtool.cxx). However, if the
>+                // anchor type is not page, any content position will
>+                // be kept.
>+                delete pCntntAnchor;
>+                pCntntAnchor = 0;
>+            }
>         }
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_ANCHOR_ANCHORFRAME:
>+        //no break here!;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+//  class SwFmtURL
>+//  Implementierung teilweise inline im hxx
>+
>+SwFmtURL::SwFmtURL() :
>+    SfxPoolItem( RES_URL ),
>+    pMap( 0 ),
>+    bIsServerMap( sal_False )
>+{
>+}
>+
>+SwFmtURL::SwFmtURL( const SwFmtURL &rURL) :
>+    SfxPoolItem( RES_URL ),
>+    sURL( rURL.GetURL() ),
>+    sTargetFrameName( rURL.GetTargetFrameName() ),
>+    sName( rURL.GetName() ),
>+    bIsServerMap( rURL.IsServerMap() )
>+{
>+    pMap = rURL.GetMap() ? new ImageMap( *rURL.GetMap() ) : 0;
>+}
>+
>+SwFmtURL::~SwFmtURL()
>+{
>+    if ( pMap )
>+        delete pMap;
>+}
>+
>+int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+    const SwFmtURL &rCmp = (SwFmtURL&)rAttr;
>+    sal_Bool bRet = bIsServerMap     == rCmp.IsServerMap() &&
>+        sURL             == rCmp.GetURL() &&
>+        sTargetFrameName == rCmp.GetTargetFrameName() &&
>+        sName            == rCmp.GetName();
>+    if ( bRet )
>+    {
>+        if ( pMap && rCmp.GetMap() )
>+            bRet = *pMap == *rCmp.GetMap();
>+        else
>+            bRet = pMap == rCmp.GetMap();
>+    }
>+    return bRet;
>+}
>+
>+SfxPoolItem* SwFmtURL::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwFmtURL( *this );
>+}
>+
>+void SwFmtURL::SetURL( const XubString &rURL, sal_Bool bServerMap )
>+{
>+    sURL = rURL;
>+    bIsServerMap = bServerMap;
>+}
>+
>+void SwFmtURL::SetMap( const ImageMap *pM )
>+{
>+    if ( pMap )
>+        delete pMap;
>+    pMap = pM ? new ImageMap( *pM ) : 0;
>+}
>+extern const SvEventDescription* lcl_GetSupportedMacroItems();
>+
>+bool SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_URL_URL:
>+    {
>+        OUString sRet = GetURL();
>+        rVal <<= sRet;
>+    }
>+    break;
>+    case MID_URL_TARGET:
>+    {
>+        OUString sRet = GetTargetFrameName();
>+        rVal <<= sRet;
>+    }
>+    break;
>+    case MID_URL_HYPERLINKNAME:
>+        rVal <<= OUString( GetName() );
>         break;
>-        case MID_PREFIX      :
>+    case MID_URL_CLIENTMAP:
>+    {
>+        Reference< XInterface > xInt;
>+        if(pMap)
>         {
>-            OUString sVal; rVal >>= sVal;
>-            sPrefix = sVal;
>+            xInt = SvUnoImageMap_createInstance( *pMap, lcl_GetSupportedMacroItems() );
>         }
>-        break;
>-        case MID_SUFFIX      :
>+        else
>         {
>-            OUString sVal; rVal >>= sVal;
>-            sSuffix = sVal;
>+            ImageMap aEmptyMap;
>+            xInt = SvUnoImageMap_createInstance( aEmptyMap, lcl_GetSupportedMacroItems() );
>         }
>+        Reference< XIndexContainer > xCont(xInt, UNO_QUERY);
>+        rVal <<= xCont;
>+    }
>+    break;
>+    case MID_URL_SERVERMAP:
>+    {
>+        BOOL bTmp = IsServerMap();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_URL_URL:
>+    {
>+        OUString sTmp;
>+        rVal >>= sTmp;
>+        SetURL( sTmp, bIsServerMap );
>+    }
>+    break;
>+    case MID_URL_TARGET:
>+    {
>+        OUString sTmp;
>+        rVal >>= sTmp;
>+        SetTargetFrameName( sTmp );
>+    }
>+    break;
>+    case MID_URL_HYPERLINKNAME:
>+    {
>+        OUString sTmp;
>+        rVal >>= sTmp;
>+        SetName( sTmp );
>+    }
>+    break;
>+    case MID_URL_CLIENTMAP:
>+    {
>+        Reference<XIndexContainer> xCont;
>+        if(!rVal.hasValue())
>+            DELETEZ(pMap);
>+        else if(rVal >>= xCont)
>+        {
>+            if(!pMap)
>+                pMap = new ImageMap;
>+            bRet = SvUnoImageMap_fillImageMap( xCont, *pMap );
>+        }
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_URL_SERVERMAP:
>+        bIsServerMap = *(sal_Bool*)rVal.getValue();
>         break;
>-        default: bRet = FALSE;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+
>+// class SwNoReadOnly
>+
>+SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwFmtEditInReadonly( Which(), GetValue() );
>+}
>+
>+// class SwFmtLayoutSplit
>+
>+SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwFmtLayoutSplit( GetValue() );
>+}
>+
>+// class SwFmtNoBalancedColumns
>+
>+SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwFmtNoBalancedColumns( GetValue() );
>+}
>+
>+// class SwFmtFtnEndAtTxtEnd
>+
>+
>+SwFmtFtnEndAtTxtEnd& SwFmtFtnEndAtTxtEnd::operator=(
>+    const SwFmtFtnEndAtTxtEnd& rAttr )
>+{
>+    SfxEnumItem::SetValue( rAttr.GetValue() );
>+    aFmt = rAttr.aFmt;
>+    nOffset = rAttr.nOffset;
>+    sPrefix = rAttr.sPrefix;
>+    sSuffix = rAttr.sSuffix;
>+    return *this;
>+}
>+
>+int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const
>+{
>+    const SwFmtFtnEndAtTxtEnd& rAttr = (SwFmtFtnEndAtTxtEnd&)rItem;
>+    return SfxEnumItem::operator==( rAttr ) &&
>+        aFmt.GetNumberingType() == rAttr.aFmt.GetNumberingType() &&
>+        nOffset == rAttr.nOffset &&
>+        sPrefix == rAttr.sPrefix &&
>+        sSuffix == rAttr.sSuffix;
>+}
>+
>+bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    nMemberId &= ~CONVERT_TWIPS;
>+    switch(nMemberId)
>+    {
>+    case MID_COLLECT     :
>+    {
>+        sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND;
>+        rVal.setValue(&bVal, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_RESTART_NUM :
>+    {
>+        sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
>+        rVal.setValue(&bVal, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_NUM_START_AT: rVal <<= (sal_Int16) nOffset; break;
>+    case MID_OWN_NUM     :
>+    {
>+        sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
>+        rVal.setValue(&bVal, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_NUM_TYPE    : rVal <<= aFmt.GetNumberingType(); break;
>+    case MID_PREFIX      : rVal <<= OUString(sPrefix); break;
>+    case MID_SUFFIX      : rVal <<= OUString(sSuffix); break;
>+    default: return false;
>+    }
>+    return true;
>+}
>+
>+bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    bool bRet = true;
>+    nMemberId &= ~CONVERT_TWIPS;
>+    switch(nMemberId)
>+    {
>+    case MID_COLLECT     :
>+    {
>+        sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>+        if(!bVal && GetValue() >= FTNEND_ATTXTEND)
>+            SetValue(FTNEND_ATPGORDOCEND);
>+        else if(bVal && GetValue() < FTNEND_ATTXTEND)
>+            SetValue(FTNEND_ATTXTEND);
>+    }
>+    break;
>+    case MID_RESTART_NUM :
>+    {
>+        sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>+        if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ)
>+            SetValue(FTNEND_ATTXTEND);
>+        else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMSEQ)
>+            SetValue(FTNEND_ATTXTEND_OWNNUMSEQ);
>+    }
>+    break;
>+    case MID_NUM_START_AT:
>+    {
>+        sal_Int16 nVal;
>+        rVal >>= nVal;
>+        if(nVal >= 0)
>+            nOffset = nVal;
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_OWN_NUM     :
>+    {
>+        sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>+        if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT)
>+            SetValue(FTNEND_ATTXTEND_OWNNUMSEQ);
>+        else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMANDFMT)
>+            SetValue(FTNEND_ATTXTEND_OWNNUMANDFMT);
>+    }
>+    break;
>+    case MID_NUM_TYPE    :
>+    {
>+        sal_Int16 nVal;
>+        rVal >>= nVal;
>+        if(nVal >= 0 &&
>+           (nVal <= SVX_NUM_ARABIC ||
>+            SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
>+            SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
>+            aFmt.SetNumberingType(nVal);
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_PREFIX      :
>+    {
>+        OUString sVal; rVal >>= sVal;
>+        sPrefix = sVal;
>+    }
>+    break;
>+    case MID_SUFFIX      :
>+    {
>+        OUString sVal; rVal >>= sVal;
>+        sSuffix = sVal;
>+    }
>+    break;
>+    default: bRet = false;
>     }
>     return bRet;
> }
>@@ -2066,7 +2066,7 @@ int SwFmtChain::operator==( const SfxPoolItem &rAttr ) const
>     ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
> 
>     return GetPrev() == ((SwFmtChain&)rAttr).GetPrev() &&
>-           GetNext() == ((SwFmtChain&)rAttr).GetNext();
>+        GetNext() == ((SwFmtChain&)rAttr).GetNext();
> }
> 
> SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) :
>@@ -2100,134 +2100,134 @@ void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt )
>         ((SwModify*)aNext.GetRegisteredIn())->Remove( &aNext );
> }
> 
>-/*N*/ BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool   bRet = sal_True;
>-/*N*/ 	XubString aRet;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_CHAIN_PREVNAME:
>-/*?*/ 			if ( GetPrev() )
>-/*?*/ 				aRet = GetPrev()->GetName();
>-/*?*/ 			break;
>-/*N*/ 		case MID_CHAIN_NEXTNAME:
>-/*N*/ 			if ( GetNext() )
>-/*?*/ 				aRet = GetNext()->GetName();
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	rVal <<= OUString(aRet);
>-/*N*/ 	return bRet;
>-/*N*/ }
>+bool SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool   bRet = true;
>+    XubString aRet;
>+    switch ( nMemberId )
>+    {
>+    case MID_CHAIN_PREVNAME:
>+        if ( GetPrev() )
>+            aRet = GetPrev()->GetName();
>+        break;
>+    case MID_CHAIN_NEXTNAME:
>+        if ( GetNext() )
>+            aRet = GetNext()->GetName();
>+        break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    rVal <<= OUString(aRet);
>+    return bRet;
>+}
> 
> 
> 
> 
> //class SwFmtLineNumber
> 
>-/*N*/ SwFmtLineNumber::SwFmtLineNumber() :
>-/*N*/ 	SfxPoolItem( RES_LINENUMBER )
>-/*N*/ {
>-/*N*/ 	nStartValue = 0;
>-/*N*/ 	bCountLines = sal_True;
>-/*N*/ }
>-
>-/*N*/ SwFmtLineNumber::~SwFmtLineNumber()
>-/*N*/ {
>-/*N*/ }
>-
>-/*N*/ int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
>-/*N*/ {
>-/*N*/ 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>-/*N*/
>-/*N*/ 	return nStartValue	== ((SwFmtLineNumber&)rAttr).GetStartValue() &&
>-/*N*/ 		   bCountLines	== ((SwFmtLineNumber&)rAttr).IsCount();
>-/*N*/ }
>-
>-/*N*/ SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* pPool ) const
>-/*N*/ {
>-/*N*/ 	return new SwFmtLineNumber( *this );
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_LINENUMBER_COUNT:
>-/*N*/ 		{
>-/*N*/ 			BOOL bTmp = IsCount();
>-/*N*/ 			rVal.setValue(&bTmp, ::getBooleanCppuType());
>-/*N*/ 		}
>-/*N*/ 		break;
>-/*N*/ 		case MID_LINENUMBER_STARTVALUE:
>-/*N*/ 			rVal <<= (sal_Int32)GetStartValue();
>-/*N*/ 			break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>-
>-/*N*/ BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
>-/*N*/ {
>-/*N*/ 	// hier wird immer konvertiert!
>-/*N*/ 	nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 	sal_Bool bRet = sal_True;
>-/*N*/ 	switch ( nMemberId )
>-/*N*/ 	{
>-/*N*/ 		case MID_LINENUMBER_COUNT:
>-/*N*/ 			SetCountLines( *(sal_Bool*)rVal.getValue() );
>-/*N*/ 			break;
>-/*N*/ 		case MID_LINENUMBER_STARTVALUE:
>-/*N*/         {
>-/*N*/             sal_Int32 nVal;
>-/*N*/             if(rVal >>= nVal)
>-/*N*/                 SetStartValue( nVal );
>-/*N*/             else
>-/*?*/                 bRet = sal_False;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/ 		default:
>-/*?*/ 			ASSERT( !this, "unknown MemberId" );
>-/*?*/ 			bRet = sal_False;
>-/*N*/ 	}
>-/*N*/ 	return bRet;
>-/*N*/ }
>+SwFmtLineNumber::SwFmtLineNumber() :
>+    SfxPoolItem( RES_LINENUMBER )
>+{
>+    nStartValue = 0;
>+    bCountLines = sal_True;
>+}
>+
>+SwFmtLineNumber::~SwFmtLineNumber()
>+{
>+}
>+
>+int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
>+{
>+    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>+
>+    return nStartValue  == ((SwFmtLineNumber&)rAttr).GetStartValue() &&
>+        bCountLines  == ((SwFmtLineNumber&)rAttr).IsCount();
>+}
>+
>+SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwFmtLineNumber( *this );
>+}
>+
>+bool SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_LINENUMBER_COUNT:
>+    {
>+        BOOL bTmp = IsCount();
>+        rVal.setValue(&bTmp, ::getBooleanCppuType());
>+    }
>+    break;
>+    case MID_LINENUMBER_STARTVALUE:
>+        rVal <<= (sal_Int32)GetStartValue();
>+        break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
>+
>+bool SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+{
>+    // hier wird immer konvertiert!
>+    nMemberId &= ~CONVERT_TWIPS;
>+    bool bRet = true;
>+    switch ( nMemberId )
>+    {
>+    case MID_LINENUMBER_COUNT:
>+        SetCountLines( *(sal_Bool*)rVal.getValue() );
>+        break;
>+    case MID_LINENUMBER_STARTVALUE:
>+    {
>+        sal_Int32 nVal;
>+        if(rVal >>= nVal)
>+            SetStartValue( nVal );
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    default:
>+        ASSERT( !this, "unknown MemberId" );
>+        bRet = false;
>+    }
>+    return bRet;
>+}
> 
> /*************************************************************************
>  *    class SwTextGridItem
>  *************************************************************************/
> 
>-/*N*/ SwTextGridItem::SwTextGridItem()
>-/*N*/     : SfxPoolItem( RES_TEXTGRID ), aColor( COL_LIGHTGRAY ), nLines( 20 ),
>-/*N*/       nBaseHeight( 400 ), nRubyHeight( 200 ), eGridType( GRID_NONE ),
>-/*N*/       bRubyTextBelow( 0 ), bPrintGrid( 1 ), bDisplayGrid( 1 )
>-/*N*/ {
>-/*N*/ }
>+SwTextGridItem::SwTextGridItem()
>+    : SfxPoolItem( RES_TEXTGRID ), aColor( COL_LIGHTGRAY ), nLines( 20 ),
>+      nBaseHeight( 400 ), nRubyHeight( 200 ), eGridType( GRID_NONE ),
>+      bRubyTextBelow( 0 ), bPrintGrid( 1 ), bDisplayGrid( 1 )
>+{
>+}
> 
>-/*N*/ SwTextGridItem::~SwTextGridItem()
>-/*N*/ {
>-/*N*/ }
>+SwTextGridItem::~SwTextGridItem()
>+{
>+}
> 
> int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const
> {
>     ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
>     return eGridType == ((SwTextGridItem&)rAttr).GetGridType() &&
>-           nLines == ((SwTextGridItem&)rAttr).GetLines() &&
>-           nBaseHeight == ((SwTextGridItem&)rAttr).GetBaseHeight() &&
>-           nRubyHeight == ((SwTextGridItem&)rAttr).GetRubyHeight() &&
>-           bRubyTextBelow == ((SwTextGridItem&)rAttr).GetRubyTextBelow() &&
>-           bDisplayGrid == ((SwTextGridItem&)rAttr).GetDisplayGrid() &&
>-           bPrintGrid == ((SwTextGridItem&)rAttr).GetPrintGrid() &&
>-           aColor == ((SwTextGridItem&)rAttr).GetColor();
>+        nLines == ((SwTextGridItem&)rAttr).GetLines() &&
>+        nBaseHeight == ((SwTextGridItem&)rAttr).GetBaseHeight() &&
>+        nRubyHeight == ((SwTextGridItem&)rAttr).GetRubyHeight() &&
>+        bRubyTextBelow == ((SwTextGridItem&)rAttr).GetRubyTextBelow() &&
>+        bDisplayGrid == ((SwTextGridItem&)rAttr).GetDisplayGrid() &&
>+        bPrintGrid == ((SwTextGridItem&)rAttr).GetPrintGrid() &&
>+        aColor == ((SwTextGridItem&)rAttr).GetColor();
> }
> 
> SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* pPool ) const
>@@ -2249,140 +2249,140 @@ SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy )
>     return *this;
> }
> 
>-BOOL SwTextGridItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>+bool SwTextGridItem::QueryValue( ::com::sun::star::uno::Any& rVal,
>                                  BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
> 
>     switch( nMemberId & ~CONVERT_TWIPS )
>     {
>-        case MID_GRID_COLOR:
>-            rVal <<= GetColor().GetColor();
>-            break;
>-        case MID_GRID_LINES:
>-            rVal <<= GetLines();
>-            break;
>-        case MID_GRID_RUBY_BELOW:
>-            rVal.setValue( &bRubyTextBelow, ::getBooleanCppuType() );
>-            break;
>-        case MID_GRID_PRINT:
>-            rVal.setValue( &bPrintGrid, ::getBooleanCppuType() );
>-            break;
>-        case MID_GRID_DISPLAY:
>-            rVal.setValue( &bDisplayGrid, ::getBooleanCppuType() );
>-            break;
>-        case MID_GRID_BASEHEIGHT:
>-            DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>-                        "This value needs TWIPS-MM100 conversion" );
>-            rVal <<= (sal_Int32) TWIP_TO_MM100(nBaseHeight);
>+    case MID_GRID_COLOR:
>+        rVal <<= GetColor().GetColor();
>+        break;
>+    case MID_GRID_LINES:
>+        rVal <<= GetLines();
>+        break;
>+    case MID_GRID_RUBY_BELOW:
>+        rVal.setValue( &bRubyTextBelow, ::getBooleanCppuType() );
>+        break;
>+    case MID_GRID_PRINT:
>+        rVal.setValue( &bPrintGrid, ::getBooleanCppuType() );
>+        break;
>+    case MID_GRID_DISPLAY:
>+        rVal.setValue( &bDisplayGrid, ::getBooleanCppuType() );
>+        break;
>+    case MID_GRID_BASEHEIGHT:
>+        DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>+                    "This value needs TWIPS-MM100 conversion" );
>+        rVal <<= (sal_Int32) TWIP_TO_MM100(nBaseHeight);
>+        break;
>+    case MID_GRID_RUBYHEIGHT:
>+        DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>+                    "This value needs TWIPS-MM100 conversion" );
>+        rVal <<= (sal_Int32)TWIP_TO_MM100(nRubyHeight);
>+        break;
>+    case MID_GRID_TYPE:
>+        switch( GetGridType() )
>+        {
>+        case GRID_NONE:
>+            rVal <<= TextGridMode::NONE;
>             break;
>-        case MID_GRID_RUBYHEIGHT:
>-            DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>-                        "This value needs TWIPS-MM100 conversion" );
>-            rVal <<= (sal_Int32)TWIP_TO_MM100(nRubyHeight);
>+        case GRID_LINES_ONLY:
>+            rVal <<= TextGridMode::LINES;
>             break;
>-        case MID_GRID_TYPE:
>-            switch( GetGridType() )
>-            {
>-                case GRID_NONE:
>-                    rVal <<= TextGridMode::NONE;
>-                    break;
>-                case GRID_LINES_ONLY:
>-                    rVal <<= TextGridMode::LINES;
>-                    break;
>-                case GRID_LINES_CHARS:
>-                    rVal <<= TextGridMode::LINES_AND_CHARS;
>-                    break;
>-                default:
>-                    DBG_ERROR("unknown SwTextGrid value");
>-                    bRet = FALSE;
>-                    break;
>-            }
>+        case GRID_LINES_CHARS:
>+            rVal <<= TextGridMode::LINES_AND_CHARS;
>             break;
>         default:
>-            DBG_ERROR("Unknown SwTextGridItem member");
>-            bRet = FALSE;
>+            DBG_ERROR("unknown SwTextGrid value");
>+            bRet = false;
>             break;
>+        }
>+        break;
>+    default:
>+        DBG_ERROR("Unknown SwTextGridItem member");
>+        bRet = false;
>+        break;
>     }
> 
>     return bRet;
> }
> 
>-BOOL SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>+bool SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>                                BYTE nMemberId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nMemberId & ~CONVERT_TWIPS )
>     {
>-        case MID_GRID_COLOR:
>-        {
>-            sal_Int32 nTmp;
>-            bRet = (rVal >>= nTmp);
>-            if( bRet )
>-                SetColor( Color(nTmp) );
>-        }
>+    case MID_GRID_COLOR:
>+    {
>+        sal_Int32 nTmp;
>+        bRet = (rVal >>= nTmp);
>+        if( bRet )
>+            SetColor( Color(nTmp) );
>+    }
>+    break;
>+    case MID_GRID_LINES:
>+    {
>+        sal_Int16 nTmp;
>+        bRet = (rVal >>= nTmp);
>+        if( bRet && (nTmp >= 0) )
>+            SetLines( (sal_uInt16)nTmp );
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_GRID_RUBY_BELOW:
>+        SetRubyTextBelow( *(sal_Bool*)rVal.getValue() );
>         break;
>-        case MID_GRID_LINES:
>-        {
>-            sal_Int16 nTmp;
>-            bRet = (rVal >>= nTmp);
>-            if( bRet && (nTmp >= 0) )
>-                SetLines( (sal_uInt16)nTmp );
>-            else
>-                bRet = FALSE;
>-        }
>+    case MID_GRID_PRINT:
>+        SetPrintGrid( *(sal_Bool*)rVal.getValue() );
>         break;
>-        case MID_GRID_RUBY_BELOW:
>-            SetRubyTextBelow( *(sal_Bool*)rVal.getValue() );
>-            break;
>-        case MID_GRID_PRINT:
>-            SetPrintGrid( *(sal_Bool*)rVal.getValue() );
>-            break;
>-        case MID_GRID_DISPLAY:
>-            SetDisplayGrid( *(sal_Bool*)rVal.getValue() );
>-            break;
>-        case MID_GRID_BASEHEIGHT:
>-        case MID_GRID_RUBYHEIGHT:
>-        {
>-            DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>-                        "This value needs TWIPS-MM100 conversion" );
>-            sal_Int32 nTmp;
>-            bRet = (rVal >>= nTmp);
>-            nTmp = MM100_TO_TWIP( nTmp );
>-            if( bRet && (nTmp >= 0) && ( nTmp <= USHRT_MAX) )
>-                if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEHEIGHT )
>-                    SetBaseHeight( (USHORT)nTmp );
>-                else
>-                    SetRubyHeight( (USHORT)nTmp );
>-            else
>-                bRet = FALSE;
>-        }
>+    case MID_GRID_DISPLAY:
>+        SetDisplayGrid( *(sal_Bool*)rVal.getValue() );
>         break;
>-        case MID_GRID_TYPE:
>-            sal_Int16 nTmp;
>-            bRet = (rVal >>= nTmp);
>-            if( bRet )
>+    case MID_GRID_BASEHEIGHT:
>+    case MID_GRID_RUBYHEIGHT:
>+    {
>+        DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
>+                    "This value needs TWIPS-MM100 conversion" );
>+        sal_Int32 nTmp;
>+        bRet = (rVal >>= nTmp);
>+        nTmp = MM100_TO_TWIP( nTmp );
>+        if( bRet && (nTmp >= 0) && ( nTmp <= USHRT_MAX) )
>+            if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEHEIGHT )
>+                SetBaseHeight( (USHORT)nTmp );
>+            else
>+                SetRubyHeight( (USHORT)nTmp );
>+        else
>+            bRet = false;
>+    }
>+    break;
>+    case MID_GRID_TYPE:
>+        sal_Int16 nTmp;
>+        bRet = (rVal >>= nTmp);
>+        if( bRet )
>+        {
>+            switch( nTmp )
>             {
>-                switch( nTmp )
>-                {
>-                    case TextGridMode::NONE:
>-                        SetGridType( GRID_NONE );
>-                        break;
>-                    case TextGridMode::LINES:
>-                        SetGridType( GRID_LINES_ONLY );
>-                        break;
>-                    case TextGridMode::LINES_AND_CHARS:
>-                        SetGridType( GRID_LINES_CHARS );
>-                        break;
>-                    default:
>-                        bRet = FALSE;
>-                        break;
>-                }
>+            case TextGridMode::NONE:
>+                SetGridType( GRID_NONE );
>+                break;
>+            case TextGridMode::LINES:
>+                SetGridType( GRID_LINES_ONLY );
>+                break;
>+            case TextGridMode::LINES_AND_CHARS:
>+                SetGridType( GRID_LINES_CHARS );
>+                break;
>+            default:
>+                bRet = false;
>+                break;
>             }
>-            break;
>-        default:
>-            DBG_ERROR("Unknown SwTextGridItem member");
>-            bRet = FALSE;
>+        }
>+        break;
>+    default:
>+        DBG_ERROR("Unknown SwTextGridItem member");
>+        bRet = false;
>     }
> 
>     return bRet;
>@@ -2390,67 +2390,67 @@ BOOL SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal,
> 
> // class SwHeaderAndFooterEatSpacingItem
> 
>-/*M*/ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const
>-/*M*/ {
>-/*M*/     return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
>-/*M*/ }
>+SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const
>+{
>+    return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
>+}
> 
> 
> //  class SwFrmFmt
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ void SwFrmFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
>-/*N*/ {
>-/*N*/ 	SwFmtHeader *pH = 0;
>-/*N*/ 	SwFmtFooter *pF = 0;
>-/*N*/
>-/*N*/ 	sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
>-/*N*/
>-/*N*/ 	if( RES_ATTRSET_CHG == nWhich )
>-/*N*/ 	{
>-/*N*/ 		((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
>-/*N*/ 			RES_HEADER, sal_False, (const SfxPoolItem**)&pH );
>-/*N*/ 		((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
>-/*N*/ 			RES_FOOTER, sal_False, (const SfxPoolItem**)&pF );
>-/*N*/ 	}
>-/*N*/ 	else if( RES_HEADER == nWhich )
>-/*?*/ 		pH = (SwFmtHeader*)pNew;
>-/*N*/ 	else if( RES_FOOTER == nWhich )
>-/*?*/ 		pF = (SwFmtFooter*)pNew;
>-/*N*/
>-/*N*/ 	if( pH && pH->IsActive() && !pH->GetHeaderFmt() )
>-/*N*/ 	{	//Hat er keinen, mach ich ihm einen
>-/*N*/ 		SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_HEADER );
>-/*N*/ 		pFmt->Add( pH );
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	if( pF && pF->IsActive() && !pF->GetFooterFmt() )
>-/*N*/ 	{	//Hat er keinen, mach ich ihm einen
>-/*N*/ 		SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_FOOTER );
>-/*N*/ 		pFmt->Add( pF );
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	// MIB 24.3.98: Modify der Basisklasse muss immer gerufen werden, z.B.
>-/*N*/ 	// wegen RESET_FMTWRITTEN.
>-/*N*/ //	if ( GetDepends() )
>-/*N*/ 		SwFmt::Modify( pOld, pNew );
>-/*N*/ }
>+//  Implementierung teilweise inline im hxx
>+
>+void SwFrmFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
>+{
>+    SwFmtHeader *pH = 0;
>+    SwFmtFooter *pF = 0;
>+
>+    sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
>+
>+    if( RES_ATTRSET_CHG == nWhich )
>+    {
>+        ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
>+            RES_HEADER, sal_False, (const SfxPoolItem**)&pH );
>+        ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
>+            RES_FOOTER, sal_False, (const SfxPoolItem**)&pF );
>+    }
>+    else if( RES_HEADER == nWhich )
>+        pH = (SwFmtHeader*)pNew;
>+    else if( RES_FOOTER == nWhich )
>+        pF = (SwFmtFooter*)pNew;
>+
>+    if( pH && pH->IsActive() && !pH->GetHeaderFmt() )
>+    {   //Hat er keinen, mach ich ihm einen
>+        SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_HEADER );
>+        pFmt->Add( pH );
>+    }
>+
>+    if( pF && pF->IsActive() && !pF->GetFooterFmt() )
>+    {   //Hat er keinen, mach ich ihm einen
>+        SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_FOOTER );
>+        pFmt->Add( pF );
>+    }
>+
>+    // MIB 24.3.98: Modify der Basisklasse muss immer gerufen werden, z.B.
>+    // wegen RESET_FMTWRITTEN.
>+    // if ( GetDepends() )
>+    SwFmt::Modify( pOld, pNew );
>+}
> 
> //Vernichtet alle Frms, die in aDepend angemeldet sind.
> 
>-/*N*/ void SwFrmFmt::DelFrms()
>-/*N*/ {
>-/*N*/ 	SwClientIter aIter( *this );
>-/*N*/ 	SwClient * pLast = aIter.GoStart();
>-/*N*/ 	if( pLast )
>-/*N*/ 		do {
>-/*N*/ 			if ( pLast->ISA(SwFrm) )
>-/*N*/ 			{
>-/*N*/ 				((SwFrm*)pLast)->Cut();
>-/*N*/ 				delete pLast;
>-/*N*/ 			}
>-/*N*/ 		} while( 0 != ( pLast = aIter++ ));
>-/*N*/ }
>+void SwFrmFmt::DelFrms()
>+{
>+    SwClientIter aIter( *this );
>+    SwClient * pLast = aIter.GoStart();
>+    if( pLast )
>+        do {
>+            if ( pLast->ISA(SwFrm) )
>+            {
>+                ((SwFrm*)pLast)->Cut();
>+                delete pLast;
>+            }
>+        } while( 0 != ( pLast = aIter++ ));
>+}
> 
> void SwFrmFmt::MakeFrms()
> {
>@@ -2459,105 +2459,105 @@ void SwFrmFmt::MakeFrms()
> 
> 
> 
>-/*N*/ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
>-/*N*/ 								 const sal_Bool bCalcFrm ) const
>-/*N*/ {
>-/*N*/ 	SwRect aRet;
>-/*N*/ 	SwFrm *pFrm = 0;
>-/*N*/ 	if( ISA( SwSectionFmt ) )
>-/*N*/ 	{
>-/*?*/ 		// dann den ::com::sun::star::frame::Frame per Node2Layout besorgen
>-/*?*/ 		SwSectionNode* pSectNd = ((SwSectionFmt*)this)->GetSectionNode();
>-/*?*/ 		if( pSectNd )
>-/*?*/ 		{
>-/*?*/ 			SwNode2Layout aTmp( *pSectNd, pSectNd->GetIndex() - 1 );
>-/*?*/ 			pFrm = aTmp.NextFrm();
>-/*?*/
>-/*?*/ 			if( pFrm && pFrm->GetRegisteredIn() != this )
>-/*?*/ 			{
>-/*?*/ 				// die Section hat keinen eigenen ::com::sun::star::frame::Frame, also falls
>-/*?*/ 				// jemand die tatsaechliche Groeáe braucht, so muss das
>-/*?*/ 				// noch implementier werden, in dem sich vom Ende noch
>-/*?*/ 				// der entsprechende ::com::sun::star::frame::Frame besorgt wird.
>-/*?*/ 				// PROBLEM: was passiert bei SectionFrames, die auf unter-
>-/*?*/ 				//			schiedlichen Seiten stehen??
>-/*?*/ 				if( bPrtArea )
>-/*?*/ 					aRet = pFrm->Prt();
>-/*?*/ 				else
>-/*?*/ 				{
>-/*?*/ 					aRet = pFrm->Frm();
>-/*?*/ 					--aRet.Pos().Y();
>-/*?*/ 				}
>-/*?*/ 				pFrm = 0;		// das Rect ist ja jetzt fertig
>-/*?*/ 			}
>-/*?*/ 		}
>-/*N*/ 	}
>-/*N*/ 	else
>-/*N*/ 	{
>-/*N*/ 		sal_uInt16 nFrmType = RES_FLYFRMFMT == Which() ? FRM_FLY : USHRT_MAX;
>-/*N*/ 		pFrm = ::binfilter::GetFrmOfModify( *(SwModify*)this, nFrmType, pPoint,
>-/*N*/ 									0, bCalcFrm );
>-/*N*/ 	}
>-/*N*/
>-/*N*/ 	if( pFrm )
>-/*N*/ 	{
>-/*N*/ 		if( bPrtArea )
>-/*N*/ 			aRet = pFrm->Prt();
>-/*N*/ 		else
>-/*?*/ 			aRet = pFrm->Frm();
>-/*N*/ 	}
>-/*N*/ 	return aRet;
>-/*N*/ }
>-
>-/*N*/ SwContact* SwFrmFmt::FindContactObj()
>-/*N*/ {
>-/*N*/ 	SwClientIter aIter( *this );
>-/*N*/ 	return (SwContact*)aIter.First( TYPE( SwContact ) );
>-/*N*/ }
>-
>-/*N*/ SdrObject* SwFrmFmt::FindSdrObject()
>-/*N*/ {
>-/*N*/ 	SwClientIter aIter( *this );
>-/*N*/ 	SwClient* pFnd = aIter.First( TYPE( SwContact ) );
>-/*N*/ 	return pFnd ? ((SwContact*)pFnd)->GetMaster() : 0;
>-/*N*/ }
>-
>-/*N*/ SdrObject* SwFrmFmt::FindRealSdrObject()
>-/*N*/ {
>-/*N*/ 	if( RES_FLYFRMFMT == Which() )
>-/*N*/ 	{
>-/*N*/ 		Point aNullPt;
>-/*N*/ 		SwFlyFrm* pFly = (SwFlyFrm*)::binfilter::GetFrmOfModify( *this, FRM_FLY,
>-/*N*/ 													&aNullPt, 0, sal_False );
>-/*N*/ 		return pFly ? pFly->GetVirtDrawObj() : 0;
>-/*N*/ 	}
>-/*?*/ 	return FindSdrObject();
>-/*N*/ }
>-
>-
>-
>-//	class SwFlyFrmFmt
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ SwFlyFrmFmt::~SwFlyFrmFmt()
>-/*N*/ {
>-/*N*/ 	SwClientIter aIter( *this );
>-/*N*/ 	SwClient * pLast = aIter.GoStart();
>-/*N*/ 	if( pLast )
>-/*N*/ 		do {
>-/*N*/ 			if ( pLast->ISA( SwFlyFrm ) )
>-/*?*/ 				delete pLast;
>-/*N*/
>-/*N*/ 		} while( 0 != ( pLast = aIter++ ));
>-/*N*/
>-/*N*/ 	pLast = aIter.GoStart();
>-/*N*/ 	if( pLast )
>-/*N*/ 		do {
>-/*N*/ 			if ( pLast->ISA( SwFlyDrawContact ) )
>-/*N*/ 				delete pLast;
>-/*N*/
>-/*N*/ 		} while( 0 != ( pLast = aIter++ ));
>-/*N*/ }
>+SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
>+                                 const sal_Bool bCalcFrm ) const
>+{
>+    SwRect aRet;
>+    SwFrm *pFrm = 0;
>+    if( ISA( SwSectionFmt ) )
>+    {
>+        // dann den ::com::sun::star::frame::Frame per Node2Layout besorgen
>+        SwSectionNode* pSectNd = ((SwSectionFmt*)this)->GetSectionNode();
>+        if( pSectNd )
>+        {
>+            SwNode2Layout aTmp( *pSectNd, pSectNd->GetIndex() - 1 );
>+            pFrm = aTmp.NextFrm();
>+
>+            if( pFrm && pFrm->GetRegisteredIn() != this )
>+            {
>+                // die Section hat keinen eigenen ::com::sun::star::frame::Frame, also falls
>+                // jemand die tatsaechliche Groeáe braucht, so muss das
>+                // noch implementier werden, in dem sich vom Ende noch
>+                // der entsprechende ::com::sun::star::frame::Frame besorgt wird.
>+                // PROBLEM: was passiert bei SectionFrames, die auf unter-
>+                //          schiedlichen Seiten stehen??
>+                if( bPrtArea )
>+                    aRet = pFrm->Prt();
>+                else
>+                {
>+                    aRet = pFrm->Frm();
>+                    --aRet.Pos().Y();
>+                }
>+                pFrm = 0;       // das Rect ist ja jetzt fertig
>+            }
>+        }
>+    }
>+    else
>+    {
>+        sal_uInt16 nFrmType = RES_FLYFRMFMT == Which() ? FRM_FLY : USHRT_MAX;
>+        pFrm = ::binfilter::GetFrmOfModify( *(SwModify*)this, nFrmType, pPoint,
>+                                            0, bCalcFrm );
>+    }
>+
>+    if( pFrm )
>+    {
>+        if( bPrtArea )
>+            aRet = pFrm->Prt();
>+        else
>+            aRet = pFrm->Frm();
>+    }
>+    return aRet;
>+}
>+
>+SwContact* SwFrmFmt::FindContactObj()
>+{
>+    SwClientIter aIter( *this );
>+    return (SwContact*)aIter.First( TYPE( SwContact ) );
>+}
>+
>+SdrObject* SwFrmFmt::FindSdrObject()
>+{
>+    SwClientIter aIter( *this );
>+    SwClient* pFnd = aIter.First( TYPE( SwContact ) );
>+    return pFnd ? ((SwContact*)pFnd)->GetMaster() : 0;
>+}
>+
>+SdrObject* SwFrmFmt::FindRealSdrObject()
>+{
>+    if( RES_FLYFRMFMT == Which() )
>+    {
>+        Point aNullPt;
>+        SwFlyFrm* pFly = (SwFlyFrm*)::binfilter::GetFrmOfModify( *this, FRM_FLY,
>+                                                                 &aNullPt, 0, sal_False );
>+        return pFly ? pFly->GetVirtDrawObj() : 0;
>+    }
>+    return FindSdrObject();
>+}
>+
>+
>+
>+//  class SwFlyFrmFmt
>+//  Implementierung teilweise inline im hxx
>+
>+SwFlyFrmFmt::~SwFlyFrmFmt()
>+{
>+    SwClientIter aIter( *this );
>+    SwClient * pLast = aIter.GoStart();
>+    if( pLast )
>+        do {
>+            if ( pLast->ISA( SwFlyFrm ) )
>+                delete pLast;
>+
>+        } while( 0 != ( pLast = aIter++ ));
>+
>+    pLast = aIter.GoStart();
>+    if( pLast )
>+        do {
>+            if ( pLast->ISA( SwFlyDrawContact ) )
>+                delete pLast;
>+
>+        } while( 0 != ( pLast = aIter++ ));
>+}
> 
> //Erzeugen der Frms wenn das Format einen Absatzgebundenen Rahmen beschreibt.
> //MA: 14. Feb. 94, Erzeugen der Frms auch fuer Seitengebundene Rahmen.
>@@ -2611,42 +2611,42 @@ void SwFlyFrmFmt::MakeFrms()
>         break;
> 
>     case FLY_PAGE:
>+    {
>+        sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
>+        SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetRootFrm()->Lower();
>+        if( !nPgNum && aAnchorAttr.GetCntntAnchor() )
>         {
>-            sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
>-            SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetRootFrm()->Lower();
>-            if( !nPgNum && aAnchorAttr.GetCntntAnchor() )
>+            SwCntntNode *pCNd =
>+                aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
>+            SwClientIter aIter( *pCNd );
>+            do
>             {
>-                SwCntntNode *pCNd =
>-                    aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
>-                SwClientIter aIter( *pCNd );
>-                do
>+                if( aIter()->ISA( SwFrm ) )
>                 {
>-                    if( aIter()->ISA( SwFrm ) )
>+                    pPage = ((SwFrm*)aIter())->FindPageFrm();
>+                    if( pPage )
>                     {
>-                        pPage = ((SwFrm*)aIter())->FindPageFrm();
>-                        if( pPage )
>-                        {
>-                            nPgNum = pPage->GetPhyPageNum();
>-                            // OD 24.07.2003 #111032# - update anchor attribute
>-                            aAnchorAttr.SetPageNum( nPgNum );
>-                            aAnchorAttr.SetAnchor( 0 );
>-                            SetAttr( aAnchorAttr );
>-                        }
>-                        break;
>+                        nPgNum = pPage->GetPhyPageNum();
>+                        // OD 24.07.2003 #111032# - update anchor attribute
>+                        aAnchorAttr.SetPageNum( nPgNum );
>+                        aAnchorAttr.SetAnchor( 0 );
>+                        SetAttr( aAnchorAttr );
>                     }
>-                } while ( aIter++ );
>-            }
>-            while ( pPage )
>-            {
>-                if ( pPage->GetPhyPageNum() == nPgNum )
>-                {
>-                    pPage->PlaceFly( 0, this, &aAnchorAttr );
>                     break;
>                 }
>-                pPage = (SwPageFrm*)pPage->GetNext();
>+            } while ( aIter++ );
>+        }
>+        while ( pPage )
>+        {
>+            if ( pPage->GetPhyPageNum() == nPgNum )
>+            {
>+                pPage->PlaceFly( 0, this, &aAnchorAttr );
>+                break;
>             }
>+            pPage = (SwPageFrm*)pPage->GetNext();
>         }
>-        break;
>+    }
>+    break;
>     }
> 
>     if( pModify )
>@@ -2657,7 +2657,7 @@ void SwFlyFrmFmt::MakeFrms()
>              pFrm = (SwFrm*)aIter.Next() )
>         {
>             FASTBOOL bAdd = !pFrm->IsCntntFrm() ||
>-                            !((SwCntntFrm*)pFrm)->IsFollow();
>+                !((SwCntntFrm*)pFrm)->IsFollow();
> 
>             if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
>                 pFrm = pFrm->FindFlyFrm();
>@@ -2708,28 +2708,28 @@ void SwFlyFrmFmt::MakeFrms()
>     }
> }
> 
>-/*N*/ SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const sal_Bool bCalcFrm ) const
>-/*N*/ {
>-/*N*/ 	return (SwFlyFrm*)::binfilter::GetFrmOfModify( *(SwModify*)this, FRM_FLY,
>-/*N*/ 											pPoint, 0, bCalcFrm );
>-/*N*/ }
>-
>-/*N*/ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
>-/*N*/ {
>-/*N*/ 	switch( rInfo.Which() )
>-/*N*/ 	{
>-/*N*/ 	case RES_CONTENT_VISIBLE:
>-/*?*/ 		{
>-/*?*/ 			((SwPtrMsgPoolItem&)rInfo).pObject =
>-/*?*/ 				SwClientIter( *(SwFlyFrmFmt*)this ).First( TYPE(SwFrm) );
>-/*?*/ 		}
>-/*?*/ 		return sal_False;
>-/*N*/
>-/*N*/ 	default:
>-/*N*/ 		return SwFrmFmt::GetInfo( rInfo );
>-/*N*/ 	}
>-/*N*/ 	return sal_True;
>-/*N*/ }
>+SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const sal_Bool bCalcFrm ) const
>+{
>+    return (SwFlyFrm*)::binfilter::GetFrmOfModify( *(SwModify*)this, FRM_FLY,
>+                                                   pPoint, 0, bCalcFrm );
>+}
>+
>+sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
>+{
>+    switch( rInfo.Which() )
>+    {
>+    case RES_CONTENT_VISIBLE:
>+    {
>+        ((SwPtrMsgPoolItem&)rInfo).pObject =
>+            SwClientIter( *(SwFlyFrmFmt*)this ).First( TYPE(SwFrm) );
>+    }
>+    return sal_False;
>+
>+    default:
>+        return SwFrmFmt::GetInfo( rInfo );
>+    }
>+    return sal_True;
>+}
> 
> /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
> 
>@@ -2742,33 +2742,33 @@ void SwFlyFrmFmt::MakeFrms()
>     @return true, if background color is transparent, but not "no fill"
>     or the transparency of a existing background graphic is set.
> */
>-/*M*/ sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
>-/*M*/ {
>-/*M*/     sal_Bool bReturn = sal_False;
>-/*M*/
>-/*N*/     /// NOTE: If background color is "no fill"/"auto fill" (COL_TRANSPARENT)
>-/*N*/     ///     and there is no background graphic, it "inherites" the background
>-/*N*/     ///     from its anchor.
>-/*M*/     if ( (GetBackground().GetColor().GetTransparency() != 0) &&
>-/*M*/          (GetBackground().GetColor() != COL_TRANSPARENT)
>-/*M*/        )
>-/*M*/     {
>-/*M*/         bReturn = sal_True;
>-/*M*/     }
>-/*M*/     else
>-/*M*/     {
>-/*N*/         const BfGraphicObject* pTmpGrf =
>-/*N*/                 static_cast<const BfGraphicObject*>(GetBackground().GetGraphicObject());
>-/*M*/         if ( (pTmpGrf) &&
>-/*M*/              (pTmpGrf->GetAttr().GetTransparency() != 0)
>-/*M*/            )
>-/*M*/         {
>-/*M*/             bReturn = sal_True;
>-/*M*/         }
>-/*M*/     }
>-/*M*/
>-/*M*/     return bReturn;
>-/*M*/ }
>+sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
>+{
>+    sal_Bool bReturn = sal_False;
>+
>+    /// NOTE: If background color is "no fill"/"auto fill" (COL_TRANSPARENT)
>+    ///     and there is no background graphic, it "inherites" the background
>+    ///     from its anchor.
>+    if ( (GetBackground().GetColor().GetTransparency() != 0) &&
>+         (GetBackground().GetColor() != COL_TRANSPARENT)
>+        )
>+    {
>+        bReturn = sal_True;
>+    }
>+    else
>+    {
>+        const BfGraphicObject* pTmpGrf =
>+            static_cast<const BfGraphicObject*>(GetBackground().GetGraphicObject());
>+        if ( (pTmpGrf) &&
>+             (pTmpGrf->GetAttr().GetTransparency() != 0)
>+            )
>+        {
>+            bReturn = sal_True;
>+        }
>+    }
>+
>+    return bReturn;
>+}
> 
> /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
> 
>@@ -2784,37 +2784,35 @@ void SwFlyFrmFmt::MakeFrms()
> */
> 
> 
>-//	class SwDrawFrmFmt
>-//	Implementierung teilweise inline im hxx
>-
>-/*N*/ #ifdef _MSC_VER
>-/*N*/ #pragma optimize( "e", off )
>-/*N*/ #endif
>+//  class SwDrawFrmFmt
>+//  Implementierung teilweise inline im hxx
> 
>-/*N*/ SwDrawFrmFmt::~SwDrawFrmFmt()
>-/*N*/ {
>-/*N*/ 	SwContact *pContact = FindContactObj();
>-/*N*/ 	delete pContact;
>-/*N*/ }
>-
>-/*N*/ #ifdef _MSC_VER
>-/*N*/ #pragma optimize( "e", on )
>-/*N*/ #endif
>+#ifdef _MSC_VER
>+#pragma optimize( "e", off )
>+#endif
> 
>-/*N*/ void SwDrawFrmFmt::MakeFrms()
>-/*N*/ {
>-/*N*/ 	SwDrawContact *pContact = (SwDrawContact*)FindContactObj();
>-/*N*/     if ( pContact )
>-/*N*/          pContact->ConnectToLayout();
>-/*N*/ }
>+SwDrawFrmFmt::~SwDrawFrmFmt()
>+{
>+    SwContact *pContact = FindContactObj();
>+    delete pContact;
>+}
> 
>-/*N*/ void SwDrawFrmFmt::DelFrms()
>-/*N*/ {
>-/*N*/ 	SwDrawContact *pContact = (SwDrawContact *)FindContactObj();
>-/*N*/ 	if ( pContact ) //fuer den Reader und andere Unabwaegbarkeiten.
>-/*N*/ 		pContact->DisconnectFromLayout();
>-/*N*/ }
>+#ifdef _MSC_VER
>+#pragma optimize( "e", on )
>+#endif
> 
>+void SwDrawFrmFmt::MakeFrms()
>+{
>+    SwDrawContact *pContact = (SwDrawContact*)FindContactObj();
>+    if ( pContact )
>+        pContact->ConnectToLayout();
>+}
> 
>+void SwDrawFrmFmt::DelFrms()
>+{
>+    SwDrawContact *pContact = (SwDrawContact *)FindContactObj();
>+    if ( pContact ) //fuer den Reader und andere Unabwaegbarkeiten.
>+        pContact->DisconnectFromLayout();
>+}
> 
> }
>diff --git a/binfilter/bf_sw/source/core/para/sw_paratr.cxx b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
>index e008cd4..71d3cc6 100644
>--- a/binfilter/bf_sw/source/core/para/sw_paratr.cxx
>+++ b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
>@@ -178,7 +178,7 @@ using namespace ::com::sun::star;
> 
> 
> 
>-/*N*/ sal_Bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
>+/*N*/ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
> /*N*/ {
> /*N*/ 	switch(nMemberId&~CONVERT_TWIPS)
> /*N*/ 	{
>@@ -207,38 +207,38 @@ using namespace ::com::sun::star;
> /*N*/ 		}
> /*N*/ 		break;
> /*N*/ 	}
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
>-/*N*/ sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
>+/*N*/ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
> /*N*/ {
> /*N*/ 	switch(nMemberId&~CONVERT_TWIPS)
> /*N*/ 	{
>-/*N*/         case MID_DROPCAP_LINES :
>-/*N*/         {
>-/*N*/             sal_Int8 nTemp;
>-/*N*/             rVal >>= nTemp;
>-/*N*/             if(nTemp >=1 && nTemp < 0x7f)
>-/*N*/                 nLines = (BYTE)nTemp;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/         case MID_DROPCAP_COUNT :
>-/*N*/         {
>-/*N*/             sal_Int16 nTemp;
>-/*N*/             rVal >>= nTemp;
>-/*N*/             if(nTemp >=1 && nTemp < 0x7f)
>-/*N*/                 nChars = (BYTE)nTemp;
>-/*N*/         }
>-/*N*/         break;
>-/*N*/         case MID_DROPCAP_DISTANCE :
>-/*N*/         {
>-/*N*/             sal_Int16 nVal;
>-/*N*/             if ( rVal >>= nVal )
>-/*N*/                 nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal);
>-/*N*/             else
>-/*N*/                 return sal_False;
>-/*N*/             break;
>-/*N*/         }
>+/*N*/       case MID_DROPCAP_LINES :
>+/*N*/       {
>+/*N*/           sal_Int8 nTemp;
>+/*N*/           rVal >>= nTemp;
>+/*N*/           if(nTemp >=1 && nTemp < 0x7f)
>+/*N*/               nLines = (BYTE)nTemp;
>+/*N*/       }
>+/*N*/       break;
>+/*N*/       case MID_DROPCAP_COUNT :
>+/*N*/       {
>+/*N*/           sal_Int16 nTemp;
>+/*N*/           rVal >>= nTemp;
>+/*N*/           if(nTemp >=1 && nTemp < 0x7f)
>+/*N*/               nChars = (BYTE)nTemp;
>+/*N*/       }
>+/*N*/       break;
>+/*N*/       case MID_DROPCAP_DISTANCE :
>+/*N*/       {
>+/*N*/           sal_Int16 nVal;
>+/*N*/           if ( rVal >>= nVal )
>+/*N*/               nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal);
>+/*N*/           else
>+/*N*/               return sal_False;
>+/*N*/           break;
>+/*N*/       }
> /*N*/ 		case MID_DROPCAP_FORMAT:
> /*N*/ 		{
> /*N*/ 			if(rVal.getValueType()  == ::getCppuType((const style::DropCapFormat*)0))
>@@ -260,7 +260,7 @@ using namespace ::com::sun::star;
> /*N*/ 			DBG_ERROR("char format cannot be set in PutValue()!");
> /*N*/ 		break;
> /*N*/ 	}
>-/*N*/ 	return sal_True;
>+/*N*/ 	return true;
> /*N*/ }
> 
> // class SwRegisterItem -------------------------------------------------
>@@ -279,21 +279,21 @@ using namespace ::com::sun::star;
> /* -----------------------------27.06.00 11:05--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-/*N*/ BOOL    SwNumRuleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwNumRuleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	::rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), GET_POOLID_NUMRULE );
> /*N*/ 	rVal <<= sRet;
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> /* -----------------------------27.06.00 11:05--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-/*N*/ BOOL	SwNumRuleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+/*N*/ bool SwNumRuleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> /*N*/ {
> /*N*/ 	::rtl::OUString uName;
> /*N*/ 	rVal >>= uName;
> /*N*/ 	SetValue(SwStyleNameMapper::GetUIName(uName, GET_POOLID_NUMRULE));
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> /* -----------------19.05.2003 10:44-----------------
> 
>diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
>index d76f7ec..3afa76d 100644
>--- a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
>+++ b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
>@@ -138,13 +138,13 @@ using namespace ::rtl;
> /*N*/ {
> /*N*/ 	return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : FALSE;
> /*N*/ }
>-/*N*/ BOOL SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
> /*N*/ 	String sCharFmtName;
> /*N*/ 	if(GetCharFmt())
> /*N*/ 		SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName,  GET_POOLID_CHRFMT, sal_True );
> /*N*/ 	rVal <<= OUString( sCharFmtName );
>-/*N*/ 	return TRUE;
>+/*N*/ 	return true;
> /*N*/ }
> 
> /*************************************************************************
>@@ -282,9 +282,9 @@ using namespace ::rtl;
> 
> 
> 
>-/*N*/ BOOL SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> /*N*/ {
>-/*N*/ 	BOOL bRet = TRUE;
>+/*N*/ 	bool bRet = true;
> /*N*/ 	XubString sVal;
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	switch(nMemberId)
>@@ -319,23 +319,23 @@ using namespace ::rtl;
> /*N*/ 				new SwHyperlinkEventDescriptor();
> /*N*/ 			pEvents->copyMacrosFromINetFmt(*this);
> /*N*/ 			uno::Reference<container::XNameReplace> xNameReplace(pEvents);
>-/*N*/ 
>+/*N*/
> /*N*/ 			// all others return a string; so we just set rVal here and exit
> /*N*/ 			rVal <<= xNameReplace;
> /*N*/ 			return bRet;
> /*N*/ 		}
> /*N*/ 		break;
> /*N*/ 		default:
>-/*N*/ 			bRet = FALSE;
>+/*N*/ 			bRet = false;
> /*N*/ 	}
> /*N*/ 	rVal <<= OUString(sVal);
> /*N*/ 	return bRet;
> /*N*/ }
>-/*N*/ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>+/*N*/ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
> /*N*/ {
>-/*N*/ 	BOOL bRet = TRUE;
>+/*N*/ 	bool bRet = TRUE;
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
>-/*N*/ 
>+/*N*/
> /*N*/ 	// all properties except HyperlinkEvents are of type string, hence
> /*N*/ 	// we treat HyperlinkEvents specially
> /*N*/ 	if (MID_URL_HYPERLINKEVENTS == nMemberId)
>@@ -355,14 +355,14 @@ using namespace ::rtl;
> /*?*/ 		else
> /*?*/ 		{
> /*?*/ 			// wrong type!
>-/*?*/ 			bRet = FALSE;
>+/*?*/ 			bRet = false;
> /*?*/ 		}
> /*N*/ 	}
> /*N*/ 	else
> /*N*/ 	{
> /*N*/ 		// all string properties:
> /*N*/ 		if(rVal.getValueType() != ::getCppuType((::rtl::OUString*)0))
>-/*N*/ 			return FALSE;
>+/*N*/ 			return false;
> /*N*/ 		XubString sVal = *(::rtl::OUString*)rVal.getValue();
> /*N*/ 		switch(nMemberId)
> /*N*/ 		{
>@@ -393,7 +393,7 @@ using namespace ::rtl;
> /*?*/ 			}
> /*?*/ 			break;
> /*?*/ 			default:
>-/*?*/ 				bRet = FALSE;
>+/*?*/ 				bRet = false;
> /*N*/ 		}
> /*N*/ 	}
> /*N*/ 	return bRet;
>@@ -453,10 +453,10 @@ SfxPoolItem* SwFmtRuby::Clone( SfxItemPool* ) const
>     return new SwFmtRuby( *this );
> }
> 
>-BOOL SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
>+bool SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch( nMemberId )
>     {
>@@ -476,14 +476,14 @@ BOOL SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
>         }
>         break;
>         default:
>-            bRet = FALSE;
>+            bRet = false;
>     }
>     return bRet;
> }
>-/*N*/ BOOL SwFmtRuby::PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*N*/ bool SwFmtRuby::PutValue( const ::com::sun::star::uno::Any& rVal,
> /*N*/ 							BYTE nMemberId  )
> /*N*/ {
>-/*N*/ 	BOOL bRet = TRUE;
>+/*N*/ 	bool bRet = TRUE;
> /*N*/     nMemberId &= ~CONVERT_TWIPS;
> /*N*/ 	switch( nMemberId )
> /*N*/ 	{
>@@ -514,7 +514,7 @@ BOOL SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/         }
> /*N*/         break;
> /*N*/         case MID_RUBY_CHARSTYLE:
>-/*N*/         {    
>+/*N*/         {
> /*N*/             OUString sTmp;
> /*N*/             bRet = rVal >>= sTmp;
> /*N*/             if(bRet)
>@@ -522,7 +522,7 @@ BOOL SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
> /*N*/         }
> /*N*/         break;
> /*N*/ 		default:
>-/*N*/ 			bRet = FALSE;
>+/*N*/           bRet = false;
> /*N*/ 	}
> /*N*/ 	return bRet;
> /*N*/ }
>diff --git a/binfilter/bf_sw/source/ui/inc/uiitems.hxx b/binfilter/bf_sw/source/ui/inc/uiitems.hxx
>index 4969957..5fffd6b 100644
>--- a/binfilter/bf_sw/source/ui/inc/uiitems.hxx
>+++ b/binfilter/bf_sw/source/ui/inc/uiitems.hxx
>@@ -53,8 +53,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>     virtual int             operator==( const SfxPoolItem& ) const;
> 
>-    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 );
>+    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 );
> 
>     SwPageFtnInfo& GetPageFtnInfo()             { return aFtnInfo; }
>     const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; }
>diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
>index 0d3ee2a..381f051 100644
>--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
>+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
>@@ -92,9 +92,9 @@ static const USHORT __FAR_DATA nFtnLines[] = {
> /* -----------------------------26.04.01 12:25--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-/*N*/ BOOL SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>+/*N*/ bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
> /*N*/ {
>-/*N*/     sal_Bool bRet = sal_True;
>+/*N*/     bool bRet = true;
> /*N*/     switch(nMemberId & ~CONVERT_TWIPS)
> /*N*/     {
> /*N*/         case MID_FTN_HEIGHT        :     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetHeight());break;
>@@ -111,17 +111,17 @@ static const USHORT __FAR_DATA nFtnLines[] = {
> /*N*/         case MID_LINE_TEXT_DIST    :     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetTopDist());break;
> /*N*/         case MID_LINE_FOOTNOTE_DIST:     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetBottomDist());break;
> /*N*/         default:
>-/*N*/             bRet = sal_False;
>+/*N*/             bRet = false;
> /*N*/     }
> /*N*/     return bRet;
> /*N*/ }
> /* -----------------------------26.04.01 12:26--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-/*N*/ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>+/*N*/ bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
> /*N*/ {
> /*N*/     sal_Int32 nSet32;
>-/*N*/     sal_Bool bRet = sal_True;
>+/*N*/     bool bRet = true;
> /*N*/     switch(nMemberId  & ~CONVERT_TWIPS)
> /*N*/     {
> /*N*/         case MID_LINE_COLOR        :
>@@ -151,14 +151,14 @@ static const USHORT __FAR_DATA nFtnLines[] = {
> /*N*/             if(nSet >= 0)
> /*N*/                 aFtnInfo.SetLineWidth(MM100_TO_TWIP(nSet));
> /*N*/             else
>-/*N*/                 bRet = sal_False;
>+/*N*/                 bRet = false;
> /*N*/         }
> /*N*/         break;
> /*N*/         case MID_LINE_RELWIDTH     :
> /*N*/         {
> /*N*/             sal_Int8 nSet; rVal >>= nSet;
> /*N*/             if(nSet < 0)
>-/*N*/                 bRet = sal_False;
>+/*N*/                 bRet = false;
> /*N*/             else
> /*N*/                 aFtnInfo.SetWidth(Fraction(nSet, 100));
> /*N*/         }
>@@ -169,11 +169,11 @@ static const USHORT __FAR_DATA nFtnLines[] = {
> /*N*/             if(nSet >= 0 && nSet < 3) //com::sun::star::text::HorizontalAdjust
> /*N*/                 aFtnInfo.SetAdj((SwFtnAdj)nSet);
> /*N*/             else
>-/*N*/                 bRet = sal_False;
>+/*N*/                 bRet = false;
> /*N*/         }
> /*N*/         break;
> /*N*/         default:
>-/*N*/             bRet = sal_False;
>+/*N*/             bRet = false;
> /*N*/     }
> /*N*/     return bRet;
> /*N*/ }
>diff --git a/binfilter/inc/bf_sc/attrib.hxx b/binfilter/inc/bf_sc/attrib.hxx
>index 297fd6c..60c758a 100644
>--- a/binfilter/inc/bf_sc/attrib.hxx
>+++ b/binfilter/inc/bf_sc/attrib.hxx
>@@ -132,8 +132,8 @@ public:
>     virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
>     virtual SvStream&       Store( SvStream& rStream, USHORT nVer ) const;
> 
>-    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 );
>+    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 );
> 
>             BOOL            GetProtection() const { return bProtection; }
>             BOOL            GetHideFormula() const { return bHideFormula; }
>@@ -269,8 +269,8 @@ public:
> 
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
>-    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 );
>+    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 );
> 
>     const EditTextObject* GetLeftArea() const		{ return pLeftArea; }
>     const EditTextObject* GetCenterArea() const		{ return pCenterArea; }
>diff --git a/binfilter/inc/bf_sfx2/srchitem.hxx b/binfilter/inc/bf_sfx2/srchitem.hxx
>index d141533..e6bf949 100644
>--- a/binfilter/inc/bf_sfx2/srchitem.hxx
>+++ b/binfilter/inc/bf_sfx2/srchitem.hxx
>@@ -114,8 +114,8 @@ public:
>     SvxSearchItem( const SvxSearchItem& rItem );
>     virtual ~SvxSearchItem();
> 
>-    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 );
>     virtual int 			 operator == ( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>diff --git a/binfilter/inc/bf_svtools/bintitem.hxx b/binfilter/inc/bf_svtools/bintitem.hxx
>index 44e39b6..ae045cf 100644
>--- a/binfilter/inc/bf_svtools/bintitem.hxx
>+++ b/binfilter/inc/bf_svtools/bintitem.hxx
>@@ -79,9 +79,9 @@ public:
>     virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
>     virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
> 
>-    virtual	BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 );
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> 
>     virtual SfxFieldUnit GetUnit() const;	 // FUNIT_NONE
>diff --git a/binfilter/inc/bf_svtools/cenumitm.hxx b/binfilter/inc/bf_svtools/cenumitm.hxx
>index 56583dc..b1f3aaf 100644
>--- a/binfilter/inc/bf_svtools/cenumitm.hxx
>+++ b/binfilter/inc/bf_svtools/cenumitm.hxx
>@@ -60,9 +60,9 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any & rVal, BYTE = 0) const;
>+    virtual	bool QueryValue(::com::sun::star::uno::Any & rVal, BYTE = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any & rVal, BYTE = 0);
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any & rVal, BYTE = 0);
> 
>     virtual USHORT GetValueCount() const = 0;
> 
>@@ -160,9 +160,9 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal, BYTE = 0) const;
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal, BYTE = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal, BYTE = 0);
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal, BYTE = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
> 
>diff --git a/binfilter/inc/bf_svtools/cintitem.hxx b/binfilter/inc/bf_svtools/cintitem.hxx
>index c2f1f89..8a1755c 100644
>--- a/binfilter/inc/bf_svtools/cintitem.hxx
>+++ b/binfilter/inc/bf_svtools/cintitem.hxx
>@@ -68,10 +68,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -130,10 +130,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -192,10 +192,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -254,10 +254,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/binfilter/inc/bf_svtools/cntwall.hxx b/binfilter/inc/bf_svtools/cntwall.hxx
>index f370a4a..735e642 100644
>--- a/binfilter/inc/bf_svtools/cntwall.hxx
>+++ b/binfilter/inc/bf_svtools/cntwall.hxx
>@@ -66,9 +66,9 @@ public:
>     virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
> 
>-    virtual	BOOL 			QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool 			QueryValue( ::com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool 			PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 );
> 
>     void					SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
>diff --git a/binfilter/inc/bf_svtools/cstitem.hxx b/binfilter/inc/bf_svtools/cstitem.hxx
>index 8c9b84f..3d01577 100644
>--- a/binfilter/inc/bf_svtools/cstitem.hxx
>+++ b/binfilter/inc/bf_svtools/cstitem.hxx
>@@ -84,9 +84,9 @@ public:
>     CrawlStatus				GetStatus() const { return eStatus; }
>     void					SetStatus(CrawlStatus eNew) { eStatus = eNew; }
> 
>-    virtual	BOOL PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 );
>-    virtual	BOOL QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/binfilter/inc/bf_svtools/ctypeitm.hxx b/binfilter/inc/bf_svtools/ctypeitm.hxx
>index 04fae62..3ef78c2 100644
>--- a/binfilter/inc/bf_svtools/ctypeitm.hxx
>+++ b/binfilter/inc/bf_svtools/ctypeitm.hxx
>@@ -72,9 +72,9 @@ public:
>                                                  XubString &rText,
>                                                  const ::IntlWrapper* pIntlWrapper = 0 ) const;
> 
>-    virtual	BOOL QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
>-    virtual	BOOL PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0);
> 
>     INetContentType GetEnumValue() const;
>diff --git a/binfilter/inc/bf_svtools/custritm.hxx b/binfilter/inc/bf_svtools/custritm.hxx
>index 58d50ba..3dc0f19 100644
>--- a/binfilter/inc/bf_svtools/custritm.hxx
>+++ b/binfilter/inc/bf_svtools/custritm.hxx
>@@ -74,10 +74,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(::com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const ::com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
>diff --git a/binfilter/inc/bf_svtools/dateitem.hxx b/binfilter/inc/bf_svtools/dateitem.hxx
>index 5512f2d..bf48aac 100644
>--- a/binfilter/inc/bf_svtools/dateitem.hxx
>+++ b/binfilter/inc/bf_svtools/dateitem.hxx
>@@ -81,9 +81,9 @@ public:
>                                             "SetDateTime() with pooled item" );
>                                 aDateTime = rDT; }
> 
>-    virtual	BOOL PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 );
>-    virtual	BOOL QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> };
> /*
>diff --git a/binfilter/inc/bf_svtools/dtritem.hxx b/binfilter/inc/bf_svtools/dtritem.hxx
>index 0fa12d4..7296433 100644
>--- a/binfilter/inc/bf_svtools/dtritem.hxx
>+++ b/binfilter/inc/bf_svtools/dtritem.hxx
>@@ -75,9 +75,9 @@ public:
>                                     const ::IntlWrapper * pIntlWrapper = 0 )
>         const;
> 
>-    virtual	BOOL 			PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 ) const;
> 
>     const DateTime&			GetStartDateTime()		const { return aStartDateTime; }
>diff --git a/binfilter/inc/bf_svtools/globalnameitem.hxx b/binfilter/inc/bf_svtools/globalnameitem.hxx
>index 5ed7e65..1eb46e6 100644
>--- a/binfilter/inc/bf_svtools/globalnameitem.hxx
>+++ b/binfilter/inc/bf_svtools/globalnameitem.hxx
>@@ -63,9 +63,9 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     SvGlobalName			GetValue() const { return m_aName; }
> 
>-    virtual	BOOL 			PutValue  ( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/binfilter/inc/bf_svtools/ilstitem.hxx b/binfilter/inc/bf_svtools/ilstitem.hxx
>index e2f625a..8a82d6f 100644
>--- a/binfilter/inc/bf_svtools/ilstitem.hxx
>+++ b/binfilter/inc/bf_svtools/ilstitem.hxx
>@@ -62,8 +62,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>-    virtual 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 );
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> };
> 
> }
>diff --git a/binfilter/inc/bf_svtools/intitem.hxx b/binfilter/inc/bf_svtools/intitem.hxx
>index 195003e..78b1b82 100644
>--- a/binfilter/inc/bf_svtools/intitem.hxx
>+++ b/binfilter/inc/bf_svtools/intitem.hxx
>@@ -86,10 +86,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> 
>-    virtual	BOOL PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const ::com::sun::star::uno::Any& rVal,
>                            BYTE nMemberId = 0 );
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/binfilter/inc/bf_svtools/lckbitem.hxx b/binfilter/inc/bf_svtools/lckbitem.hxx
>index a43325d..e18be32 100644
>--- a/binfilter/inc/bf_svtools/lckbitem.hxx
>+++ b/binfilter/inc/bf_svtools/lckbitem.hxx
>@@ -66,9 +66,9 @@ public:
> 
>     SvLockBytes*			GetValue() const { return _xVal; }
> 
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/binfilter/inc/bf_svtools/poolitem.hxx b/binfilter/inc/bf_svtools/poolitem.hxx
>index 5131de8..5bdba99 100644
>--- a/binfilter/inc/bf_svtools/poolitem.hxx
>+++ b/binfilter/inc/bf_svtools/poolitem.hxx
>@@ -217,8 +217,8 @@ public:
>     virtual int              ScaleMetrics( long lMult, long lDiv );
>     virtual int              HasMetrics() const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem*     Create( SvStream &, USHORT nItemVersion ) const;
>     virtual SvStream&        Store( SvStream &, USHORT nItemVersion ) const;
>diff --git a/binfilter/inc/bf_svtools/ptitem.hxx b/binfilter/inc/bf_svtools/ptitem.hxx
>index 03acb5a..7f7f51d 100644
>--- a/binfilter/inc/bf_svtools/ptitem.hxx
>+++ b/binfilter/inc/bf_svtools/ptitem.hxx
>@@ -78,9 +78,9 @@ public:
>                                  aVal = rNewVal;
>                              }
> 
>-    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 );
> };
> 
>diff --git a/binfilter/inc/bf_svtools/rectitem.hxx b/binfilter/inc/bf_svtools/rectitem.hxx
>index ce75f48..d47f5ae 100644
>--- a/binfilter/inc/bf_svtools/rectitem.hxx
>+++ b/binfilter/inc/bf_svtools/rectitem.hxx
>@@ -78,10 +78,10 @@ public:
>                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
>                                  aVal = rNewVal;
>                              }
>-    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 );
>+    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 );
> };
> 
> }
>diff --git a/binfilter/inc/bf_svtools/slstitm.hxx b/binfilter/inc/bf_svtools/slstitm.hxx
>index 813885c..d619353 100644
>--- a/binfilter/inc/bf_svtools/slstitm.hxx
>+++ b/binfilter/inc/bf_svtools/slstitm.hxx
>@@ -81,10 +81,10 @@ public:
>     virtual SfxPoolItem*	Create( SvStream &, USHORT nVersion ) const;
>     virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
> 
>-    virtual	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 );
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>+                                        BYTE nMemberId = 0 ) const;
> };
> 
> }
>diff --git a/binfilter/inc/bf_svtools/szitem.hxx b/binfilter/inc/bf_svtools/szitem.hxx
>index 11fd1ee..adaf924 100644
>--- a/binfilter/inc/bf_svtools/szitem.hxx
>+++ b/binfilter/inc/bf_svtools/szitem.hxx
>@@ -63,10 +63,10 @@ public:
>                                     const ::IntlWrapper * = 0 ) const;
> 
>     virtual int 			 operator==( const SfxPoolItem& ) const;
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT nItemVersion) const;
>diff --git a/binfilter/inc/bf_svtools/tfrmitem.hxx b/binfilter/inc/bf_svtools/tfrmitem.hxx
>index e20c645..79124fb 100644
>--- a/binfilter/inc/bf_svtools/tfrmitem.hxx
>+++ b/binfilter/inc/bf_svtools/tfrmitem.hxx
>@@ -1,6 +1,7 @@
> /*************************************************************************
>  *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>+ * DO73
>+ NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>  * 
>  * Copyright 2000, 2010 Oracle and/or its affiliates.
>  *
>@@ -69,9 +70,9 @@ public:
>     virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
> 
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 );
> };
> 
>diff --git a/binfilter/inc/bf_svtools/tresitem.hxx b/binfilter/inc/bf_svtools/tresitem.hxx
>index eaa1d66..4bb66ea 100644
>--- a/binfilter/inc/bf_svtools/tresitem.hxx
>+++ b/binfilter/inc/bf_svtools/tresitem.hxx
>@@ -56,9 +56,9 @@ public:
> 
>     virtual int operator ==(SfxPoolItem const & rItem) const;
> 
>-    virtual BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
>+    virtual bool QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
> 
>-    virtual BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
>+    virtual bool PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
> 
>     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
> 
>diff --git a/binfilter/inc/bf_svtools/visitem.hxx b/binfilter/inc/bf_svtools/visitem.hxx
>index 14915b9..6c337cf 100644
>--- a/binfilter/inc/bf_svtools/visitem.hxx
>+++ b/binfilter/inc/bf_svtools/visitem.hxx
>@@ -81,10 +81,10 @@ public:
>                                                 const ::IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> 
>-    virtual	BOOL PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
>                            BYTE nMemberId = 0 );
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/binfilter/inc/bf_svx/adjitem.hxx b/binfilter/inc/bf_svx/adjitem.hxx
>index e71743c..4fa2719 100644
>--- a/binfilter/inc/bf_svx/adjitem.hxx
>+++ b/binfilter/inc/bf_svx/adjitem.hxx
>@@ -80,8 +80,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual USHORT			 GetValueCount() const;
>     virtual USHORT			 GetEnumValue() const;
>diff --git a/binfilter/inc/bf_svx/algitem.hxx b/binfilter/inc/bf_svx/algitem.hxx
>index eb3589d..78c24e9 100644
>--- a/binfilter/inc/bf_svx/algitem.hxx
>+++ b/binfilter/inc/bf_svx/algitem.hxx
>@@ -58,8 +58,8 @@ public:
>         const USHORT nId = ITEMID_HORJUSTIFY );
> 
> 
>-    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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>@@ -88,8 +88,8 @@ public:
>         const USHORT nId = ITEMID_VERJUSTIFY );
> 
> 
>-    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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>@@ -118,8 +118,8 @@ public:
>         const USHORT nId = ITEMID_ORIENTATION );
> 
> 
>-    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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>@@ -158,8 +158,8 @@ public:
>     virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
>     virtual SvStream&		 Store( SvStream&, USHORT nItemVersion ) 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 );
> 
>             INT16           GetLeftMargin() const {return nLeftMargin; }
>             INT16           GetTopMargin() const {return nTopMargin; }
>diff --git a/binfilter/inc/bf_svx/boxitem.hxx b/binfilter/inc/bf_svx/boxitem.hxx
>index 4488896..db0814f 100644
>--- a/binfilter/inc/bf_svx/boxitem.hxx
>+++ b/binfilter/inc/bf_svx/boxitem.hxx
>@@ -165,8 +165,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/brkitem.hxx b/binfilter/inc/bf_svx/brkitem.hxx
>index 9d1ce57..2931c19 100644
>--- a/binfilter/inc/bf_svx/brkitem.hxx
>+++ b/binfilter/inc/bf_svx/brkitem.hxx
>@@ -66,8 +66,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/brshitem.hxx b/binfilter/inc/bf_svx/brshitem.hxx
>index 58991f5..c733d7f 100644
>--- a/binfilter/inc/bf_svx/brshitem.hxx
>+++ b/binfilter/inc/bf_svx/brshitem.hxx
>@@ -108,8 +108,8 @@ public:
> 
> 
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create( SvStream&, USHORT nVersion ) const;
>diff --git a/binfilter/inc/bf_svx/charreliefitem.hxx b/binfilter/inc/bf_svx/charreliefitem.hxx
>index a707d45..b18097b 100644
>--- a/binfilter/inc/bf_svx/charreliefitem.hxx
>+++ b/binfilter/inc/bf_svx/charreliefitem.hxx
>@@ -71,9 +71,9 @@ public:
>                                     String &rText,
>                                     const ::IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual bool PutValue( const ::com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
>diff --git a/binfilter/inc/bf_svx/charrotateitem.hxx b/binfilter/inc/bf_svx/charrotateitem.hxx
>index b9fb05e..13fa6a7 100644
>--- a/binfilter/inc/bf_svx/charrotateitem.hxx
>+++ b/binfilter/inc/bf_svx/charrotateitem.hxx
>@@ -69,9 +69,9 @@ public:
> /*NBFF*/ 									String &rText,
> /*NBFF*/                                     const ::IntlWrapper * = 0 ) const;
> 
>-/*NBFF*/ 	virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ 	virtual bool PutValue( const ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 									BYTE nMemberId );
>-/*NBFF*/ 	virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ 	virtual bool QueryValue( ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 								BYTE nMemberId ) const;
> 
> /*NBFF*/ 	inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
>diff --git a/binfilter/inc/bf_svx/charscaleitem.hxx b/binfilter/inc/bf_svx/charscaleitem.hxx
>index d0db46f..8d87d0c 100644
>--- a/binfilter/inc/bf_svx/charscaleitem.hxx
>+++ b/binfilter/inc/bf_svx/charscaleitem.hxx
>@@ -61,9 +61,9 @@ public:
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
> 
>-    virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual bool PutValue( const ::com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
>diff --git a/binfilter/inc/bf_svx/chrtitem.hxx b/binfilter/inc/bf_svx/chrtitem.hxx
>index 5ab815b..1e0ff0e 100644
>--- a/binfilter/inc/bf_svx/chrtitem.hxx
>+++ b/binfilter/inc/bf_svx/chrtitem.hxx
>@@ -328,8 +328,8 @@ public:
>     SvxDoubleItem(double fValue = 0.0, USHORT nId = ITEMID_DOUBLE);
>     SvxDoubleItem(const SvxDoubleItem& rItem);
> 
>-    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 );
> 
> 
>     virtual int 			 operator == (const SfxPoolItem&) const;
>diff --git a/binfilter/inc/bf_svx/cmapitem.hxx b/binfilter/inc/bf_svx/cmapitem.hxx
>index 8984690..3237859 100644
>--- a/binfilter/inc/bf_svx/cmapitem.hxx
>+++ b/binfilter/inc/bf_svx/cmapitem.hxx
>@@ -83,8 +83,8 @@ public:
>                                 { return (SvxCaseMap)GetValue(); }
>     void 					SetCaseMap( SvxCaseMap eNew )
>                                 { SetValue( (USHORT)eNew ); }
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/colritem.hxx b/binfilter/inc/bf_svx/colritem.hxx
>index 3a9bc5c..2c1d6df 100644
>--- a/binfilter/inc/bf_svx/colritem.hxx
>+++ b/binfilter/inc/bf_svx/colritem.hxx
>@@ -71,8 +71,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
> 
>diff --git a/binfilter/inc/bf_svx/crsditem.hxx b/binfilter/inc/bf_svx/crsditem.hxx
>index ebe3bd5..03bfa31 100644
>--- a/binfilter/inc/bf_svx/crsditem.hxx
>+++ b/binfilter/inc/bf_svx/crsditem.hxx
>@@ -66,8 +66,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT          GetValueCount() 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 );
> 
>     // MS VC4.0 kommt durcheinander
>     void			 		SetValue( USHORT nNewVal )
>diff --git a/binfilter/inc/bf_svx/e3ditem.hxx b/binfilter/inc/bf_svx/e3ditem.hxx
>index f7eb855..500d60a 100644
>--- a/binfilter/inc/bf_svx/e3ditem.hxx
>+++ b/binfilter/inc/bf_svx/e3ditem.hxx
>@@ -60,8 +60,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVersion) const;
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) 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 );
> 
>     const Vector3D&			GetValue() const { return aVal; }
>             void			SetValue( const Vector3D& rNewVal ) {
>diff --git a/binfilter/inc/bf_svx/emphitem.hxx b/binfilter/inc/bf_svx/emphitem.hxx
>index 6fc30f1..16b37ae 100644
>--- a/binfilter/inc/bf_svx/emphitem.hxx
>+++ b/binfilter/inc/bf_svx/emphitem.hxx
>@@ -67,9 +67,9 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
>-    virtual	sal_Bool        QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 ) const;
>-    virtual	sal_Bool		PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 );
> 
>     inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
>diff --git a/binfilter/inc/bf_svx/escpitem.hxx b/binfilter/inc/bf_svx/escpitem.hxx
>index 798d218..43f3f30 100644
>--- a/binfilter/inc/bf_svx/escpitem.hxx
>+++ b/binfilter/inc/bf_svx/escpitem.hxx
>@@ -72,8 +72,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
>diff --git a/binfilter/inc/bf_svx/fhgtitem.hxx b/binfilter/inc/bf_svx/fhgtitem.hxx
>index e653f62..c17380a 100644
>--- a/binfilter/inc/bf_svx/fhgtitem.hxx
>+++ b/binfilter/inc/bf_svx/fhgtitem.hxx
>@@ -67,8 +67,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/fontitem.hxx b/binfilter/inc/bf_svx/fontitem.hxx
>index c7b4e1a..8737c1f 100644
>--- a/binfilter/inc/bf_svx/fontitem.hxx
>+++ b/binfilter/inc/bf_svx/fontitem.hxx
>@@ -77,8 +77,8 @@ public:
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
>     virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) 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 );
> 
> 
>     // ZugriffsMethoden:
>diff --git a/binfilter/inc/bf_svx/frmdiritem.hxx b/binfilter/inc/bf_svx/frmdiritem.hxx
>index b96351d..99e8eca 100644
>--- a/binfilter/inc/bf_svx/frmdiritem.hxx
>+++ b/binfilter/inc/bf_svx/frmdiritem.hxx
>@@ -65,9 +65,9 @@ public:
>     virtual int 			operator==( const SfxPoolItem& ) const;
> 
> 
>-    virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual bool PutValue( const ::com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
>diff --git a/binfilter/inc/bf_svx/grfcrop.hxx b/binfilter/inc/bf_svx/grfcrop.hxx
>index a1c34b6..270aadb 100644
>--- a/binfilter/inc/bf_svx/grfcrop.hxx
>+++ b/binfilter/inc/bf_svx/grfcrop.hxx
>@@ -54,9 +54,9 @@ public:
> //	virtual USHORT			 	GetVersion( USHORT nFileVersion ) const;
>     virtual SfxPoolItem*		Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&			Store(SvStream &, USHORT nIVer) const;
>-    virtual	BOOL        	 QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool                QueryValue( ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			 PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool                PutValue( const ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>     void SetLeft( sal_Int32 nVal )		{ nLeft = nVal; }
>diff --git a/binfilter/inc/bf_svx/hyznitem.hxx b/binfilter/inc/bf_svx/hyznitem.hxx
>index e907556..271b79e 100644
>--- a/binfilter/inc/bf_svx/hyznitem.hxx
>+++ b/binfilter/inc/bf_svx/hyznitem.hxx
>@@ -68,8 +68,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/kernitem.hxx b/binfilter/inc/bf_svx/kernitem.hxx
>index 1bdc004..d3d3ed2 100644
>--- a/binfilter/inc/bf_svx/kernitem.hxx
>+++ b/binfilter/inc/bf_svx/kernitem.hxx
>@@ -70,8 +70,8 @@ public:
>             return *this;
>         }
> 
>-    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 );
>+    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/langitem.hxx b/binfilter/inc/bf_svx/langitem.hxx
>index a7728b4..859ab08 100644
>--- a/binfilter/inc/bf_svx/langitem.hxx
>+++ b/binfilter/inc/bf_svx/langitem.hxx
>@@ -78,8 +78,8 @@ public:
>                                 { return (LanguageType)GetValue(); }
>     void 					SetLanguage( const LanguageType eLang )
>                                 { SetValue( (USHORT)eLang ); }
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/lrspitem.hxx b/binfilter/inc/bf_svx/lrspitem.hxx
>index 023f0a3..6807cd3 100644
>--- a/binfilter/inc/bf_svx/lrspitem.hxx
>+++ b/binfilter/inc/bf_svx/lrspitem.hxx
>@@ -93,8 +93,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/lspcitem.hxx b/binfilter/inc/bf_svx/lspcitem.hxx
>index 809480d..1f87043 100644
>--- a/binfilter/inc/bf_svx/lspcitem.hxx
>+++ b/binfilter/inc/bf_svx/lspcitem.hxx
>@@ -75,8 +75,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx
>index ac6af30..a31f981 100644
>--- a/binfilter/inc/bf_svx/numitem.hxx
>+++ b/binfilter/inc/bf_svx/numitem.hxx
>@@ -290,7 +290,7 @@ public:
> 
>     SvxNumRule* 			GetNumRule() const {return pNumRule;}
> 
>-    virtual	sal_Bool		PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
> };
> /* -----------------28.10.98 15:21-------------------
>  *
>diff --git a/binfilter/inc/bf_svx/pageitem.hxx b/binfilter/inc/bf_svx/pageitem.hxx
>index 77caf56..ce962b9 100644
>--- a/binfilter/inc/bf_svx/pageitem.hxx
>+++ b/binfilter/inc/bf_svx/pageitem.hxx
>@@ -91,8 +91,8 @@ public:
>     virtual int              operator==( const SfxPoolItem& ) 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 );
>     virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
>     virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
> 
>diff --git a/binfilter/inc/bf_svx/postitem.hxx b/binfilter/inc/bf_svx/postitem.hxx
>index 51cd08c..f0b3699 100644
>--- a/binfilter/inc/bf_svx/postitem.hxx
>+++ b/binfilter/inc/bf_svx/postitem.hxx
>@@ -67,8 +67,8 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT          GetValueCount() 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 );
> 
>     virtual int 			HasBoolValue() const;
>     virtual BOOL			GetBoolValue() const;
>diff --git a/binfilter/inc/bf_svx/protitem.hxx b/binfilter/inc/bf_svx/protitem.hxx
>index 8b24dd4..c53a11b 100644
>--- a/binfilter/inc/bf_svx/protitem.hxx
>+++ b/binfilter/inc/bf_svx/protitem.hxx
>@@ -75,8 +75,8 @@ public:
>     void SetSizeProtect ( BOOL bNew ) { bSize  = bNew; }
>     void SetPosProtect  ( BOOL bNew ) { bPos   = bNew; }
> 
>-    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 );
> };
> 
> inline SvxProtectItem::SvxProtectItem( const USHORT nId )
>diff --git a/binfilter/inc/bf_svx/rotmodit.hxx b/binfilter/inc/bf_svx/rotmodit.hxx
>index 746b17e..df5264b 100644
>--- a/binfilter/inc/bf_svx/rotmodit.hxx
>+++ b/binfilter/inc/bf_svx/rotmodit.hxx
>@@ -57,8 +57,8 @@ public:
>     virtual SfxPoolItem*		Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*		Create(SvStream &, USHORT) const;
>     virtual USHORT				GetVersion( USHORT nFileVersion ) 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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/sdggaitm.hxx b/binfilter/inc/bf_svx/sdggaitm.hxx
>index 603b94d..90d342d 100644
>--- a/binfilter/inc/bf_svx/sdggaitm.hxx
>+++ b/binfilter/inc/bf_svx/sdggaitm.hxx
>@@ -52,8 +52,8 @@ public:
>     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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/sdtaditm.hxx b/binfilter/inc/bf_svx/sdtaditm.hxx
>index cf1ec0c..bfb66b7 100644
>--- a/binfilter/inc/bf_svx/sdtaditm.hxx
>+++ b/binfilter/inc/bf_svx/sdtaditm.hxx
>@@ -55,8 +55,8 @@ public:
>     virtual USHORT         GetValueCount() const; // { return 4; }
>     SdrTextAniDirection GetValue() const      { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
> 
> };
>diff --git a/binfilter/inc/bf_svx/sdtaitm.hxx b/binfilter/inc/bf_svx/sdtaitm.hxx
>index 109f278..92c522e 100644
>--- a/binfilter/inc/bf_svx/sdtaitm.hxx
>+++ b/binfilter/inc/bf_svx/sdtaitm.hxx
>@@ -57,8 +57,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextVertAdjust GetValue() const      { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
> };
> 
>@@ -82,8 +82,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextHorzAdjust GetValue() const      { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
> };
>diff --git a/binfilter/inc/bf_svx/sdtakitm.hxx b/binfilter/inc/bf_svx/sdtakitm.hxx
>index ac49f73..dde76f1 100644
>--- a/binfilter/inc/bf_svx/sdtakitm.hxx
>+++ b/binfilter/inc/bf_svx/sdtakitm.hxx
>@@ -100,8 +100,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextAniKind GetValue() const      { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/sdtfsitm.hxx b/binfilter/inc/bf_svx/sdtfsitm.hxx
>index 7b40245..9fa197c 100644
>--- a/binfilter/inc/bf_svx/sdtfsitm.hxx
>+++ b/binfilter/inc/bf_svx/sdtfsitm.hxx
>@@ -63,8 +63,8 @@ public:
>     virtual USHORT           GetValueCount() const; // { return 4; }
>             SdrFitToSizeType GetValue() const      { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/shaditem.hxx b/binfilter/inc/bf_svx/shaditem.hxx
>index 353ff6a..16c31bd 100644
>--- a/binfilter/inc/bf_svx/shaditem.hxx
>+++ b/binfilter/inc/bf_svx/shaditem.hxx
>@@ -76,8 +76,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/sizeitem.hxx b/binfilter/inc/bf_svx/sizeitem.hxx
>index 5ce0c41..51d5e3f 100644
>--- a/binfilter/inc/bf_svx/sizeitem.hxx
>+++ b/binfilter/inc/bf_svx/sizeitem.hxx
>@@ -62,8 +62,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/svx3ditems.hxx b/binfilter/inc/bf_svx/svx3ditems.hxx
>index e3ad966..e57b46b 100644
>--- a/binfilter/inc/bf_svx/svx3ditems.hxx
>+++ b/binfilter/inc/bf_svx/svx3ditems.hxx
>@@ -97,8 +97,8 @@ public:
>     Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::NormalsKind
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -112,8 +112,8 @@ public:
>     Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::TextureProjectionMode
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -122,8 +122,8 @@ public:
>     Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::TextureProjectionMode
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -157,8 +157,8 @@ public:
>     Svx3DTextureKindItem(sal_uInt16 nVal = 3);
> 
>     // use drawing::TextureKind
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -167,8 +167,8 @@ public:
>     Svx3DTextureModeItem(sal_uInt16 nVal = 2);
> 
>     // use drawing:TextureMode
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -183,8 +183,8 @@ public:
>     Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE);
> 
>     // use drawing::ProjectionMode
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -338,8 +338,8 @@ public:
>     Svx3DShadeModeItem(sal_uInt16 nVal = 2);
> 
>     // use drawing::ShadeMode 
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>diff --git a/binfilter/inc/bf_svx/sxcikitm.hxx b/binfilter/inc/bf_svx/sxcikitm.hxx
>index 152271f..6bd84a1 100644
>--- a/binfilter/inc/bf_svx/sxcikitm.hxx
>+++ b/binfilter/inc/bf_svx/sxcikitm.hxx
>@@ -51,7 +51,7 @@ public:
>     virtual USHORT       GetValueCount() const; // { return 4; }
>             SdrCircKind  GetValue() const      { return (SdrCircKind)SfxEnumItem::GetValue(); }
> 
>-    virtual	sal_Bool			 PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    virtual	bool         PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/sxekitm.hxx b/binfilter/inc/bf_svx/sxekitm.hxx
>index dfa55ee..1e665e2 100644
>--- a/binfilter/inc/bf_svx/sxekitm.hxx
>+++ b/binfilter/inc/bf_svx/sxekitm.hxx
>@@ -54,8 +54,8 @@ public:
>     virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
>     virtual USHORT       GetValueCount() const; // { return 5; }
>             SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/tstpitem.hxx b/binfilter/inc/bf_svx/tstpitem.hxx
>index 387f994..3a75b8b 100644
>--- a/binfilter/inc/bf_svx/tstpitem.hxx
>+++ b/binfilter/inc/bf_svx/tstpitem.hxx
>@@ -164,8 +164,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/twolinesitem.hxx b/binfilter/inc/bf_svx/twolinesitem.hxx
>index 7d40e5b..8a969ab 100644
>--- a/binfilter/inc/bf_svx/twolinesitem.hxx
>+++ b/binfilter/inc/bf_svx/twolinesitem.hxx
>@@ -67,9 +67,9 @@ public:
> /*NBFF*/ 									String &rText,
> /*NBFF*/                                     const ::IntlWrapper* pIntl = 0 ) const;
> 
>-/*NBFF*/ 	virtual	sal_Bool       	QueryValue( ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ 	virtual	bool          QueryValue( ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 										BYTE nMemberId = 0 ) const;
>-/*NBFF*/ 	virtual	sal_Bool		PutValue( const ::com::sun::star::uno::Any& rVal,
>+/*NBFF*/ 	virtual	bool          PutValue( const ::com::sun::star::uno::Any& rVal,
> /*NBFF*/ 										BYTE nMemberId = 0 );
> 
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>diff --git a/binfilter/inc/bf_svx/udlnitem.hxx b/binfilter/inc/bf_svx/udlnitem.hxx
>index 84831fe..5fe214c 100644
>--- a/binfilter/inc/bf_svx/udlnitem.hxx
>+++ b/binfilter/inc/bf_svx/udlnitem.hxx
>@@ -72,9 +72,9 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT          GetValueCount() const;
> 
>-    virtual	sal_Bool        QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool         QueryValue( ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	sal_Bool		PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool         PutValue( const ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>     // MS VC4.0 kommt durcheinander
>diff --git a/binfilter/inc/bf_svx/ulspitem.hxx b/binfilter/inc/bf_svx/ulspitem.hxx
>index b931391..3cf6a84 100644
>--- a/binfilter/inc/bf_svx/ulspitem.hxx
>+++ b/binfilter/inc/bf_svx/ulspitem.hxx
>@@ -67,8 +67,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/wghtitem.hxx b/binfilter/inc/bf_svx/wghtitem.hxx
>index a1785f2..1ea3e27 100644
>--- a/binfilter/inc/bf_svx/wghtitem.hxx
>+++ b/binfilter/inc/bf_svx/wghtitem.hxx
>@@ -68,8 +68,8 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT			GetValueCount() 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 );
> 
>     virtual int 			HasBoolValue() const;
>     virtual BOOL			GetBoolValue() const;
>diff --git a/binfilter/inc/bf_svx/writingmodeitem.hxx b/binfilter/inc/bf_svx/writingmodeitem.hxx
>index f620fe1..754222c 100644
>--- a/binfilter/inc/bf_svx/writingmodeitem.hxx
>+++ b/binfilter/inc/bf_svx/writingmodeitem.hxx
>@@ -59,7 +59,7 @@ public:
>     virtual int 			operator==( const SfxPoolItem& ) const;
> 
> 
>-    virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( ::com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> };
> 
>diff --git a/binfilter/inc/bf_svx/xbtmpit.hxx b/binfilter/inc/bf_svx/xbtmpit.hxx
>index 2d1d1d4..b2e404d 100644
>--- a/binfilter/inc/bf_svx/xbtmpit.hxx
>+++ b/binfilter/inc/bf_svx/xbtmpit.hxx
>@@ -54,8 +54,8 @@ public:
>     virtual SvStream&       Store( SvStream& rOut, USHORT nItemVersion  ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) 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 );
> 
> 
>     const XOBitmap& GetValue( const XBitmapTable* pTable = 0 ) const;
>diff --git a/binfilter/inc/bf_svx/xcolit.hxx b/binfilter/inc/bf_svx/xcolit.hxx
>index 415b3ad..43cce62 100644
>--- a/binfilter/inc/bf_svx/xcolit.hxx
>+++ b/binfilter/inc/bf_svx/xcolit.hxx
>@@ -47,8 +47,8 @@ class XColorItem : public NameOrIndex
> public:
>             TYPEINFO();
>             XColorItem() {}
>-    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 );
> 
>             XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor);
>             XColorItem(USHORT nWhich, SvStream& rIn);
>diff --git a/binfilter/inc/bf_svx/xfillit0.hxx b/binfilter/inc/bf_svx/xfillit0.hxx
>index 7bc0279..4f91ee5 100644
>--- a/binfilter/inc/bf_svx/xfillit0.hxx
>+++ b/binfilter/inc/bf_svx/xfillit0.hxx
>@@ -50,8 +50,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     XFillStyle				GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); }
>diff --git a/binfilter/inc/bf_svx/xflclit.hxx b/binfilter/inc/bf_svx/xflclit.hxx
>index 735988f..48a9c40 100644
>--- a/binfilter/inc/bf_svx/xflclit.hxx
>+++ b/binfilter/inc/bf_svx/xflclit.hxx
>@@ -51,8 +51,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xflftrit.hxx b/binfilter/inc/bf_svx/xflftrit.hxx
>index 4af11d3..e8801eb 100644
>--- a/binfilter/inc/bf_svx/xflftrit.hxx
>+++ b/binfilter/inc/bf_svx/xflftrit.hxx
>@@ -59,7 +59,7 @@ public:
>     virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
>     virtual SvStream&       Store( SvStream& rOut, USHORT nItemVersion ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
>-    virtual	sal_Bool        	 QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> 
> 
>     BOOL					IsEnabled() const { return bEnabled; }
>diff --git a/binfilter/inc/bf_svx/xflgrit.hxx b/binfilter/inc/bf_svx/xflgrit.hxx
>index a0d9fca..c8d4429 100644
>--- a/binfilter/inc/bf_svx/xflgrit.hxx
>+++ b/binfilter/inc/bf_svx/xflgrit.hxx
>@@ -61,8 +61,8 @@ public:
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) 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 );
>     const XGradient&		GetValue(const XGradientTable* pTable = 0) const;
>     void					SetValue(const XGradient& rNew) { aGradient = rNew; Detach(); }
> 
>diff --git a/binfilter/inc/bf_svx/xflhtit.hxx b/binfilter/inc/bf_svx/xflhtit.hxx
>index 0628acf..47dc080 100644
>--- a/binfilter/inc/bf_svx/xflhtit.hxx
>+++ b/binfilter/inc/bf_svx/xflhtit.hxx
>@@ -59,8 +59,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
>     const XHatch&			GetValue(const XHatchTable* pTable = 0) const;
>     void					SetValue(const XHatch& rNew)  { aHatch = rNew; Detach(); }
>diff --git a/binfilter/inc/bf_svx/xftadit.hxx b/binfilter/inc/bf_svx/xftadit.hxx
>index 5c97df1..392724e 100644
>--- a/binfilter/inc/bf_svx/xftadit.hxx
>+++ b/binfilter/inc/bf_svx/xftadit.hxx
>@@ -50,8 +50,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextAdjust			GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/xftsfit.hxx b/binfilter/inc/bf_svx/xftsfit.hxx
>index fae7a05..04e94d1 100644
>--- a/binfilter/inc/bf_svx/xftsfit.hxx
>+++ b/binfilter/inc/bf_svx/xftsfit.hxx
>@@ -46,8 +46,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextStdForm		GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/xftshit.hxx b/binfilter/inc/bf_svx/xftshit.hxx
>index 9e7cb98..1071d82 100644
>--- a/binfilter/inc/bf_svx/xftshit.hxx
>+++ b/binfilter/inc/bf_svx/xftshit.hxx
>@@ -50,8 +50,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextShadow			GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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 );
> };
> 
> }//end of namespace binfilter
>diff --git a/binfilter/inc/bf_svx/xlineit0.hxx b/binfilter/inc/bf_svx/xlineit0.hxx
>index 640d1e0..5216fa9 100644
>--- a/binfilter/inc/bf_svx/xlineit0.hxx
>+++ b/binfilter/inc/bf_svx/xlineit0.hxx
>@@ -48,8 +48,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     XLineStyle				GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); }
>diff --git a/binfilter/inc/bf_svx/xlinjoit.hxx b/binfilter/inc/bf_svx/xlinjoit.hxx
>index 16fe772..f007df9 100644
>--- a/binfilter/inc/bf_svx/xlinjoit.hxx
>+++ b/binfilter/inc/bf_svx/xlinjoit.hxx
>@@ -51,8 +51,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     XLineJoint				GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
>diff --git a/binfilter/inc/bf_svx/xlnclit.hxx b/binfilter/inc/bf_svx/xlnclit.hxx
>index 6c2e58f..8fdc0ae 100644
>--- a/binfilter/inc/bf_svx/xlnclit.hxx
>+++ b/binfilter/inc/bf_svx/xlnclit.hxx
>@@ -47,8 +47,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xlndsit.hxx b/binfilter/inc/bf_svx/xlndsit.hxx
>index f9c8e2f..5964b45 100644
>--- a/binfilter/inc/bf_svx/xlndsit.hxx
>+++ b/binfilter/inc/bf_svx/xlndsit.hxx
>@@ -59,8 +59,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
> 
>     const XDash&			GetValue(const XDashTable* pTable = 0) const;
>diff --git a/binfilter/inc/bf_svx/xlnedcit.hxx b/binfilter/inc/bf_svx/xlnedcit.hxx
>index 09cba47..c7981a1 100644
>--- a/binfilter/inc/bf_svx/xlnedcit.hxx
>+++ b/binfilter/inc/bf_svx/xlnedcit.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xlnedit.hxx b/binfilter/inc/bf_svx/xlnedit.hxx
>index 17eac25..42814ff 100644
>--- a/binfilter/inc/bf_svx/xlnedit.hxx
>+++ b/binfilter/inc/bf_svx/xlnedit.hxx
>@@ -58,8 +58,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
> 
>     const XPolygon& GetValue(const XLineEndTable* pTable = 0) const;
>diff --git a/binfilter/inc/bf_svx/xlnedwit.hxx b/binfilter/inc/bf_svx/xlnedwit.hxx
>index 44a1427..6065740 100644
>--- a/binfilter/inc/bf_svx/xlnedwit.hxx
>+++ b/binfilter/inc/bf_svx/xlnedwit.hxx
>@@ -48,8 +48,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xlnstcit.hxx b/binfilter/inc/bf_svx/xlnstcit.hxx
>index c6fdc98..6f6c563 100644
>--- a/binfilter/inc/bf_svx/xlnstcit.hxx
>+++ b/binfilter/inc/bf_svx/xlnstcit.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xlnstit.hxx b/binfilter/inc/bf_svx/xlnstit.hxx
>index 0e95561..4c88812 100644
>--- a/binfilter/inc/bf_svx/xlnstit.hxx
>+++ b/binfilter/inc/bf_svx/xlnstit.hxx
>@@ -58,8 +58,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
> 
>     const XPolygon& GetValue(const XLineEndTable* pTable = 0) const;
>diff --git a/binfilter/inc/bf_svx/xlnstwit.hxx b/binfilter/inc/bf_svx/xlnstwit.hxx
>index 33075b8..1682899 100644
>--- a/binfilter/inc/bf_svx/xlnstwit.hxx
>+++ b/binfilter/inc/bf_svx/xlnstwit.hxx
>@@ -47,8 +47,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> 
> };
>diff --git a/binfilter/inc/bf_svx/xlnwtit.hxx b/binfilter/inc/bf_svx/xlnwtit.hxx
>index 7652bb5..43c3319 100644
>--- a/binfilter/inc/bf_svx/xlnwtit.hxx
>+++ b/binfilter/inc/bf_svx/xlnwtit.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
> };
> 
>diff --git a/binfilter/inc/bf_svx/xmlcnitm.hxx b/binfilter/inc/bf_svx/xmlcnitm.hxx
>index 676a28d..b5541c6 100644
>--- a/binfilter/inc/bf_svx/xmlcnitm.hxx
>+++ b/binfilter/inc/bf_svx/xmlcnitm.hxx
>@@ -56,8 +56,8 @@ public:
> 
>     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
>     { return new SvXMLAttrContainerItem( *this ); }
>diff --git a/binfilter/inc/bf_svx/xtextit0.hxx b/binfilter/inc/bf_svx/xtextit0.hxx
>index ef6bd18..a5b72b5 100644
>--- a/binfilter/inc/bf_svx/xtextit0.hxx
>+++ b/binfilter/inc/bf_svx/xtextit0.hxx
>@@ -53,8 +53,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextStyle			GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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 );
> };
> 
> /*************************************************************************
>diff --git a/binfilter/inc/bf_sw/fchrfmt.hxx b/binfilter/inc/bf_sw/fchrfmt.hxx
>index f2a6875..bc42763 100644
>--- a/binfilter/inc/bf_sw/fchrfmt.hxx
>+++ b/binfilter/inc/bf_sw/fchrfmt.hxx
>@@ -62,7 +62,7 @@ public:
>                                     String &rText,
>                                     const ::IntlWrapper*    pIntl = 0 ) const;
> 
>-    virtual	BOOL        	 QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool             QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> 
>     // an das SwTxtCharFmt weiterleiten (vom SwClient)
>     virtual BOOL 	GetInfo( SfxPoolItem& rInfo ) const;
>diff --git a/binfilter/inc/bf_sw/fmtanchr.hxx b/binfilter/inc/bf_sw/fmtanchr.hxx
>index 394bf7a..6ca1080 100644
>--- a/binfilter/inc/bf_sw/fmtanchr.hxx
>+++ b/binfilter/inc/bf_sw/fmtanchr.hxx
>@@ -33,7 +33,7 @@
> #ifndef _FORMAT_HXX //autogen
> #include <format.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
> 
> struct SwPosition;
>@@ -65,8 +65,8 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
> 
>-    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 );
>+    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 );
> 
>     RndStdIds GetAnchorId() const { return nAnchorId; }
>     USHORT GetPageNum() const { return nPageNum; }
>@@ -82,7 +82,7 @@ public:
> // GrP moved to gcc_outl.cxx; revisit with gcc3
> inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
>      { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); }
>- 
>+
>  inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
>      { return aSet.GetAnchor(bInP); }
> #endif
>diff --git a/binfilter/inc/bf_sw/fmtclds.hxx b/binfilter/inc/bf_sw/fmtclds.hxx
>index 65bf932..f9c7dd6 100644
>--- a/binfilter/inc/bf_sw/fmtclds.hxx
>+++ b/binfilter/inc/bf_sw/fmtclds.hxx
>@@ -114,8 +114,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
> 
>-    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 );
>+    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 );
> 
>     const SwColumns &GetColumns() const { return aColumns; }
>           SwColumns &GetColumns()		{ return aColumns; }
>diff --git a/binfilter/inc/bf_sw/fmtcnct.hxx b/binfilter/inc/bf_sw/fmtcnct.hxx
>index 6a6e9e4..91cfce9 100644
>--- a/binfilter/inc/bf_sw/fmtcnct.hxx
>+++ b/binfilter/inc/bf_sw/fmtcnct.hxx
>@@ -31,7 +31,7 @@
> #ifndef _FORMAT_HXX //autogen
> #include <format.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
> 
> 
>@@ -59,7 +59,7 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
> 
>-    virtual	BOOL        	 QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> 
>     SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
>     SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
>diff --git a/binfilter/inc/bf_sw/fmtfsize.hxx b/binfilter/inc/bf_sw/fmtfsize.hxx
>index 56dafe4..257ea93 100644
>--- a/binfilter/inc/bf_sw/fmtfsize.hxx
>+++ b/binfilter/inc/bf_sw/fmtfsize.hxx
>@@ -36,7 +36,7 @@
> #ifndef _FORMAT_HXX //autogen
> #include <format.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
> 
> 
>@@ -81,9 +81,9 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer ) const;
>-    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 );
>-    virtual USHORT			 GetVersion( USHORT nFFVer ) const;
>+    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 );
>+    virtual USHORT          GetVersion( USHORT nFFVer ) const;
> 
>     SwFrmSize GetSizeType() const { return eFrmSize; }
>     void SetSizeType( SwFrmSize eSize ) { eFrmSize = eSize; }
>diff --git a/binfilter/inc/bf_sw/fmtftntx.hxx b/binfilter/inc/bf_sw/fmtftntx.hxx
>index b2140d4..1d50915 100644
>--- a/binfilter/inc/bf_sw/fmtftntx.hxx
>+++ b/binfilter/inc/bf_sw/fmtftntx.hxx
>@@ -76,8 +76,8 @@ public:
> 
>     virtual int             operator==( const SfxPoolItem& ) const;
> 
>-    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 );
>+    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 );
> 
> // will be used at time??
> //	void					FillVariable( SbxVariable &rVar,
>diff --git a/binfilter/inc/bf_sw/fmtinfmt.hxx b/binfilter/inc/bf_sw/fmtinfmt.hxx
>index 484fa5f..77c6b95 100644
>--- a/binfilter/inc/bf_sw/fmtinfmt.hxx
>+++ b/binfilter/inc/bf_sw/fmtinfmt.hxx
>@@ -31,10 +31,10 @@
> #ifndef _SFXPOOLITEM_HXX
> #include <bf_svtools/poolitem.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
>-class SvxMacro; 
>-class SvxMacroTableDtor; 
>+class SvxMacro;
>+class SvxMacroTableDtor;
> 
> class SwTxtINetFmt;
> // ATT_INETFMT *********************************************
>@@ -66,12 +66,12 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
> 
>-    virtual	BOOL        	QueryValue( ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			PutValue( const ::com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>-    virtual USHORT			 GetVersion( USHORT nFFVer ) const;
>+    virtual USHORT			GetVersion( USHORT nFFVer ) const;
> 
>     const SwTxtINetFmt* GetTxtINetFmt() const	{ return pTxtAttr; }
>     SwTxtINetFmt* GetTxtINetFmt()				{ return pTxtAttr; }
>diff --git a/binfilter/inc/bf_sw/fmtline.hxx b/binfilter/inc/bf_sw/fmtline.hxx
>index c3117a3..337bb98 100644
>--- a/binfilter/inc/bf_sw/fmtline.hxx
>+++ b/binfilter/inc/bf_sw/fmtline.hxx
>@@ -31,7 +31,7 @@
> #ifndef _FORMAT_HXX //autogen
> #include <format.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
> 
> 
>@@ -51,9 +51,9 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>-    virtual USHORT			 GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    virtual USHORT			GetVersion( USHORT nFFVer ) const;
>+    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 );
> 
>     ULONG GetStartValue() const { return nStartValue; }
>     BOOL  IsCount()		  const { return bCountLines != 0; }
>diff --git a/binfilter/inc/bf_sw/fmtornt.hxx b/binfilter/inc/bf_sw/fmtornt.hxx
>index 160dc18..1b0364e 100644
>--- a/binfilter/inc/bf_sw/fmtornt.hxx
>+++ b/binfilter/inc/bf_sw/fmtornt.hxx
>@@ -63,8 +63,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> 
>     SwVertOrient GetVertOrient() const { return eOrient; }
>     SwRelationOrient GetRelationOrient() const { return eRelation; }
>@@ -102,8 +102,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> 
>     SwHoriOrient GetHoriOrient() const { return eOrient; }
>     SwRelationOrient GetRelationOrient() const { return eRelation; }
>diff --git a/binfilter/inc/bf_sw/fmtpdsc.hxx b/binfilter/inc/bf_sw/fmtpdsc.hxx
>index cb47eb0..728486c 100644
>--- a/binfilter/inc/bf_sw/fmtpdsc.hxx
>+++ b/binfilter/inc/bf_sw/fmtpdsc.hxx
>@@ -70,8 +70,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> 
>     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
> 
>diff --git a/binfilter/inc/bf_sw/fmtruby.hxx b/binfilter/inc/bf_sw/fmtruby.hxx
>index eaa6838..02ae275 100644
>--- a/binfilter/inc/bf_sw/fmtruby.hxx
>+++ b/binfilter/inc/bf_sw/fmtruby.hxx
>@@ -60,10 +60,10 @@ public:
>     virtual SvStream&       Store(SvStream &, USHORT nIVer) const;
> 
> 
>-    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 );
>+    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 );
> 
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
> 
>diff --git a/binfilter/inc/bf_sw/fmtsrnd.hxx b/binfilter/inc/bf_sw/fmtsrnd.hxx
>index 6c4328a..4299308 100644
>--- a/binfilter/inc/bf_sw/fmtsrnd.hxx
>+++ b/binfilter/inc/bf_sw/fmtsrnd.hxx
>@@ -69,8 +69,8 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetValueCount() const{DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 virtual USHORT			GetValueCount() const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> 
> 
>     SwSurround GetSurround()const { return SwSurround( GetValue() ); }
>diff --git a/binfilter/inc/bf_sw/fmturl.hxx b/binfilter/inc/bf_sw/fmturl.hxx
>index 43f4000..d125d24 100644
>--- a/binfilter/inc/bf_sw/fmturl.hxx
>+++ b/binfilter/inc/bf_sw/fmturl.hxx
>@@ -61,8 +61,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> 
>     void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; }
>     void SetURL( const String &rURL, BOOL bServerMap );
>diff --git a/binfilter/inc/bf_sw/grfatr.hxx b/binfilter/inc/bf_sw/grfatr.hxx
>index b88b4b3..b6ec9b8 100644
>--- a/binfilter/inc/bf_sw/grfatr.hxx
>+++ b/binfilter/inc/bf_sw/grfatr.hxx
>@@ -89,10 +89,10 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>     virtual int				operator==( const SfxPoolItem& ) const;
> 
>-    virtual	BOOL        	 QueryValue( ::com::sun::star::uno::Any& rVal,
>+    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 );
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal,
>+                                      BYTE nMemberId = 0 );
> 
>     inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
>         {
>@@ -140,10 +140,10 @@ public:
>     virtual SfxPoolItem*    Create(SvStream &, USHORT nVer ) const;
>     virtual SvStream&       Store(SvStream &, USHORT nIVer) const;
>     virtual int				operator==( const SfxPoolItem& ) const;
>-    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 );
>+    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 );
> 
>     void SetUnrotatedSize( const Size& rSz ) 		{ aUnrotatedSize = rSz; }
>     const Size& GetUnrotatedSize() const 			{ return aUnrotatedSize; }
>@@ -235,10 +235,10 @@ public:
>     virtual SvStream&       Store(SvStream &, USHORT nIVer) const;
>     virtual int				operator==( const SfxPoolItem& ) const;
> 
>-    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 );
>+    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 );
> 
> 
>     const double& GetValue() const				{ return nValue; }
>@@ -267,10 +267,10 @@ public:
>     // pure virtual-Methiden from SfxInt16Item
>     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
>     virtual USHORT		 GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    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 );
> };
> 
> class SwDrawModeGrf : public SfxEnumItem
>@@ -287,10 +287,10 @@ public:
>     virtual USHORT			GetValueCount() const{DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 	virtual USHORT			GetValueCount() const;
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
> 
>-    virtual	BOOL        	QueryValue( ::com::sun::star::uno::Any& rVal,
>+    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 );
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal,
>+                                      BYTE nMemberId = 0 );
> };
> 
> 
>diff --git a/binfilter/inc/bf_sw/paratr.hxx b/binfilter/inc/bf_sw/paratr.hxx
>index e2ce470..d24134a 100644
>--- a/binfilter/inc/bf_sw/paratr.hxx
>+++ b/binfilter/inc/bf_sw/paratr.hxx
>@@ -77,8 +77,8 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
>-    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 );
>+    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 );
>     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
> 
>     inline BYTE GetLines() const { return nLines; }
>@@ -160,10 +160,10 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	Create( SvStream&, USHORT ) const;
>     virtual SvStream&		Store( SvStream&, USHORT nIVer ) const;
>-    virtual USHORT			 GetVersion( USHORT nFFVer ) const;
>+    virtual USHORT          GetVersion( USHORT nFFVer ) const;
> 
>-    virtual	BOOL        	 QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>-    virtual	BOOL			 PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId );
>+    virtual	bool            QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>+    virtual	bool            PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId );
> 
>     // erfrage und setze den Modify-Pointer
>     inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
>diff --git a/binfilter/inc/bf_sw/tgrditem.hxx b/binfilter/inc/bf_sw/tgrditem.hxx
>index d8d03da..21f5517 100644
>--- a/binfilter/inc/bf_sw/tgrditem.hxx
>+++ b/binfilter/inc/bf_sw/tgrditem.hxx
>@@ -37,7 +37,7 @@
> #ifndef _FORMAT_HXX //autogen
> #include <format.hxx>
> #endif
>-class IntlWrapper; 
>+class IntlWrapper;
> namespace binfilter {
> 
> 
>@@ -63,9 +63,9 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
>     virtual SfxPoolItem*    Create(SvStream &, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream &, USHORT nIVer) const;
>-    virtual USHORT			 GetVersion( USHORT nFFVer ) const;
>-    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 );
>+    virtual USHORT          GetVersion( USHORT nFFVer ) const;
>+    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 );
> 
>     SwTextGridItem&  operator=( const SwTextGridItem& );
> 
>diff --git a/binfilter/inc/bf_xmloff/xmlcnitm.hxx b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
>index 911ac2c..0be96e2 100644
>--- a/binfilter/inc/bf_xmloff/xmlcnitm.hxx
>+++ b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
>@@ -63,8 +63,8 @@ public:
> 
>     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
>     { return new SvXMLAttrContainerItem( *this ); }
>diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
>index c9f11ac..ee1ffb8 100644
>--- a/avmedia/inc/avmedia/mediaitem.hxx
>+++ b/avmedia/inc/avmedia/mediaitem.hxx
>@@ -82,8 +82,8 @@ public:
>                                                  SfxMapUnit ePresUnit,
>                                                  XubString& rText, 
>                                                  const IntlWrapper *pIntl ) const;
>-    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 );
>+    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 );
> 
>     void					merge( const MediaItem& rMediaItem );
> 
>diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
>index 9d53c0d..0b78345 100644
>--- a/avmedia/source/framework/mediaitem.cxx
>+++ b/avmedia/source/framework/mediaitem.cxx
>@@ -122,7 +122,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
> 
> //------------------------------------------------------------------------
> 
>-BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     uno::Sequence< uno::Any > aSeq( 9 );
> 
>@@ -135,23 +135,23 @@ BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>     aSeq[ 6 ] <<= mbLoop;
>     aSeq[ 7 ] <<= mbMute;
>     aSeq[ 8 ] <<= meZoom;
>-    
>+
>     rVal <<= aSeq;
>-    
>+
>     return true;
> }
> 
> //------------------------------------------------------------------------
> 
>-BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     uno::Sequence< uno::Any >	aSeq;
>-    BOOL						bRet = false;
>-    
>+    bool						bRet = false;
>+
>     if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
>     {
>         sal_Int32 nInt32 = 0;
>-        
>+
>         aSeq[ 0 ] >>= maURL;
>         aSeq[ 1 ] >>= mnMaskSet;
>         aSeq[ 2 ] >>= nInt32; meState = static_cast< MediaState >( nInt32 );
>@@ -161,10 +161,10 @@ BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>         aSeq[ 6 ] >>= mbLoop;
>         aSeq[ 7 ] >>= mbMute;
>         aSeq[ 8 ] >>= meZoom;
>-        
>+
>         bRet = true;
>     }
>-    
>+
>     return bRet;
> }
> 
>diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
>index f72c8eb..e99ee0c 100644
>--- a/editeng/inc/editeng/adjitem.hxx
>+++ b/editeng/inc/editeng/adjitem.hxx
>@@ -70,8 +70,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
>index 4e21750..4718ef1 100644
>--- a/editeng/inc/editeng/bolnitem.hxx
>+++ b/editeng/inc/editeng/bolnitem.hxx
>@@ -56,8 +56,8 @@ public:
>     ~SvxLineItem();
>     SvxLineItem &operator=( const SvxLineItem& rLine );
> 
>-    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 );
>     virtual int              operator==( const SfxPoolItem& ) const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
>index d85f7c2..f1ddc6d 100644
>--- a/editeng/inc/editeng/boxitem.hxx
>+++ b/editeng/inc/editeng/boxitem.hxx
>@@ -70,8 +70,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>@@ -185,8 +185,8 @@ public:
>                                     SfxMapUnit eCoreMetric,
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
> 
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
>diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
>index 206f459..e3c7e2a 100644
>--- a/editeng/inc/editeng/brkitem.hxx
>+++ b/editeng/inc/editeng/brkitem.hxx
>@@ -59,8 +59,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
>index 837dd87..f33b232 100644
>--- a/editeng/inc/editeng/brshitem.hxx
>+++ b/editeng/inc/editeng/brshitem.hxx
>@@ -99,8 +99,8 @@ public:
>                                     String &rText, const IntlWrapper * = 0 ) const;
> 
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create( SvStream&, USHORT nVersion ) const;
>diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
>index 3d5b36f..704a757 100644
>--- a/editeng/inc/editeng/charreliefitem.hxx
>+++ b/editeng/inc/editeng/charreliefitem.hxx
>@@ -64,9 +64,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
>diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
>index a8eaca8..f2b38de 100644
>--- a/editeng/inc/editeng/charrotateitem.hxx
>+++ b/editeng/inc/editeng/charrotateitem.hxx
>@@ -64,9 +64,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
>diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
>index 925e84a..91d9169 100644
>--- a/editeng/inc/editeng/charscaleitem.hxx
>+++ b/editeng/inc/editeng/charscaleitem.hxx
>@@ -61,9 +61,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool     PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool     QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
>diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
>index 94fb80a..b6b2fe0 100644
>--- a/editeng/inc/editeng/cmapitem.hxx
>+++ b/editeng/inc/editeng/cmapitem.hxx
>@@ -81,8 +81,8 @@ public:
>                                 { return (SvxCaseMap)GetValue(); }
>     void 					SetCaseMap( SvxCaseMap eNew )
>                                 { SetValue( (USHORT)eNew ); }
>-    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
>diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
>index 6c73008..5768a98 100644
>--- a/editeng/inc/editeng/colritem.hxx
>+++ b/editeng/inc/editeng/colritem.hxx
>@@ -64,8 +64,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
>index c62f5bd..c1d3711 100644
>--- a/editeng/inc/editeng/crsditem.hxx
>+++ b/editeng/inc/editeng/crsditem.hxx
>@@ -65,8 +65,8 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual String			GetValueTextByPos( USHORT nPos ) const;
>     virtual USHORT          GetValueCount() 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 );
> 
>     // MS VC4.0 kommt durcheinander
>     void			 		SetValue( USHORT nNewVal )
>diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
>index 915320d..de0d8b4 100644
>--- a/editeng/inc/editeng/emphitem.hxx
>+++ b/editeng/inc/editeng/emphitem.hxx
>@@ -66,9 +66,9 @@ public:
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
>     virtual USHORT			GetVersion( USHORT nFileVersion ) const;
> 
>-    virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 ) const;
>-    virtual	sal_Bool		PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 );
> 
>     inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
>diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
>index ecdc6e3..599f5ae 100644
>--- a/editeng/inc/editeng/escpitem.hxx
>+++ b/editeng/inc/editeng/escpitem.hxx
>@@ -72,8 +72,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
>diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
>index e4cbb86..7b8b45f 100644
>--- a/editeng/inc/editeng/fhgtitem.hxx
>+++ b/editeng/inc/editeng/fhgtitem.hxx
>@@ -63,8 +63,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
>index c16b812..acd20d1 100644
>--- a/editeng/inc/editeng/flstitem.hxx
>+++ b/editeng/inc/editeng/flstitem.hxx
>@@ -61,7 +61,7 @@ public:
>     virtual int				operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
> 
>-    virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
>index ed251fd..06efb23 100644
>--- a/editeng/inc/editeng/fontitem.hxx
>+++ b/editeng/inc/editeng/fontitem.hxx
>@@ -72,8 +72,8 @@ public:
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
>     virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
>index fe46b5c..84c9abf 100644
>--- a/editeng/inc/editeng/frmdiritem.hxx
>+++ b/editeng/inc/editeng/frmdiritem.hxx
>@@ -64,9 +64,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
>diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
>index d8dfeca..1328dc6 100644
>--- a/editeng/inc/editeng/fwdtitem.hxx
>+++ b/editeng/inc/editeng/fwdtitem.hxx
>@@ -54,8 +54,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
>index 2ae3ffc..666b8a5 100644
>--- a/editeng/inc/editeng/hyznitem.hxx
>+++ b/editeng/inc/editeng/hyznitem.hxx
>@@ -64,8 +64,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
>index 1766c7b..9a60b51 100644
>--- a/editeng/inc/editeng/kernitem.hxx
>+++ b/editeng/inc/editeng/kernitem.hxx
>@@ -72,8 +72,8 @@ public:
>             return *this;
>         }
> 
>-    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 );
>+    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
>diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
>index da70a1d..31ca110 100644
>--- a/editeng/inc/editeng/langitem.hxx
>+++ b/editeng/inc/editeng/langitem.hxx
>@@ -76,9 +76,8 @@ public:
>                                 { return (LanguageType)GetValue(); }
>     void 					SetLanguage( const LanguageType eLang )
>                                 { SetValue( (USHORT)eLang ); }
>-    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
>-
>diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
>index 7f5dbfc..6860fe2 100644
>--- a/editeng/inc/editeng/lrspitem.hxx
>+++ b/editeng/inc/editeng/lrspitem.hxx
>@@ -87,8 +87,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
>index 659e618..542a16b 100644
>--- a/editeng/inc/editeng/lspcitem.hxx
>+++ b/editeng/inc/editeng/lspcitem.hxx
>@@ -70,8 +70,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
>index 48d91bb..dfc8f65 100644
>--- a/editeng/inc/editeng/numitem.hxx
>+++ b/editeng/inc/editeng/numitem.hxx
>@@ -341,8 +341,8 @@ public:
> 
>     SvxNumRule* 			GetNumRule() const {return pNumRule;}
> 
>-    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 );
> };
> /* -----------------28.10.98 15:21-------------------
>  *
>diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
>index 119532f..291f02a 100644
>--- a/editeng/inc/editeng/paravertalignitem.hxx
>+++ b/editeng/inc/editeng/paravertalignitem.hxx
>@@ -61,9 +61,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> 
>     inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
>diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
>index 1bcc2b5..1431ae6 100644
>--- a/editeng/inc/editeng/pmdlitem.hxx
>+++ b/editeng/inc/editeng/pmdlitem.hxx
>@@ -59,8 +59,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
>     BOOL IsAuto() const { return bAuto; }
> };
> 
>diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
>index 03fe015..ebc1395 100644
>--- a/editeng/inc/editeng/postitem.hxx
>+++ b/editeng/inc/editeng/postitem.hxx
>@@ -66,8 +66,8 @@ public:
>     virtual String			GetValueTextByPos( USHORT nPos ) const;
>     virtual USHORT          GetValueCount() 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 );
> 
>     virtual int 			HasBoolValue() const;
>     virtual BOOL			GetBoolValue() const;
>diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
>index a69643a..f752579 100644
>--- a/editeng/inc/editeng/protitem.hxx
>+++ b/editeng/inc/editeng/protitem.hxx
>@@ -80,8 +80,8 @@ public:
>     void SetSizeProtect ( BOOL bNew ) { bSize  = bNew; }
>     void SetPosProtect  ( BOOL bNew ) { bPos   = bNew; }
> 
>-    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 );
> };
> 
> inline SvxProtectItem::SvxProtectItem( const USHORT nId )
>diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
>index 0f231ac..1664d11 100644
>--- a/editeng/inc/editeng/shaditem.hxx
>+++ b/editeng/inc/editeng/shaditem.hxx
>@@ -67,8 +67,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
>index ef2b00b..2de7ff0 100644
>--- a/editeng/inc/editeng/sizeitem.hxx
>+++ b/editeng/inc/editeng/sizeitem.hxx
>@@ -55,8 +55,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
>index 6ed88c9..9590639 100644
>--- a/editeng/inc/editeng/tstpitem.hxx
>+++ b/editeng/inc/editeng/tstpitem.hxx
>@@ -165,8 +165,8 @@ public:
> 
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
>index aede998..c3ecee2 100644
>--- a/editeng/inc/editeng/twolinesitem.hxx
>+++ b/editeng/inc/editeng/twolinesitem.hxx
>@@ -61,9 +61,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
> 
>-    virtual	sal_Bool       	QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	sal_Bool		PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>     virtual USHORT			GetVersion( USHORT nFFVer ) const;
>diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
>index c4307ac..d8ab950 100644
>--- a/editeng/inc/editeng/udlnitem.hxx
>+++ b/editeng/inc/editeng/udlnitem.hxx
>@@ -65,9 +65,9 @@ public:
>     virtual String			GetValueTextByPos( USHORT nPos ) const;
>     virtual USHORT          GetValueCount() const;
> 
>-    virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	sal_Bool		PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>     // MS VC4.0 kommt durcheinander
>diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
>index 209cb92..790cb1c 100644
>--- a/editeng/inc/editeng/ulspitem.hxx
>+++ b/editeng/inc/editeng/ulspitem.hxx
>@@ -62,8 +62,8 @@ public:
>     // "pure virtual Methoden" vom SfxPoolItem
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
>index ef18c3a..4c68565 100644
>--- a/editeng/inc/editeng/wghtitem.hxx
>+++ b/editeng/inc/editeng/wghtitem.hxx
>@@ -66,8 +66,8 @@ public:
>     virtual String			GetValueTextByPos( USHORT nPos ) const;
>     virtual USHORT			GetValueCount() 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 );
> 
>     virtual int 			HasBoolValue() const;
>     virtual BOOL			GetBoolValue() const;
>diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
>index 7c33fc7..2f6bcf2 100644
>--- a/editeng/inc/editeng/writingmodeitem.hxx
>+++ b/editeng/inc/editeng/writingmodeitem.hxx
>@@ -58,9 +58,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper * = 0 ) const;
> 
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId );
>-    virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const;
> };
> 
>diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
>index 2e283e5..cfcfce0 100644
>--- a/editeng/inc/editeng/xmlcnitm.hxx
>+++ b/editeng/inc/editeng/xmlcnitm.hxx
>@@ -62,8 +62,8 @@ public:
> 
>     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
>     { return new SvXMLAttrContainerItem( *this ); }
>diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
>index a7cc6bd..59fa631 100644
>--- a/editeng/source/items/frmitems.cxx
>+++ b/editeng/source/items/frmitems.cxx
>@@ -218,7 +218,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -235,13 +235,13 @@ sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_SIZE_SIZE:  rVal <<= aTmp;	break;
>         case MID_SIZE_WIDTH: rVal <<= aTmp.Width; break;
>         case MID_SIZE_HEIGHT: rVal <<= aTmp.Height;  break;
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -262,7 +262,7 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             }
>             else
>             {
>-                return sal_False;
>+                return false;
>             }
>         }
>         break;
>@@ -270,7 +270,7 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             sal_Int32 nVal = 0;
>             if(!(rVal >>= nVal ))
>-                return sal_False;
>+                return false;
> 
>             aSize.Width() = bConvert ? MM100_TO_TWIP(nVal) : nVal;
>         }
>@@ -279,15 +279,15 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             sal_Int32 nVal = 0;
>             if(!(rVal >>= nVal))
>-                return sal_True;
>+                return true;
> 
>             aSize.Height() = bConvert ? MM100_TO_TWIP(nVal) : nVal;
>         }
>         break;
>         default: DBG_ERROR("Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -430,9 +430,9 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>     switch( nMemberId )
>@@ -468,14 +468,14 @@ sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
> 
>         default:
>-            bRet = sal_False;
>+            bRet = false;
>             DBG_ERROR("unknown MemberId");
>     }
>     return bRet;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -510,7 +510,7 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                     nPropRightMargin = (USHORT)nRel;
>             }
>             else
>-                return FALSE;
>+                return false;
>         }
>         break;
>         case MID_FIRST_LINE_INDENT	   :
>@@ -527,9 +527,9 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> 
>         default:
>             DBG_ERROR("unknown MemberId");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -824,9 +824,9 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>-    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>+    bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>     switch( nMemberId )
>     {
>@@ -846,11 +846,11 @@ sal_Bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_UP_REL_MARGIN: rVal <<= (sal_Int16) nPropUpper; break;
>         case MID_LO_REL_MARGIN: rVal <<= (sal_Int16) nPropLower; break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -861,7 +861,7 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale;
>             if ( !(rVal >>= aUpperLowerMarginScale ))
>-                return sal_False;
>+                return false;
>             {
>                 SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP( aUpperLowerMarginScale.Upper ) : aUpperLowerMarginScale.Upper));
>                 SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP( aUpperLowerMarginScale.Lower ) : aUpperLowerMarginScale.Lower));
>@@ -874,12 +874,12 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> 
>         case MID_UP_MARGIN :
>             if(!(rVal >>= nVal) || nVal < 0)
>-                return sal_False;
>+                return false;
>             SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
>             break;
>         case MID_LO_MARGIN :
>             if(!(rVal >>= nVal) || nVal < 0)
>-                return sal_False;
>+                return false;
>             SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
>             break;
>         case MID_UP_REL_MARGIN:
>@@ -894,16 +894,16 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                     nPropLower = (USHORT)nRel;
>             }
>             else
>-                return FALSE;
>+                return false;
>         }
>         break;
> 
> 
>         default:
>             DBG_ERROR("unknown MemberId");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -1167,7 +1167,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
> 
> /*-----------------16.03.98 12:42-------------------
> --------------------------------------------------*/
>-sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1179,16 +1179,16 @@ sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_PROTECT_POSITION:  bValue = bPos; break;
>         default:
>             DBG_ERROR("falsche MemberId");
>-            return sal_False;
>+            return false;
>     }
> 
>     rVal = Bool2Any( bValue );
>-    return sal_True;
>+    return true;
> }
> /*-----------------16.03.98 12:42-------------------
> 
> --------------------------------------------------*/
>-sal_Bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1200,9 +1200,9 @@ sal_Bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         case MID_PROTECT_POSITION:  bPos   = bVal;	break;
>         default:
>             DBG_ERROR("falsche MemberId");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -1297,7 +1297,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1324,20 +1324,20 @@ sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_TRANSPARENT: rVal <<= aShadow.IsTransparent; break;
>         case MID_BG_COLOR: rVal <<= aShadow.Color; break;
>         case 0: rVal <<= aShadow; break;
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
> 
>     table::ShadowFormat aShadow;
>     uno::Any aAny;
>-    sal_Bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
>+    bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
>     switch ( nMemberId )
>     {
>         case MID_LOCATION:
>@@ -1842,7 +1842,7 @@ table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool
>     return aLine;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>+bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     table::BorderLine aRetLine;
>@@ -1929,7 +1929,7 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>             rVal <<= aRetLine;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -1945,7 +1945,7 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     sal_uInt16 nLine = BOX_LINE_TOP;
>@@ -2779,7 +2779,7 @@ void SvxBoxInfoItem::ResetFlags()
>     nValidFlags = 0x7F;	// alles g"ultig au/ser Disable
> }
> 
>-sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>+bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     table::BorderLine aRetLine;
>@@ -2836,7 +2836,7 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>             bIntMember = sal_True;
>             rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED(GetDefDist()) : GetDefDist());
>             break;
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>     if( !bIntMember )
>@@ -2856,12 +2856,12 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
>             rVal <<= aRetLine;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
> //  sal_uInt16 nLine = BOX_LINE_TOP;
>@@ -3064,7 +3064,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     style::BreakType eBreak = style::BreakType_NONE;
>     switch ( (SvxBreak)GetValue() )
>@@ -3078,10 +3078,10 @@ sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>         default: ;//prevent warning
>     }
>     rVal <<= eBreak;
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     style::BreakType nBreak;
> 
>@@ -3107,7 +3107,7 @@ sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>     }
>     SetValue((sal_uInt16) eBreak);
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -3266,14 +3266,14 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
>     return new SvxLineItem( *this );
> }
> 
>-sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
>+bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
> {
>     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
>     nMemId &= ~CONVERT_TWIPS;
>     if ( nMemId == 0 )
>     {
>         rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
>-        return sal_True;
>+        return true;
>     }
>     else if ( pLine )
>     {
>@@ -3285,16 +3285,16 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
>             case MID_DISTANCE:  	rVal <<= sal_Int32(pLine->GetDistance()); 	break;
>             default:
>                 DBG_ERROR( "Wrong MemberId" );
>-                return sal_False;
>+                return false;
>         }
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
>+bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
> {
>     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
>     nMemId &= ~CONVERT_TWIPS;
>@@ -3308,9 +3308,9 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
>                 pLine = new SvxBorderLine;
>             if( !SvxBoxItem::LineToSvxLine(aLine, *pLine, bConvert) )
>                 DELETEZ( pLine );
>-            return sal_True;
>+            return true;
>         }
>-        return sal_False;
>+        return false;
>     }
>     else if ( rVal >>= nVal )
>     {
>@@ -3328,10 +3328,10 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
>                 return sal_False;
>         }
> 
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //------------------------------------------------------------------------
>@@ -3701,7 +3701,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
>     return (sal_Int8)((nTrans * 100 + 127) / 254);
> }
> 
>-sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -3758,12 +3758,12 @@ sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         break;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -3874,7 +3874,7 @@ sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         break;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -4394,7 +4394,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
>     return eRet;
> }
> 
>-sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                              BYTE )
> {
>     sal_Int16 nVal = sal_Int16();
>@@ -4420,7 +4420,7 @@ sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
>                 SetValue( FRMDIR_ENVIRONMENT );
>                 break;
>             default:
>-                bRet = sal_False;
>+                bRet = false;
>                 break;
>         }
>     }
>@@ -4428,12 +4428,12 @@ sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
>     return bRet;
> }
> 
>-sal_Bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                             BYTE ) const
> {
>     // translate SvxFrameDirection into WritingDirection2
>     sal_Int16 nVal;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch( GetValue() )
>     {
>         case FRMDIR_HORI_LEFT_TOP:
>@@ -4453,7 +4453,7 @@ sal_Bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
>             break;
>         default:
>             DBG_ERROR("Unknown SvxFrameDirection value!");
>-            bRet = sal_False;
>+            bRet = false;
>             break;
>     }
> 
>diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
>index fd4ccfa..af5fb3a 100644
>--- a/editeng/source/items/numitem.cxx
>+++ b/editeng/source/items/numitem.cxx
>@@ -1226,13 +1226,13 @@ SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )
>  *
>  * --------------------------------------------------*/
> 
>-sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= SvxCreateNumRule( pNumRule );
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     uno::Reference< container::XIndexReplace > xRule;
>     if( rVal >>= xRule )
>@@ -1249,13 +1249,13 @@ sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>             }
>             delete pNumRule;
>             pNumRule = pNewRule;
>-            return sal_True;
>+            return true;
>         }
>         catch(lang::IllegalArgumentException&)
>         {
>         }
>     }
>-    return sal_False;
>+    return false;
> }
> 
> /* -----------------08.12.98 10:43-------------------
>diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
>index 217bdf3..9c7d67c 100644
>--- a/editeng/source/items/paraitem.cxx
>+++ b/editeng/source/items/paraitem.cxx
>@@ -148,7 +148,7 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
>         - ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
> 
> --------------------------------------------------*/
>-sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -190,12 +190,12 @@ sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         default: DBG_ERROR("Wrong MemberId!"); break;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> /*-----------------18.03.98 16:32-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -390,7 +390,7 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
> /*-----------------18.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -406,13 +406,13 @@ sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         }
>         default: ;//prevent warning
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------18.03.98 16:15-------------------
> 
> --------------------------------------------------*/
> 
>-sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>+bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -445,7 +445,7 @@ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>             bOneBlock = Any2Bool(rVal);
>             break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -709,7 +709,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -728,10 +728,10 @@ sal_Bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (sal_Int16)nMaxHyphens;
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -739,7 +739,7 @@ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> 
>     if( nMemberId != MID_IS_HYPHEN )
>         if(!(rVal >>= nNewVal))
>-            return sal_False;
>+            return false;
> 
>     switch(nMemberId)
>     {
>@@ -756,7 +756,7 @@ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             nMaxHyphens = (BYTE)nNewVal;
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -1015,7 +1015,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
> 
> --------------------------------------------------*/
> 
>-sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1059,7 +1059,7 @@ sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> 
> --------------------------------------------------*/
> 
>-sal_Bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1380,7 +1380,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1395,7 +1395,7 @@ sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMem
>     return sal_True;
> }
> 
>-sal_Bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1675,14 +1675,14 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
>     return SFX_ITEM_PRESENTATION_NONE;
> }
> 
>-sal_Bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                            BYTE /*nMemberId*/ ) const
> {
>     rVal <<= (sal_Int16)GetValue();
>     return sal_True;
> }
> 
>-sal_Bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                          BYTE /*nMemberId*/ )
> {
>     sal_Int16 nVal = sal_Int16();
>diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
>index 6b21048..6d749b3 100644
>--- a/editeng/source/items/textitem.cxx
>+++ b/editeng/source/items/textitem.cxx
>@@ -209,10 +209,10 @@ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
>     return( pFontList == ((SvxFontListItem&)rAttr).pFontList );
> }
> 
>-sal_Bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= aFontNameSeq;
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -257,7 +257,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -284,10 +284,10 @@ sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_FONT_CHAR_SET  : rVal <<= (sal_Int16)(eTextEncoding);	break;
>         case MID_FONT_PITCH     : rVal <<= (sal_Int16)(ePitch);	break;
>     }
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -347,7 +347,7 @@ sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -575,7 +575,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
> /*-----------------13.03.98 14:28-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -588,12 +588,12 @@ sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (awt::FontSlant)GetValue();	// Werte von awt::FontSlant und FontItalic sind gleich
>             break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 14:28-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -616,7 +616,7 @@ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             SetValue((USHORT)eSlant);
>         }
>     }
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
> 
>@@ -627,7 +627,7 @@ int SvxPostureItem::HasBoolValue() const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxPostureItem::GetBoolValue() const
>+BOOL SvxPostureItem::GetBoolValue() const
> {
>     return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE );
> }
>@@ -735,7 +735,7 @@ XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
> /*-----------------13.03.98 14:18-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -750,12 +750,12 @@ sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 14:18-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -778,7 +778,7 @@ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // class SvxFontHeightItem -----------------------------------------------
>@@ -857,7 +857,7 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
> /*-----------------13.03.98 14:53-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     //	In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
>     //	gesteuert, ob der Wert im Item 1/100mm oder Twips sind.
>@@ -995,7 +995,7 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
> /*-----------------13.03.98 14:53-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1252,7 +1252,7 @@ int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
> /*-----------------13.03.98 16:03-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1265,12 +1265,12 @@ sal_Bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (sal_Int16)(nProp);
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 16:03-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1287,7 +1287,7 @@ sal_Bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             nWidth = nVal;
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -1425,7 +1425,7 @@ XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
> /*-----------------13.03.98 16:25-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1444,13 +1444,13 @@ sal_Bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         rVal = Bool2Any( !mColor.GetTransparency() );
>         break;
>     }
>-    return sal_True;
>+    return true;
> 
> }
> /*-----------------13.03.98 16:28-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1658,7 +1658,7 @@ XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
> /*-----------------13.03.98 16:28-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1671,12 +1671,12 @@ sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (sal_Int16)(GetValue());
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2047,22 +2047,22 @@ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= (sal_Int32)(mColor.GetColor());
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     sal_Int32 nColor = 0;
>     if(!(rVal >>= nColor))
>         return sal_False;
> 
>     mColor.SetColor( nColor );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>@@ -2277,24 +2277,24 @@ SfxItemPresentation SvxKerningItem::GetPresentation
> /* -----------------------------19.02.01 12:21--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-sal_Bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Int16 nVal = GetValue();
>     if(nMemberId & CONVERT_TWIPS)
>         nVal = (sal_Int16)TWIP_TO_MM100(nVal);
>     rVal <<= nVal;
>-    return sal_True;
>+    return true;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
>+bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
> {
>     sal_Int16 nVal = sal_Int16();
>     if(!(rVal >>= nVal))
>-        return sal_False;
>+        return false;
>     if(nMemberId & CONVERT_TWIPS)
>         nVal = (sal_Int16)MM100_TO_TWIP(nVal);
>     SetValue(nVal);
>-    return sal_True;
>+    return true;
> }
> 
> // class SvxCaseMapItem --------------------------------------------------
>@@ -2370,7 +2370,7 @@ XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     sal_Int16 nRet = style::CaseMap::NONE;
>     switch( GetValue() )
>@@ -2382,12 +2382,12 @@ sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>         case SVX_CASEMAP_KAPITAELCHEN:      nRet = style::CaseMap::SMALLCAPS; break;
>     }
>     rVal <<= (sal_Int16)(nRet);
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 16:29-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     sal_uInt16 nVal = sal_uInt16();
>     if(!(rVal >>= nVal))
>@@ -2402,7 +2402,7 @@ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>     case style::CaseMap::SMALLCAPS:  nVal = SVX_CASEMAP_KAPITAELCHEN; break;
>     }
>     SetValue(nVal);
>-    return sal_True;
>+    return true;
> }
> 
> // class SvxEscapementItem -----------------------------------------------
>@@ -2552,7 +2552,7 @@ void SvxEscapementItem::SetEnumValue( USHORT nVal )
> /*-----------------13.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2568,12 +2568,12 @@ sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal = Bool2Any(DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc);
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------13.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2615,7 +2615,7 @@ sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // class SvxLanguageItem -------------------------------------------------
>@@ -2693,7 +2693,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
> /*-----------------14.03.98 14:13-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2707,12 +2707,12 @@ sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= aRet;
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------14.03.98 14:13-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2722,7 +2722,7 @@ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             sal_Int32 nValue = 0;
>             if(!(rVal >>= nValue))
>-                return sal_False;
>+                return false;
> 
>             SetValue((sal_Int16)nValue);
>         }
>@@ -2740,11 +2740,11 @@ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // class SvxNoLinebreakItem ----------------------------------------------
>-SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const USHORT nId ) :
>+SvxNoLinebreakItem::SvxNoLinebreakItem( const BOOL bBreak, const USHORT nId ) :
>       SfxBoolItem( nId, bBreak )
> {
> }
>@@ -3021,7 +3021,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -3045,14 +3045,14 @@ sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>     }
>     break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    sal_Bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_EMPHASIS:
>@@ -3070,7 +3070,7 @@ sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             case FontEmphasis::CIRCLE_BELOW: nValue = EMPHASISMARK_CIRCLE|EMPHASISMARK_POS_BELOW; break;
>             case FontEmphasis::DISK_BELOW  : nValue = EMPHASISMARK_DISC|EMPHASISMARK_POS_BELOW;   break;
>             case FontEmphasis::ACCENT_BELOW: nValue = EMPHASISMARK_ACCENT|EMPHASISMARK_POS_BELOW; break;
>-            default: return sal_False;
>+            default: return false;
>         }
>         SetValue( (sal_Int16)nValue );
>     }
>@@ -3126,12 +3126,12 @@ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
>     return new SvxTwoLinesItem( *this );
> }
> 
>-sal_Bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    sal_Bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_TWOLINES:
>@@ -3154,13 +3154,13 @@ sal_Bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
>         }
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>         break;
>     }
>     return bRet;
> }
> 
>-sal_Bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -3312,12 +3312,12 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
>     return SFX_ITEM_PRESENTATION_NONE;
> }
> 
>-sal_Bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                 BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_ROTATE:
>@@ -3327,18 +3327,18 @@ sal_Bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
>         rVal = Bool2Any( IsFitToLine() );
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>         break;
>     }
>     return bRet;
> }
> 
>-sal_Bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                     BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_ROTATE:
>@@ -3355,7 +3355,7 @@ sal_Bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
>         SetFitToLine( Any2Bool( rVal ) );
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>     }
>     return bRet;
> }
>@@ -3455,7 +3455,7 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
>     return SFX_ITEM_PRESENTATION_NONE;
> }
> 
>-sal_Bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
>     // where we still want this to be a sal_Int16
>@@ -3463,19 +3463,19 @@ sal_Bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId
>     if (rVal >>= nValue)
>     {
>         SetValue( (UINT16) nValue );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
>-sal_Bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
>     // where we still want this to be a sal_Int16
>     rVal <<= (sal_Int16)GetValue();
>-    return TRUE;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -3550,12 +3550,12 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation
>     return eRet;
> }
> 
>-sal_Bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_RELIEF:
>@@ -3565,29 +3565,29 @@ sal_Bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
>             if(nVal >= 0 && nVal <= RELIEF_ENGRAVED)
>                 SetValue( (USHORT)nVal );
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>         break;
>     }
>     return bRet;
> }
> 
>-sal_Bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch( nMemberId )
>     {
>     case MID_RELIEF:
>         rVal <<= (sal_Int16)GetValue();
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>         break;
>     }
>     return bRet;
>diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
>index 732664f..3b87106 100644
>--- a/editeng/source/items/writingmodeitem.cxx
>+++ b/editeng/source/items/writingmodeitem.cxx
>@@ -104,10 +104,10 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
>     return eRet;
> }
> 
>-sal_Bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     sal_Int32 nVal = 0;
>-    sal_Bool bRet = ( rVal >>= nVal );
>+    bool bRet = ( rVal >>= nVal );
> 
>     if( !bRet )
>     {
>@@ -139,7 +139,7 @@ sal_Bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
>     return bRet;
> }
> 
>-sal_Bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                             BYTE ) const
> {
>     rVal <<= (WritingMode)GetValue();
>diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
>index 843106b..09e8172 100644
>--- a/editeng/source/items/xmlcnitm.cxx
>+++ b/editeng/source/items/xmlcnitm.cxx
>@@ -90,15 +90,16 @@ USHORT SvXMLAttrContainerItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
>     return USHRT_MAX;
> }
> 
>-BOOL  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     Reference<XNameContainer> xContainer =
>         new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
> 
>     rVal.setValue( &xContainer, ::getCppuType((Reference<XNameContainer>*)0) );
>-    return TRUE;
>+    return true;
> }
>-BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+
>+bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     Reference<XInterface> xRef;
>     SvUnoAttributeContainer* pContainer = NULL;
>@@ -174,16 +175,16 @@ BOOL SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
>             else
>             {
>                 delete pNewImpl;
>-                return FALSE;
>+                return false;
>             }
>         }
>         catch(...)
>         {
>             delete pNewImpl;
>-            return FALSE;
>+            return false;
>         }
>     }
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
>index 45a087b..b64be52 100644
>--- a/sfx2/inc/sfx2/dinfdlg.hxx
>+++ b/sfx2/inc/sfx2/dinfdlg.hxx
>@@ -162,8 +162,8 @@ public:
> 
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
>     virtual int             operator==( const SfxPoolItem& ) 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 );
> };
> 
> // class SfxDocumentPage -------------------------------------------------
>diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
>index fe47d46..ecc16b4 100644
>--- a/sfx2/inc/sfx2/frame.hxx
>+++ b/sfx2/inc/sfx2/frame.hxx
>@@ -267,8 +267,8 @@ public:
>     virtual String			GetValueText() const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
> 
>     sal_Bool                FrameKilled() const { return &wFrame != pFrame; }
> 
>@@ -286,8 +286,8 @@ public:
>                                 { return aValue; }
>     virtual int                 operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) 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 );
> };
> 
> class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
>@@ -304,8 +304,8 @@ public:
>                                 { return m_xFrame; }
>     virtual int                 operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) 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 );
> };
> 
> typedef SfxUsrAnyItem SfxUnoAnyItem;
>diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
>index 8e4dde2..0962a95 100644
>--- a/sfx2/inc/sfx2/objsh.hxx
>+++ b/sfx2/inc/sfx2/objsh.hxx
>@@ -882,8 +882,8 @@ public:
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual String			GetValueText() const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>     SfxObjectShell* 		GetObjectShell() const
>                             { return pObjSh; }
> 
>diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
>index 81b296b..8fa9300 100644
>--- a/sfx2/inc/sfx2/viewfrm.hxx
>+++ b/sfx2/inc/sfx2/viewfrm.hxx
>@@ -342,7 +342,7 @@ public:
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
> 
>-    virtual	sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>     const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
> };
> 
>diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
>index 61c8894..a2dc897 100644
>--- a/sfx2/inc/sorgitm.hxx
>+++ b/sfx2/inc/sorgitm.hxx
>@@ -45,8 +45,8 @@ public:
> 
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
>     virtual int             operator==( const SfxPoolItem& ) 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 );
>     String  getLanguage() { return aLanguage; };
> };
> 
>diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx
>index fdff95c..6656273 100644
>--- a/sfx2/inc/tplpitem.hxx
>+++ b/sfx2/inc/tplpitem.hxx
>@@ -49,8 +49,8 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual BYTE 			GetFlagCount() 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
>diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
>index 3a14ccc..5c09b9d 100644
>--- a/sfx2/source/control/sorgitm.cxx
>+++ b/sfx2/source/control/sorgitm.cxx
>@@ -88,7 +88,7 @@ int SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
> }
> 
> 
>-sal_Bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     String aValue;
>     BOOL bIsString = FALSE;
>@@ -103,20 +103,20 @@ sal_Bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYT
>             break;
>         default:
>             DBG_ERROR("Wrong MemberId!");
>-               return sal_False;
>+               return false;
>      }
> 
>     if ( bIsString )
>         rVal <<= ::rtl::OUString( aValue );
>     else
>         rVal <<= bValue;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     ::rtl::OUString aValue;
>-    sal_Bool bRet = sal_False;
>+    sal_Bool bRet = false;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>     {
>@@ -128,7 +128,7 @@ sal_Bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal,
>             break;
>         default:
>             DBG_ERROR("Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>     return bRet;
>diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
>index 521a6c3..24d2950 100755
>--- a/sfx2/source/dialog/dinfdlg.cxx
>+++ b/sfx2/source/dialog/dinfdlg.cxx
>@@ -510,7 +510,7 @@ void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const
>     m_aCustomProperties.push_back( pProp );
> }
> 
>-sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>+bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
> {
>     String aValue;
>     sal_Int32 nValue = 0;
>@@ -568,15 +568,15 @@ sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>         rVal <<= nValue;
>     else
>         rVal <<= bValue;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId )
>+bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId )
> {
>     ::rtl::OUString aValue;
>     sal_Int32 nValue=0;
>     sal_Bool bValue = sal_False;
>-    sal_Bool bRet = sal_False;
>+    bool bRet = false;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>     {
>@@ -633,7 +633,7 @@ sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             DBG_ERROR("Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>     return bRet;
>diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
>index fc67ac6..83cd240 100644
>--- a/sfx2/source/dialog/tplpitem.cxx
>+++ b/sfx2/source/dialog/tplpitem.cxx
>@@ -87,19 +87,19 @@ SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const
> }
> 
> //-------------------------------------------------------------------------
>-sal_Bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     ::com::sun::star::frame::status::Template aTemplate;
>-    
>+
>     aTemplate.Value = GetValue();
>     aTemplate.StyleName = aStyle;
>     rVal <<= aTemplate;
> 
>-    return sal_True;
>+    return true;
> }
> 
> //-------------------------------------------------------------------------
>-sal_Bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     ::com::sun::star::frame::status::Template aTemplate;
> 
>@@ -107,10 +107,10 @@ sal_Bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
>     {
>         SetValue( sal::static_int_cast< USHORT >( aTemplate.Value ) );
>         aStyle = aTemplate.StyleName;
>-        return sal_True;
>+        return true;
>     }
>-    
>-    return sal_False;
>+
>+    return false;
> }
> 
> //-------------------------------------------------------------------------
>diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
>index a53a985..0b1e6b3 100644
>--- a/sfx2/source/doc/objitem.cxx
>+++ b/sfx2/source/doc/objitem.cxx
>@@ -64,7 +64,7 @@ SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const
> 
> //--------------------------------------------------------------------
> 
>-sal_Bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     if ( pObjSh )
>     {
>@@ -76,12 +76,12 @@ sal_Bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*
>     {
>         rVal <<= ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >();
>     }
>-    return TRUE;
>+    return true;
> }
> 
> //--------------------------------------------------------------------
> 
>-sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This item MUST have a model. Please don't change this, there are UNO-based
>     // implementations which need it!!
>@@ -91,7 +91,7 @@ sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
>     {
>         if ( xModel.is() )
>         {
>-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel( 
>+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel(
>                 xModel, ::com::sun::star::uno::UNO_QUERY );
>             if ( xTunnel.is() )
>             {
>@@ -100,16 +100,16 @@ sal_Bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
>                 if ( nHandle )
>                 {
>                     pObjSh = reinterpret_cast< SfxObjectShell* >(sal::static_int_cast<sal_IntPtr>( nHandle ));
>-                    return TRUE;
>+                    return true;
>                 }
>             }
>         }
>-        
>+
>         pObjSh = 0;
>-        return TRUE;
>+        return true;
>     }
> 
>-    return FALSE;
>+    return true;
> }
> 
> //=========================================================================
>diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
>index 3b34d14..1f85084 100644
>--- a/sfx2/source/view/frame.cxx
>+++ b/sfx2/source/view/frame.cxx
>@@ -592,7 +592,7 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const
>     return pNew;
> }
> 
>-sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     if ( wFrame )
>     {
>@@ -603,7 +603,7 @@ sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>     return FALSE;
> }
> 
>-sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     Reference < XFrame > xFrame;
>     if ( (rVal >>= xFrame) && xFrame.is() )
>@@ -643,13 +643,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const
>     return new SfxUsrAnyItem( Which(), aValue );
> }
> 
>-sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal = aValue;
>     return sal_True;
> }
> 
>-sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     aValue = rVal;
>     return sal_True;
>@@ -677,13 +677,13 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const
>     return new SfxUnoFrameItem( Which(), m_xFrame );
> }
> 
>-sal_Bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= m_xFrame;
>     return sal_True;
> }
> 
>-sal_Bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     return ( rVal >>= m_xFrame );
> }
>diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx
>index 129e7e7..121196f 100644
>--- a/svx/inc/chrtitem.hxx
>+++ b/svx/inc/chrtitem.hxx
>@@ -274,8 +274,8 @@ public:
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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 );
> 
>     USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
>     SvxChartTextOrder GetValue() const
>@@ -355,11 +355,8 @@ public:
>     SvxDoubleItem(SvStream& rIn, USHORT nId );
>     SvxDoubleItem(const SvxDoubleItem& rItem);
> 
>-
>-    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 );
> 
>     virtual String GetValueText() const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
>diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx
>index a55b929..7d152ce 100644
>--- a/svx/inc/clipfmtitem.hxx
>+++ b/svx/inc/clipfmtitem.hxx
>@@ -50,9 +50,9 @@ public:
>     SvxClipboardFmtItem( const SvxClipboardFmtItem& );
>     virtual ~SvxClipboardFmtItem();
> 
>-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>-    virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
>-    
>+    virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>+    virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
>+
>     void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX );
>     void AddClipbrdFormat( ULONG nId, const String& rName,
>                             USHORT nPos = USHRT_MAX );
>diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx
>index 2a816bc..c6bd05c 100644
>--- a/svx/inc/drawitem.hxx
>+++ b/svx/inc/drawitem.hxx
>@@ -58,8 +58,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XColorTable*			GetColorTable() const { return pColorTable; }
>     void			 		SetColorTable( XColorTable* pTable ) {
>@@ -92,8 +92,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XGradientList*			GetGradientList() const { return pGradientList; }
>     void			 		SetGradientList( XGradientList* pList ) {
>@@ -127,8 +127,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XHatchList*				GetHatchList() const { return pHatchList; }
>     void			 		SetHatchList( XHatchList* pList ) {
>@@ -162,8 +162,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XBitmapList*			GetBitmapList() const { return pBitmapList; }
>     void			 		SetBitmapList( XBitmapList* pList ) {
>@@ -197,8 +197,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XDashList*	  			GetDashList() const { return pDashList; }
>     void			 		SetDashList( XDashList* pList );
>@@ -231,8 +231,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) 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 );
>+    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 );
> 
>     XLineEndList*			GetLineEndList() const { return pLineEndList; }
>     void			 		SetLineEndList( XLineEndList* pList ) {
>diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
>index 1beecda..4eba5c2 100644
>--- a/svx/inc/hlnkitem.hxx
>+++ b/svx/inc/hlnkitem.hxx
>@@ -74,8 +74,8 @@ public:
> 
>     virtual int 			 operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
>-    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 );
>+    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 );
> 
>     const	String& GetName() const { return sName; }
>     void	SetName(const String& rName) { sName = rName; }
>diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
>index 6b281d3..090f5b4 100644
>--- a/svx/inc/rotmodit.hxx
>+++ b/svx/inc/rotmodit.hxx
>@@ -60,8 +60,8 @@ public:
>                                                  SfxMapUnit eCoreMetric,
>                                                  SfxMapUnit ePresMetric,
>                                                  String& rText, const IntlWrapper * = 0 ) 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 );
> };
> 
> 
>diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
>index 7a3d42e..1d2a2b8 100644
>--- a/svx/inc/rulritem.hxx
>+++ b/svx/inc/rulritem.hxx
>@@ -44,8 +44,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
>   protected:
> 
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual String			 GetValueText() const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>@@ -80,8 +80,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
>   protected:
> 
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual String			 GetValueText() const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>@@ -115,8 +115,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
>     long lHeight;
> protected:
>     virtual int 			 operator==( const SfxPoolItem& ) 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 );
> 
>     virtual String			 GetValueText() const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>@@ -210,8 +210,8 @@ protected:
>                                     String &rText, const IntlWrapper * = 0 ) const;
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) 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 );
> public:
>     TYPEINFO();
>     // rechter Rand des umgebenden Rahmens
>@@ -274,8 +274,8 @@ protected:
>                                     String &rText, const IntlWrapper * = 0 ) const;
> 
>     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) 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 );
> private:
>     SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
> public:
>diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
>index d6ad34e..692ad17 100644
>--- a/svx/inc/svx/SmartTagItem.hxx
>+++ b/svx/inc/svx/SmartTagItem.hxx
>@@ -78,8 +78,8 @@ public:
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*	 Create(SvStream &, USHORT) const; // leer
>     virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const; // leer 
>-    virtual	sal_Bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
>-    virtual	sal_Bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
>+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
>+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
> 
>     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; }
>     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; }
>diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
>index faf381d..cb76d2f 100644
>--- a/svx/inc/svx/algitem.hxx
>+++ b/svx/inc/svx/algitem.hxx
>@@ -57,8 +57,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual String          GetValueText( USHORT nVal ) const;
>@@ -92,8 +92,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual String          GetValueText( USHORT nVal ) const;
>@@ -128,8 +128,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
> 
>     virtual USHORT          GetValueCount() const;
>     virtual String          GetValueText( USHORT nVal ) const;
>@@ -176,8 +176,8 @@ public:
>     virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
>     virtual SvStream&		 Store( SvStream&, USHORT nItemVersion ) 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 );
> 
>             INT16           GetLeftMargin() const {return nLeftMargin; }
>             BOOL            SetLeftMargin(INT16 nLeft);
>diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
>index 5d22acf..9702889 100644
>--- a/svx/inc/svx/e3ditem.hxx
>+++ b/svx/inc/svx/e3ditem.hxx
>@@ -54,8 +54,8 @@ public:
>     virtual SfxPoolItem*	Create(SvStream &, USHORT nVersion) const;
>     virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) 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 );
> 
>     const basegfx::B3DVector&			GetValue() const { return aVal; }
>             void			SetValue( const basegfx::B3DVector& rNewVal ) {
>diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
>index f25d37c..04ac8b7 100644
>--- a/svx/inc/svx/grfcrop.hxx
>+++ b/svx/inc/svx/grfcrop.hxx
>@@ -53,10 +53,10 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     void SetLeft( sal_Int32 nVal )		{ nLeft = nVal; }
>     void SetRight( sal_Int32 nVal )		{ nRight = nVal; }
>diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
>index d2921d1..9a7c294 100644
>--- a/svx/inc/svx/pageitem.hxx
>+++ b/svx/inc/svx/pageitem.hxx
>@@ -98,8 +98,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) 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 );
>     virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
>     virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
> 
>diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
>index 81abd5e..d163c86 100644
>--- a/svx/inc/svx/sdasaitm.hxx
>+++ b/svx/inc/svx/sdasaitm.hxx
>@@ -64,8 +64,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
>             virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
>             virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) 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 );
> 
> 
> #ifdef SDR_ISPOOLABLE
>diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
>index c0a4aac..40d63cb 100644
>--- a/svx/inc/svx/sdasitm.hxx
>+++ b/svx/inc/svx/sdasitm.hxx
>@@ -99,8 +99,8 @@ private:
>             virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
>             virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) 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 );
> 
>             const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
> 
>diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
>index 122e38c..812ada2 100644
>--- a/svx/inc/svx/sdggaitm.hxx
>+++ b/svx/inc/svx/sdggaitm.hxx
>@@ -48,8 +48,8 @@ public:
>     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 // _SDGGAITM_HXX
>diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
>index 66eded4..bf16e93 100644
>--- a/svx/inc/svx/sdtaditm.hxx
>+++ b/svx/inc/svx/sdtaditm.hxx
>@@ -50,8 +50,8 @@ public:
>     virtual USHORT         GetValueCount() const; // { return 4; }
>     SdrTextAniDirection GetValue() const      { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
> 
>diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
>index 07a823d..c4f24a9 100644
>--- a/svx/inc/svx/sdtaitm.hxx
>+++ b/svx/inc/svx/sdtaitm.hxx
>@@ -52,8 +52,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextVertAdjust GetValue() const      { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>@@ -79,8 +79,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextHorzAdjust GetValue() const      { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
>index bf6b495..822e9f8 100644
>--- a/svx/inc/svx/sdtakitm.hxx
>+++ b/svx/inc/svx/sdtakitm.hxx
>@@ -95,8 +95,8 @@ public:
>     virtual USHORT            GetValueCount() const; // { return 5; }
>             SdrTextAniKind GetValue() const      { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
>index a551bcc..d6a217b 100644
>--- a/svx/inc/svx/sdtfchim.hxx
>+++ b/svx/inc/svx/sdtfchim.hxx
>@@ -46,8 +46,8 @@ public:
>     SVX_DLLPRIVATE virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
>     SVX_DLLPRIVATE virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
> 
>-    SVX_DLLPRIVATE virtual	sal_Bool			QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool			PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
> 
> #ifdef SDR_ISPOOLABLE
>     SVX_DLLPRIVATE virtual int IsPoolable() const;
>diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
>index f3889f0..d64a8a6 100644
>--- a/svx/inc/svx/sdtfsitm.hxx
>+++ b/svx/inc/svx/sdtfsitm.hxx
>@@ -60,8 +60,8 @@ public:
>     virtual USHORT           GetValueCount() const; // { return 4; }
>             SdrFitToSizeType GetValue() const      { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
>index 81bb8a9..84d8b5b 100644
>--- a/svx/inc/svx/svx3ditems.hxx
>+++ b/svx/inc/svx/svx3ditems.hxx
>@@ -87,8 +87,8 @@ public:
>     Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::NormalsKind
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -102,8 +102,8 @@ public:
>     Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::TextureProjectionMode
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -112,8 +112,8 @@ public:
>     Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
> 
>     // use drawing::TextureProjectionMode
>-    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 );
>     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -147,8 +147,8 @@ public:
>     Svx3DTextureKindItem(sal_uInt16 nVal = 3);
> 
>     // use drawing::TextureKind
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -157,8 +157,8 @@ public:
>     Svx3DTextureModeItem(sal_uInt16 nVal = 2);
> 
>     // use drawing:TextureMode
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -173,8 +173,8 @@ public:
>     Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE);
> 
>     // use drawing::ProjectionMode
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>@@ -328,8 +328,8 @@ public:
>     Svx3DShadeModeItem(sal_uInt16 nVal = 2);
> 
>     // use drawing::ShadeMode
>-    SVX_DLLPRIVATE virtual	sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>-    SVX_DLLPRIVATE virtual	sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
>     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
> };
> 
>diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
>index a4ff9f3..e3d7bb7 100644
>--- a/svx/inc/svx/sxcikitm.hxx
>+++ b/svx/inc/svx/sxcikitm.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual USHORT       GetValueCount() const; // { return 4; }
>             SdrCircKind  GetValue() const      { return (SdrCircKind)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
>index cb62886..07cc5bd 100644
>--- a/svx/inc/svx/sxekitm.hxx
>+++ b/svx/inc/svx/sxekitm.hxx
>@@ -49,8 +49,8 @@ public:
>     virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
>     virtual USHORT       GetValueCount() const; // { return 5; }
>             SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
>-    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 );
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
> };
>diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
>index 8140c88..a672163 100644
>--- a/svx/inc/svx/sxelditm.hxx
>+++ b/svx/inc/svx/sxelditm.hxx
>@@ -41,24 +41,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem {
> public:
>     SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
>     SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
>-    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 );
> };
> 
> class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem {
> public:
>     SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal)  {}
>     SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
>-    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 );
> };
> 
> class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem {
> public:
>     SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal)  {}
>     SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
>-    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
>diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
>index edac60d..abdb41d 100644
>--- a/svx/inc/svx/sxenditm.hxx
>+++ b/svx/inc/svx/sxenditm.hxx
>@@ -35,32 +35,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem {
> public:
>     SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal)  {}
>     SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {}
>-    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 );
> };
> 
> class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem {
> public:
>     SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal)  {}
>     SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {}
>-    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 );
> };
> 
> class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem {
> public:
>     SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal)  {}
>     SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {}
>-    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 );
> };
> 
> class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem {
> public:
>     SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal)  {}
>     SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {}
>-    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 );
> };
> 
> class SdrEdgeNode1GlueDistItem: public SdrMetricItem {
>diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
>index 6ff09cc..b1d5bee 100644
>--- a/svx/inc/svx/sxmkitm.hxx
>+++ b/svx/inc/svx/sxmkitm.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual USHORT         GetValueCount() const; // { return 2; }
>             SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
>index 411efd4..4ea826b 100644
>--- a/svx/inc/svx/sxmtpitm.hxx
>+++ b/svx/inc/svx/sxmtpitm.hxx
>@@ -47,8 +47,8 @@ public:
>     virtual USHORT         GetValueCount() const; // { return 4; }
>             SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>@@ -67,8 +67,8 @@ public:
>     virtual USHORT         GetValueCount() const; // { return 5; }
>             SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
>index 57dc5f7..5db3d4c 100644
>--- a/svx/inc/svx/sxmuitm.hxx
>+++ b/svx/inc/svx/sxmuitm.hxx
>@@ -44,8 +44,8 @@ public:
>     virtual USHORT       GetValueCount() const; // { return 14; }
>             FieldUnit    GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
> 
>-    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 );
> 
>     virtual String  GetValueTextByPos(USHORT nPos) const;
>     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
>diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
>index 6484c4c..c0a793d 100644
>--- a/svx/inc/svx/viewlayoutitem.hxx
>+++ b/svx/inc/svx/viewlayoutitem.hxx
>@@ -54,8 +54,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
>     virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
>-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
>-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
>+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
> };
> 
> //------------------------------------------------------------------------
>diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
>index f0426d0..10376e3 100644
>--- a/svx/inc/svx/xbtmpit.hxx
>+++ b/svx/inc/svx/xbtmpit.hxx
>@@ -58,8 +58,8 @@ public:
>     virtual SvStream&       Store( SvStream& rOut, USHORT nItemVersion  ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
>index e419ac8..658a866 100644
>--- a/svx/inc/svx/xcolit.hxx
>+++ b/svx/inc/svx/xcolit.hxx
>@@ -47,8 +47,8 @@ public:
>             XColorItem() {}
>             XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
> 
>-    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 );
> 
>             XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor);
>             XColorItem(USHORT nWhich, SvStream& rIn);
>diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
>index b32a691..d26ab49 100644
>--- a/svx/inc/svx/xfillit0.hxx
>+++ b/svx/inc/svx/xfillit0.hxx
>@@ -48,8 +48,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
>index 4f8ee4b..225486e 100644
>--- a/svx/inc/svx/xflclit.hxx
>+++ b/svx/inc/svx/xflclit.hxx
>@@ -50,8 +50,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
>index a8b0164..72c7dbb 100644
>--- a/svx/inc/svx/xflftrit.hxx
>+++ b/svx/inc/svx/xflftrit.hxx
>@@ -56,8 +56,8 @@ public:
>     virtual int             operator==( const SfxPoolItem& rItem ) const;
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
>                                     SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const;
>diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
>index 42543a6..c842a73 100644
>--- a/svx/inc/svx/xflgrit.hxx
>+++ b/svx/inc/svx/xflgrit.hxx
>@@ -57,8 +57,8 @@ public:
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
>     virtual USHORT          GetVersion( USHORT nFileFormatVersion ) 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 );
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>                                     SfxMapUnit ePresMetric,
>diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
>index 955184c..067342a 100644
>--- a/svx/inc/svx/xflhtit.hxx
>+++ b/svx/inc/svx/xflhtit.hxx
>@@ -56,8 +56,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>                                     SfxMapUnit ePresMetric,
>diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
>index 45c9821..cdd2a03 100644
>--- a/svx/inc/svx/xftadit.hxx
>+++ b/svx/inc/svx/xftadit.hxx
>@@ -48,8 +48,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextAdjust			GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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
>diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
>index ade90a7..921a228 100644
>--- a/svx/inc/svx/xftsfit.hxx
>+++ b/svx/inc/svx/xftsfit.hxx
>@@ -47,8 +47,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextStdForm		GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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
>diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
>index 532a996..261ade3 100644
>--- a/svx/inc/svx/xftshit.hxx
>+++ b/svx/inc/svx/xftshit.hxx
>@@ -48,8 +48,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextShadow			GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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
>diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
>index 1937035..bbd5310 100644
>--- a/svx/inc/svx/xlineit0.hxx
>+++ b/svx/inc/svx/xlineit0.hxx
>@@ -44,8 +44,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
>index 90ea7c4..ef1cbfe 100644
>--- a/svx/inc/svx/xlinjoit.hxx
>+++ b/svx/inc/svx/xlinjoit.hxx
>@@ -47,8 +47,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) 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 );
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
>                                     String &rText, const IntlWrapper * = 0 ) const;
>diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
>index 0467a2f..317ced0 100644
>--- a/svx/inc/svx/xlnclit.hxx
>+++ b/svx/inc/svx/xlnclit.hxx
>@@ -46,8 +46,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
>index c476a78..bb571dc 100644
>--- a/svx/inc/svx/xlndsit.hxx
>+++ b/svx/inc/svx/xlndsit.hxx
>@@ -59,8 +59,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
>index 988705b..bf1ff33 100644
>--- a/svx/inc/svx/xlnedcit.hxx
>+++ b/svx/inc/svx/xlnedcit.hxx
>@@ -43,8 +43,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
>index df85abc..5ebf7d1 100644
>--- a/svx/inc/svx/xlnedit.hxx
>+++ b/svx/inc/svx/xlnedit.hxx
>@@ -55,8 +55,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
>index 0651824..c9103cf 100644
>--- a/svx/inc/svx/xlnedwit.hxx
>+++ b/svx/inc/svx/xlnedwit.hxx
>@@ -46,8 +46,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
>index ffbdfe0..61d12d5 100644
>--- a/svx/inc/svx/xlnstcit.hxx
>+++ b/svx/inc/svx/xlnstcit.hxx
>@@ -43,8 +43,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
>index 0572ec9..cf9abc9 100644
>--- a/svx/inc/svx/xlnstit.hxx
>+++ b/svx/inc/svx/xlnstit.hxx
>@@ -55,8 +55,8 @@ public:
>     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
>     virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
>index 02ff94f..e51d956 100644
>--- a/svx/inc/svx/xlnstwit.hxx
>+++ b/svx/inc/svx/xlnstwit.hxx
>@@ -45,8 +45,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
>index f4f24a2..4acc388 100644
>--- a/svx/inc/svx/xlnwtit.hxx
>+++ b/svx/inc/svx/xlnwtit.hxx
>@@ -43,8 +43,8 @@ public:
>     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) 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 );
> 
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>                                     SfxMapUnit eCoreMetric,
>diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
>index e7c9816..2639da3 100644
>--- a/svx/inc/svx/xtextit0.hxx
>+++ b/svx/inc/svx/xtextit0.hxx
>@@ -49,8 +49,8 @@ public:
>     virtual USHORT          GetValueCount() const;
>     XFormTextStyle			GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
>     // #FontWork#
>-    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 );
> };
> 
> /*************************************************************************
>diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
>index 3405b5e..ef33508 100644
>--- a/svx/inc/svx/zoomitem.hxx
>+++ b/svx/inc/svx/zoomitem.hxx
>@@ -72,8 +72,8 @@ public:
>     virtual SfxPoolItem*	Create( SvStream& rStrm, USHORT nVersion ) const;
>     virtual SvStream&		Store( SvStream& rStrm , USHORT nItemVersion ) const;
>     virtual int				operator==( const SfxPoolItem& ) 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 );
> };
> 
> //------------------------------------------------------------------------
>diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
>index 725f61a..dddb6ec 100644
>--- a/svx/inc/svx/zoomslideritem.hxx
>+++ b/svx/inc/svx/zoomslideritem.hxx
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>+ *
>  * Copyright 2000, 2010 Oracle and/or its affiliates.
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>@@ -59,8 +59,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
>     virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
>-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
>-    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
>+    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 );
> };
> 
> //------------------------------------------------------------------------
>diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
>index 52c8ff2..07b09f6 100644
>--- a/svx/source/dialog/rulritem.cxx
>+++ b/svx/source/dialog/rulritem.cxx
>@@ -63,7 +63,7 @@ String SvxLongLRSpaceItem::GetValueText() const
> #define TWIP_TO_MM100(TWIP) 	((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
> #define MM100_TO_TWIP(MM100)	((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
> 
>-sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -82,18 +82,18 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
> 
>         case MID_LEFT: nVal = lLeft; break;
>         case MID_RIGHT: nVal = lRight; break;
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>     if ( bConvert )
>         nVal = TWIP_TO_MM100( nVal );
> 
>     rVal <<= nVal;
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -106,7 +106,7 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
>         {
>             lLeft    = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Left ) : aLeftRightMargin.Left;
>             lRight   = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Right ) : aLeftRightMargin.Right;
>-            return sal_True;
>+            return true;
>         }
>     }
>     else if ( rVal >>= nVal )
>@@ -118,13 +118,13 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
>         {
>             case MID_LEFT: lLeft = nVal; break;
>             case MID_RIGHT: lRight = nVal; break;
>-            default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+            default: DBG_ERROR("Wrong MemberId!"); return false;
>         }
> 
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //------------------------------------------------------------------------
>@@ -189,7 +189,7 @@ String SvxLongULSpaceItem::GetValueText() const
>     return String();
> }
> 
>-sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -203,23 +203,23 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
>             aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
>             aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
>             rVal <<= aUpperLowerMargin;
>-            return TRUE;
>+            return true;
>         }
> 
>         case MID_UPPER: nVal = lLeft; break;
>         case MID_LOWER: nVal = lRight; break;
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>     if ( bConvert )
>         nVal = TWIP_TO_MM100( nVal );
> 
>     rVal <<= nVal;
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -232,7 +232,7 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
>         {
>             lLeft    = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Upper ) : aUpperLowerMargin.Upper;
>             lRight   = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Lower ) : aUpperLowerMargin.Lower;
>-            return sal_True;
>+            return true;
>         }
>     }
>     else if ( rVal >>= nVal )
>@@ -244,13 +244,13 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
>         {
>             case MID_UPPER: lLeft = nVal; break;
>             case MID_LOWER: lRight = nVal; break;
>-            default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+            default: DBG_ERROR("Wrong MemberId!"); return false;
>         }
> 
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //------------------------------------------------------------------------
>@@ -307,7 +307,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
>             lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
> }
> 
>-sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
> 
>@@ -322,22 +322,22 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
>             aPagePosSize.Width = lWidth;
>             aPagePosSize.Height = lHeight;
>             rVal <<= aPagePosSize;
>-            return TRUE;
>+            return true;
>         }
>-    
>+
>         case MID_X: nVal = aPos.X(); break;
>         case MID_Y: nVal = aPos.Y(); break;
>         case MID_WIDTH: nVal = lWidth; break;
>         case MID_HEIGHT: nVal = lHeight; break;
> 
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>     rVal <<= nVal;
>-    return TRUE;
>+    return true;
> }
> 
>-sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
> 
>@@ -364,14 +364,14 @@ sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
>             case MID_Y: aPos.Y() = nVal; break;
>             case MID_WIDTH: lWidth = nVal; break;
>             case MID_HEIGHT: lHeight = nVal; break;
>-            
>+
>             default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>         }
> 
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //------------------------------------------------------------------------
>@@ -595,14 +595,14 @@ long SvxColumnItem::GetVisibleRight() const
>     return (*this)[nIdx].nEnd;
> }
> 
>-sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>     {
>         case MID_COLUMNARRAY:
>         {
>-            return sal_False;
>+            return false;
>         }
>         case MID_RIGHT: rVal <<= nRight; break;
>         case MID_LEFT: rVal <<= nLeft; break;
>@@ -612,10 +612,10 @@ sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
>         default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     sal_Int32 nVal = 0;
>@@ -623,7 +623,7 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
>     {
>         case MID_COLUMNARRAY:
>         {
>-            return sal_False;
>+            return false;
>         }
>         case MID_RIGHT: rVal >>= nRight; break;
>         case MID_LEFT: rVal >>= nLeft; break;
>@@ -633,7 +633,7 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
>         default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -706,7 +706,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
> {
> }
> 
>-sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -721,13 +721,13 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
>             return sal_False;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
>-sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>-    BOOL bRet=FALSE;
>+    BOOL bRet = false;
>     switch ( nMemberId )
>     {
>         case MID_START_X : bRet = (rVal >>= nStartX); break;
>diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
>index ce4c86a..b17a65a 100644
>--- a/svx/source/engine3d/svx3ditems.cxx
>+++ b/svx/source/engine3d/svx3ditems.cxx
>@@ -42,40 +42,40 @@ using namespace ::rtl;
> using namespace ::com::sun::star;
> 
> //////////////////////////////////////////////////////////////////////////////
>-Svx3DPercentDiagonalItem::Svx3DPercentDiagonalItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_PERCENT_DIAGONAL, nVal) 
>+Svx3DPercentDiagonalItem::Svx3DPercentDiagonalItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_PERCENT_DIAGONAL, nVal)
> {}
> 
>-Svx3DBackscaleItem::Svx3DBackscaleItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_BACKSCALE, nVal) 
>+Svx3DBackscaleItem::Svx3DBackscaleItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_BACKSCALE, nVal)
> {}
> 
>-Svx3DDepthItem::Svx3DDepthItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DOBJ_DEPTH, nVal) 
>+Svx3DDepthItem::Svx3DDepthItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DOBJ_DEPTH, nVal)
> {}
> 
>-Svx3DHorizontalSegmentsItem::Svx3DHorizontalSegmentsItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DOBJ_HORZ_SEGS, nVal) 
>+Svx3DHorizontalSegmentsItem::Svx3DHorizontalSegmentsItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DOBJ_HORZ_SEGS, nVal)
> {}
> 
>-Svx3DVerticalSegmentsItem::Svx3DVerticalSegmentsItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DOBJ_VERT_SEGS, nVal) 
>+Svx3DVerticalSegmentsItem::Svx3DVerticalSegmentsItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DOBJ_VERT_SEGS, nVal)
> {}
> 
>-Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal) 
>+Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
> {}
> 
>-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal) 
>+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
> {}
> 
> //////////////////////////////////////////////////////////////////////////////
> // #i28528#
> // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
> 
>-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal) 
>+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
> {}
> 
> sal_uInt16 Svx3DReducedLineGeometryItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -98,183 +98,183 @@ SfxPoolItem* Svx3DReducedLineGeometryItem::Create(SvStream& rIn, sal_uInt16 nIte
> 
> //////////////////////////////////////////////////////////////////////////////
> 
>-Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal) 
>+Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
> {}
> 
>-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal) 
>+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
> {}
> 
>-Svx3DTextureProjectionXItem::Svx3DTextureProjectionXItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_X, nVal) 
>+Svx3DTextureProjectionXItem::Svx3DTextureProjectionXItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_X, nVal)
> {}
> 
>-Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal) 
>+Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
> {}
> 
>-Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal) 
>+Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
> {}
> 
>-Svx3DMaterialColorItem::Svx3DMaterialColorItem(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_COLOR) 
>+Svx3DMaterialColorItem::Svx3DMaterialColorItem(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_COLOR)
> {}
> 
>-Svx3DMaterialEmissionItem::Svx3DMaterialEmissionItem(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_EMISSION) 
>+Svx3DMaterialEmissionItem::Svx3DMaterialEmissionItem(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_EMISSION)
> {}
> 
>-Svx3DMaterialSpecularItem::Svx3DMaterialSpecularItem(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_SPECULAR) 
>+Svx3DMaterialSpecularItem::Svx3DMaterialSpecularItem(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_SPECULAR)
> {}
> 
>-Svx3DMaterialSpecularIntensityItem::Svx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY, nVal) 
>+Svx3DMaterialSpecularIntensityItem::Svx3DMaterialSpecularIntensityItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY, nVal)
> {}
> 
>-Svx3DTextureKindItem::Svx3DTextureKindItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_KIND, nVal) 
>+Svx3DTextureKindItem::Svx3DTextureKindItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_KIND, nVal)
> {}
> 
>-Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal) 
>+Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
> {}
> 
>-Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal) 
>+Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
> {}
> 
>-Svx3DPerspectiveItem::Svx3DPerspectiveItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, nVal) 
>+Svx3DPerspectiveItem::Svx3DPerspectiveItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, nVal)
> {}
> 
>-Svx3DDistanceItem::Svx3DDistanceItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DSCENE_DISTANCE, nVal) 
>+Svx3DDistanceItem::Svx3DDistanceItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DSCENE_DISTANCE, nVal)
> {}
> 
>-Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal) 
>-:	SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal) 
>+Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
>+:	SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
> {}
> 
>-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal) 
>+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
> {}
> 
>-Svx3DLightcolor1Item::Svx3DLightcolor1Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_1) 
>+Svx3DLightcolor1Item::Svx3DLightcolor1Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_1)
> {}
> 
>-Svx3DLightcolor2Item::Svx3DLightcolor2Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_2) 
>+Svx3DLightcolor2Item::Svx3DLightcolor2Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_2)
> {}
> 
>-Svx3DLightcolor3Item::Svx3DLightcolor3Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_3) 
>+Svx3DLightcolor3Item::Svx3DLightcolor3Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_3)
> {}
> 
>-Svx3DLightcolor4Item::Svx3DLightcolor4Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_4) 
>+Svx3DLightcolor4Item::Svx3DLightcolor4Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_4)
> {}
> 
>-Svx3DLightcolor5Item::Svx3DLightcolor5Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_5) 
>+Svx3DLightcolor5Item::Svx3DLightcolor5Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_5)
> {}
> 
>-Svx3DLightcolor6Item::Svx3DLightcolor6Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_6) 
>+Svx3DLightcolor6Item::Svx3DLightcolor6Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_6)
> {}
> 
>-Svx3DLightcolor7Item::Svx3DLightcolor7Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_7) 
>+Svx3DLightcolor7Item::Svx3DLightcolor7Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_7)
> {}
> 
>-Svx3DLightcolor8Item::Svx3DLightcolor8Item(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_8) 
>+Svx3DLightcolor8Item::Svx3DLightcolor8Item(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_8)
> {}
> 
>-Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol) 
>-:	SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR) 
>+Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
>+:	SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
> {}
> 
>-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal) 
>+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
> {}
> 
>-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal) 
>+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
> {}
> 
>-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal) 
>+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
> {}
> 
>-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal) 
>+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
> {}
> 
>-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal) 
>+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
> {}
> 
>-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal) 
>+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
> {}
> 
>-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal) 
>+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
> {}
> 
>-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal) 
>+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
> {}
> 
>-Svx3DLightDirection1Item::Svx3DLightDirection1Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_1, rVec) 
>+Svx3DLightDirection1Item::Svx3DLightDirection1Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_1, rVec)
> {}
> 
>-Svx3DLightDirection2Item::Svx3DLightDirection2Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_2, rVec) 
>+Svx3DLightDirection2Item::Svx3DLightDirection2Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_2, rVec)
> {}
> 
>-Svx3DLightDirection3Item::Svx3DLightDirection3Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_3, rVec) 
>+Svx3DLightDirection3Item::Svx3DLightDirection3Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_3, rVec)
> {}
> 
>-Svx3DLightDirection4Item::Svx3DLightDirection4Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_4, rVec) 
>+Svx3DLightDirection4Item::Svx3DLightDirection4Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_4, rVec)
> {}
> 
>-Svx3DLightDirection5Item::Svx3DLightDirection5Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_5, rVec) 
>+Svx3DLightDirection5Item::Svx3DLightDirection5Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_5, rVec)
> {}
> 
>-Svx3DLightDirection6Item::Svx3DLightDirection6Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_6, rVec) 
>+Svx3DLightDirection6Item::Svx3DLightDirection6Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_6, rVec)
> {}
> 
>-Svx3DLightDirection7Item::Svx3DLightDirection7Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_7, rVec) 
>+Svx3DLightDirection7Item::Svx3DLightDirection7Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_7, rVec)
> {}
> 
>-Svx3DLightDirection8Item::Svx3DLightDirection8Item(const basegfx::B3DVector& rVec) 
>-:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_8, rVec) 
>+Svx3DLightDirection8Item::Svx3DLightDirection8Item(const basegfx::B3DVector& rVec)
>+:	SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_8, rVec)
> {}
> 
>-Svx3DShadowSlantItem::Svx3DShadowSlantItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, nVal) 
>+Svx3DShadowSlantItem::Svx3DShadowSlantItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, nVal)
> {}
> 
>-Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) 
>-:	SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, nVal) 
>+Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
>+:	SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, nVal)
> {}
> 
> //////////////////////////////////////////////////////////////////////////////
> // #107245#
> 
>-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) 
>+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
> {}
> 
> sal_uInt16 Svx3DSmoothNormalsItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -298,8 +298,8 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
> //////////////////////////////////////////////////////////////////////////////
> // #107245#
> 
>-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal) 
>+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
> {}
> 
> sal_uInt16 Svx3DSmoothLidsItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -323,8 +323,8 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
> //////////////////////////////////////////////////////////////////////////////
> // #107245#
> 
>-Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal) 
>+Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
> {}
> 
> sal_uInt16 Svx3DCharacterModeItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -348,8 +348,8 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
> //////////////////////////////////////////////////////////////////////////////
> // #107245#
> 
>-Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal) 
>+Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
> {}
> 
> sal_uInt16 Svx3DCloseFrontItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -373,8 +373,8 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
> //////////////////////////////////////////////////////////////////////////////
> // #107245#
> 
>-Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal) 
>-:	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal) 
>+Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
>+:	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
> {}
> 
> sal_uInt16 Svx3DCloseBackItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
>@@ -398,149 +398,149 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
> //////////////////////////////////////////////////////////////////////////////
> 
> // Svx3DNormalsKindItem: use drawing::NormalsKind
>-sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::NormalsKind)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::NormalsKind eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DNormalsKindItem(*this);
> }
> 
> // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
>-sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextureProjectionMode)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextureProjectionMode eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DTextureProjectionXItem(*this);
> }
> 
> // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
>-sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextureProjectionMode)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextureProjectionMode eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DTextureProjectionYItem(*this);
> }
> 
> // Svx3DTextureKindItem: use drawing::TextureKind
>-sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextureKind)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextureKind eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DTextureKindItem(*this);
> }
> 
> // Svx3DTextureModeItem: use drawing:TextureMode
>-sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextureMode)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextureMode eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DTextureModeItem(*this);
> }
> 
> // Svx3DPerspectiveItem: use drawing::ProjectionMode
>-sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::ProjectionMode)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::ProjectionMode eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DPerspectiveItem(*this);
> }
> 
> // Svx3DShadeModeItem: use drawing::ShadeMode
>-sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::ShadeMode)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::ShadeMode eVar;
>     if(!(rVal >>= eVar))
>-        return sal_False;
>+        return false;
>     SetValue((sal_Int16)eVar);
>-    return sal_True;
>+    return true;
> }
> 
>-SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const 
>-{ 
>+SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const
>+{
>     return new Svx3DShadeModeItem(*this);
> }
> 
>diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
>index 5dfdcac..bbb1a69 100644
>--- a/svx/source/items/SmartTagItem.cxx
>+++ b/svx/source/items/SmartTagItem.cxx
>@@ -72,14 +72,14 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
>+bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
> {
>-    return sal_False;
>+    return false;
> }
> // -----------------------------------------------------------------------
>-sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
>+bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
> {
>-    return sal_False;
>+    return false;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
>index ac96e23..5540d77 100644
>--- a/svx/source/items/algitem.cxx
>+++ b/svx/source/items/algitem.cxx
>@@ -107,7 +107,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -148,10 +148,10 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             }
>             break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -201,7 +201,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 SetValue( (USHORT)eSvx );
>             }
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -273,7 +273,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -306,10 +306,10 @@ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>                 break;
>             }
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -357,7 +357,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             }
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -430,7 +430,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     table::CellOrientation eUno = table::CellOrientation_STANDARD;
>     switch ( (SvxCellOrientation)GetValue() )
>@@ -441,10 +441,10 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
>     case SVX_ORIENTATION_STACKED:	eUno = table::CellOrientation_STACKED;	  break;
>     }
>     rVal <<= eUno;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     table::CellOrientation eOrient;
>     if(!(rVal >>= eOrient))
>@@ -464,7 +464,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
>         default: ; //prevent warning
>     }
>     SetValue( (USHORT)eSvx );
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -673,7 +673,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -694,14 +694,14 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             DBG_ERROR("unknown MemberId");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
>     long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX;	// Members sind sal_Int16
>@@ -725,9 +725,9 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             DBG_ERROR("unknown MemberId");
>-            return sal_False;
>+            return false;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
>index 785f5f4..ccf7ec0 100644
>--- a/svx/source/items/chrtitem.cxx
>+++ b/svx/source/items/chrtitem.cxx
>@@ -193,7 +193,7 @@ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // the order of the two enums is not equal, so a mapping is required
>     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
>@@ -213,12 +213,12 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
> 
>     rVal <<= eAO;
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // the order of the two enums is not equal, so a mapping is required
>     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
>@@ -229,7 +229,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
>         // also try an int (for Basic)
>         sal_Int32 nAO = 0;
>         if(!(rVal >>= nAO))
>-            return sal_False;
>+            return false;
>         eAO = static_cast< ::com::sun::star::chart::ChartAxisArrangeOrderType >( nAO );
>     }
> 
>@@ -244,12 +244,12 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
>         case ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO:
>             eOrder = CHTXTORDER_AUTO; break;
>         default:
>-            return sal_False;
>+            return false;
>     }
> 
>     SetValue( (USHORT)eOrder );
> 
>-    return sal_True;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -395,14 +395,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
> 
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= fVal;
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     return rVal >>= fVal;
> }
>diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
>index 8f34ad3..afd1685 100644
>--- a/svx/source/items/clipfmtitem.cxx
>+++ b/svx/source/items/clipfmtitem.cxx
>@@ -78,7 +78,7 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
>     delete pImpl;
> }
> 
>-BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     USHORT nCount = Count();
> 
>@@ -93,10 +93,10 @@ BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe
>     }
> 
>     rVal <<= aClipFormats;
>-    return TRUE;
>+    return true;
> }
> 
>-sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
>     if ( rVal >>= aClipFormats )
>@@ -108,10 +108,10 @@ sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal,
>         for ( USHORT n=0; n < nCount; n++ )
>             AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
> 
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
>diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
>index 4498148..f70ab43 100644
>--- a/svx/source/items/customshapeitem.cxx
>+++ b/svx/source/items/customshapeitem.cxx
>@@ -355,17 +355,17 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
> {
>     return 1;
> }
>-sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     rVal <<= aPropSeq;
>-    return sal_True;
>+    return true;
> }
>-sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     if ( ! ( rVal >>= aPropSeq ) )
>-        return sal_False;
>+        return false;
>     else
>-        return sal_True;
>+        return true;
> }
> const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const
> {
>diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
>index bdd6c52..3e2613f 100644
>--- a/svx/source/items/drawitem.cxx
>+++ b/svx/source/items/drawitem.cxx
>@@ -104,19 +104,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     // Please ask CD if you want to change this.
>     sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -125,10 +125,10 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>     if ( rVal >>= aValue )
>     {
>         pColorTable = (XColorTable *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //==================================================================
>@@ -188,19 +188,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     // Please ask CD if you want to change this.
>     sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -209,10 +209,10 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BY
>     if ( rVal >>= aValue )
>     {
>         pGradientList = (XGradientList *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //==================================================================
>@@ -272,19 +272,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     // Please ask CD if you want to change this.
>     sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -293,10 +293,10 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>     if ( rVal >>= aValue )
>     {
>         pHatchList = (XHatchList *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> //==================================================================
>@@ -356,19 +356,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     // Please ask CD if you want to change this.
>     sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -377,10 +377,10 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>     if ( rVal >>= aValue )
>     {
>         pBitmapList = (XBitmapList *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> 
>@@ -442,18 +442,18 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -461,10 +461,10 @@ sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
>     if ( rVal >>= aValue )
>     {
>         pDashList = (XDashList *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
> 
> // -----------------------------------------------------------------------
>@@ -531,18 +531,18 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>     sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
>     rVal = uno::makeAny( aValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     // This is only a quick helper to have UI support for these list items. Don't use
>     // this method to query for a valid UNO representation.
>@@ -550,8 +550,8 @@ sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
>     if ( rVal >>= aValue )
>     {
>         pLineEndList = (XLineEndList *)(ULONG)aValue;
>-        return sal_True;
>+        return true;
>     }
> 
>-    return sal_False;
>+    return false;
> }
>diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
>index 067c3c2..547168b 100644
>--- a/svx/source/items/e3ditem.cxx
>+++ b/svx/source/items/e3ditem.cxx
>@@ -133,7 +133,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     drawing::Direction3D aDirection;
> 
>@@ -143,21 +143,21 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
>     aDirection.DirectionZ = aVal.getZ();
> 
>     rVal <<= aDirection;
>-    return( sal_True );
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     drawing::Direction3D aDirection;
>     if(!(rVal >>= aDirection))
>-        return sal_False;
>+        return false;
> 
>     aVal.setX(aDirection.DirectionX);
>     aVal.setY(aDirection.DirectionY);
>     aVal.setZ(aDirection.DirectionZ);
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
>index 0d055de..2f892b8 100644
>--- a/svx/source/items/grfitem.cxx
>+++ b/svx/source/items/grfitem.cxx
>@@ -117,7 +117,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
> 
> 
> 
>-BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -137,17 +137,17 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> 
> 
>     rVal <<= aRet;
>-    return	 sal_True;
>+    return true;
> }
> 
>-BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>     text::GraphicCrop aVal;
> 
>     if(!(rVal >>= aVal))
>-        return sal_False;
>+        return false;
>     if( bConvert )
>     {
>        aVal.Right 	= MM100_TO_TWIP(aVal.Right );
>@@ -160,7 +160,7 @@ BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
>     nRight  = aVal.Right ;
>     nTop	= aVal.Top	 ;
>     nBottom = aVal.Bottom;
>-    return	sal_True;
>+    return	true;
> }
> 
> SfxItemPresentation SvxGrfCrop::GetPresentation(
>diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
>index f955392..047ca45 100644
>--- a/svx/source/items/hlnkitem.cxx
>+++ b/svx/source/items/hlnkitem.cxx
>@@ -360,7 +360,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
>     pMacroTable = new SvxMacroTableDtor ( rTbl );
> }
> 
>-BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -382,13 +382,13 @@ BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
>             rVal <<= (sal_Int32) eType;
>         break;
>         default:
>-            return FALSE;
>+            return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -422,9 +422,9 @@ BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
>             eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
>         break;
>         default:
>-            return FALSE;
>+            return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
>diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
>index 2a4846d..98353f0 100644
>--- a/svx/source/items/pageitem.cxx
>+++ b/svx/source/items/pageitem.cxx
>@@ -164,7 +164,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
> }
> 
> //------------------------------------------------------------------------
>-sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -198,10 +198,10 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         break;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> //------------------------------------------------------------------------
>-sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     switch( nMemberId )
>     {
>@@ -209,7 +209,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             sal_Int32 nValue = 0;
>             if(!(rVal >>= nValue))
>-                return sal_False;
>+                return false;
> 
>             eNumType = (SvxNumType)nValue;
>         }
>@@ -239,7 +239,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
>index f15f714..957c933 100644
>--- a/svx/source/items/rotmodit.cxx
>+++ b/svx/source/items/rotmodit.cxx
>@@ -136,7 +136,7 @@ USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
> 
> //	QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
> 
>-sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
>     switch ( (SvxRotateMode)GetValue() )
>@@ -147,10 +147,10 @@ sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
>         case SVX_ROTATE_MODE_BOTTOM:   eUno = table::CellVertJustify_BOTTOM;	break;
>     }
>     rVal <<= eUno;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     table::CellVertJustify eUno;
>     if(!(rVal >>= eUno))
>@@ -171,7 +171,7 @@ sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>         default: ;//prevent warning
>     }
>     SetValue( (USHORT)eSvx );
>-    return sal_True;
>+    return true;
> }
> 
> 
>diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
>index df95820..97a6011 100644
>--- a/svx/source/items/viewlayoutitem.cxx
>+++ b/svx/source/items/viewlayoutitem.cxx
>@@ -111,7 +111,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
>              mbBookMode == rItem.IsBookMode() );
> }
> 
>-sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -131,13 +131,13 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
>         case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break;
>         default:
>             DBG_ERROR("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -170,11 +170,11 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                 {
>                     SetValue( (UINT16)nColumns );
>                     mbBookMode = bBookMode;
>-                    return sal_True;
>+                    return true;
>                 }
>             }
> 
>-            return sal_False;
>+            return false;
>         }
> 
>         case MID_VIEWLAYOUT_COLUMNS:
>@@ -183,10 +183,10 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>             if ( rVal >>= nVal )
>             {
>                 SetValue( (UINT16)nVal );
>-                return sal_True;
>+                return true;
>             }
>             else
>-                return sal_False;
>+                return false;
>         }
> 
>         case MID_VIEWLAYOUT_BOOKMODE:
>@@ -194,18 +194,18 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>             sal_Bool bBookMode = sal_False;
>             if ( rVal >>= bBookMode )
>             {
>-                 mbBookMode = bBookMode;
>-                return sal_True;
>+                mbBookMode = bBookMode;
>+                return true;
>             }
>             else
>-                return sal_False;
>+                return false;
>         }
> 
>         default:
>             DBG_ERROR("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
>index 309ffd9..2566d48 100644
>--- a/svx/source/items/zoomitem.cxx
>+++ b/svx/source/items/zoomitem.cxx
>@@ -117,7 +117,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
>              eType 		== rItem.GetType() 			);
> }
> 
>-sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -141,13 +141,13 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId
>         case MID_TYPE: rVal <<= (sal_Int16) eType; break;
>         default:
>             DBG_ERROR("svx::SvxZoomItem::QueryValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -187,11 +187,11 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
>                     SetValue( (UINT16)nValueTmp );
>                     nValueSet = nValueSetTmp;
>                     eType = SvxZoomType( nTypeTmp );
>-                    return sal_True;
>+                    return true;
>                 }
>             }
> 
>-            return sal_False;
>+            return false;
>         }
> 
>         case MID_VALUE:
>@@ -200,10 +200,10 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
>             if ( rVal >>= nVal )
>             {
>                 SetValue( (UINT16)nVal );
>-                return sal_True;
>+                return true;
>             }
>             else
>-                return sal_False;
>+                return false;
>         }
> 
>         case MID_VALUESET:
>@@ -216,16 +216,16 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
>                     nValueSet = (sal_Int16) nVal;
>                 else if ( nMemberId == MID_TYPE )
>                     eType = SvxZoomType( (sal_Int16) nVal );
>-                return sal_True;
>+                return true;
>             }
>             else
>-                return sal_False;
>+                return false;
>         }
> 
>         default:
>             DBG_ERROR("svx::SvxZoomItem::PutValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
>diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
>index 73ed5a7..3548b84 100644
>--- a/svx/source/items/zoomslideritem.cxx
>+++ b/svx/source/items/zoomslideritem.cxx
>@@ -108,7 +108,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
>              mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
> }
> 
>-sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -128,7 +128,7 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
>             }
>             break;
> 
>-        case MID_ZOOMSLIDER_CURRENTZOOM : 
>+        case MID_ZOOMSLIDER_CURRENTZOOM :
>             {
>                 rVal <<= (sal_Int32) GetValue();
>             }
>@@ -150,13 +150,13 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
>             break;
>         default:
>             DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -197,7 +197,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                             ++nConvertedCount;
>                         }
>                     }
>-    
>+
>                     if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
>                     {
>                         SetValue( (UINT16)nCurrentZoom );
>@@ -205,11 +205,11 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                         mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
>                         mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
> 
>-                        return sal_True;
>+                        return true;
>                     }
>                 }
> 
>-                return sal_False;
>+                return false;
>             }
> 
>         case MID_ZOOMSLIDER_CURRENTZOOM:
>@@ -218,10 +218,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                 if ( rVal >>= nVal )
>                 {
>                     SetValue( (UINT16)nVal );
>-                    return sal_True;
>+                    return true;
>                 }
>                 else
>-                    return sal_False;
>+                    return false;
>             }
> 
>         case MID_ZOOMSLIDER_SNAPPINGPOINTS:
>@@ -230,10 +230,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                 if ( rVal >>= aValues )
>                 {
>                     maValues = aValues;
>-                    return sal_True;
>+                    return true;
>                 }
>                 else
>-                    return sal_False;
>+                    return false;
>             }
>         case MID_ZOOMSLIDER_MINZOOM:
>             {
>@@ -241,10 +241,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                 if( rVal >>= nVal )
>                 {
>                     mnMinZoom = (UINT16)nVal;
>-                    return sal_True;
>+                    return true;
>                 }
>                 else
>-                    return sal_False;
>+                    return false;
>             }
>         case MID_ZOOMSLIDER_MAXZOOM:
>             {
>@@ -252,17 +252,17 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
>                 if( rVal >>= nVal )
>                 {
>                     mnMaxZoom = (UINT16)nVal;
>-                    return sal_True;
>+                    return true;
>                 }
>                 else
>-                    return sal_False;
>+                    return false;
>             }
>         default:
>             DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!");
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew )
>diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
>index 20af90e..6e54fff 100644
>--- a/svx/source/svdraw/svdattr.cxx
>+++ b/svx/source/svdraw/svdattr.cxx
>@@ -1131,29 +1131,29 @@ BOOL __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()
> 
> void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
> 
>-sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
>     rVal <<= eFS;
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextFitToSizeType eFS;
>     if(!(rVal >>= eFS))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eFS = (drawing::TextFitToSizeType) nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
>@@ -1183,27 +1183,27 @@ SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPrese
>     return ePres;
> }
> 
>-sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextVerticalAdjust)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextVerticalAdjust eAdj;
>     if(!(rVal >>= eAdj))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eAdj = (drawing::TextVerticalAdjust)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
>@@ -1233,27 +1233,27 @@ SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPrese
>     return ePres;
> }
> 
>-sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextHorizontalAdjust)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextHorizontalAdjust eAdj;
>     if(!(rVal >>= eAdj))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eAdj = (drawing::TextHorizontalAdjust)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
>@@ -1283,26 +1283,26 @@ SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresenta
>     return ePres;
> }
> 
>-sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextAnimationKind)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextAnimationKind eKind;
>     if(!(rVal >>= eKind))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
>         eKind = (drawing::TextAnimationKind)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
>@@ -1332,27 +1332,27 @@ SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPre
>     return ePres;
> }
> 
>-sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::TextAnimationDirection)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::TextAnimationDirection eDir;
>     if(!(rVal >>= eDir))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eDir = (drawing::TextAnimationDirection)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
>@@ -1492,19 +1492,19 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
> {
>     return 1;
> }
>-sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     sal_Bool bValue = (sal_Bool)GetValue();
>     rVal <<= bValue;
>-    return sal_True;
>+    return true;
> }
>-sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Bool bValue = sal_Bool();
>     if( !( rVal >>= bValue ) )
>-        return sal_False;
>+        return false;
>     SetValue( bValue );
>-    return sal_True;
>+    return true;
> }
> #ifdef SDR_ISPOOLABLE
> int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const
>@@ -1650,7 +1650,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer
>     return 1;
> }
> 
>-sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     sal_uInt32 i, nCount = GetCount();
>     uno::Sequence< sal_Int32 > aSequence( nCount );
>@@ -1661,14 +1661,14 @@ sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMembe
>             *pPtr++ = GetValue( i ).nValue;
>     }
>     rVal <<= aSequence;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     uno::Sequence< sal_Int32 > aSequence;
>     if( !( rVal >>= aSequence ) )
>-        return sal_False;
>+        return false;
> 
>     void* pPtr;
>     for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() )
>@@ -1685,7 +1685,7 @@ sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nM
>             aAdjustmentValueList.Insert( pItem, LIST_APPEND );
>         }
>     }
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -1721,7 +1721,7 @@ SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentatio
>     return ePres;
> }
> 
>-sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
> 
>@@ -1738,17 +1738,17 @@ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> 
>     rVal <<= eCT;
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::ConnectorType eCT;
>     if(!(rVal >>= eCT))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eCT = (drawing::ConnectorType)nEnum;
>     }
>@@ -1765,119 +1765,119 @@ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>     }
>     SetValue( sal::static_int_cast< USHORT >( eEK ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>@@ -1912,26 +1912,26 @@ SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresenta
>     return ePres;
> }
> 
>-sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::MeasureKind)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::MeasureKind eKind;
>     if(!(rVal >>= eKind))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eKind = (drawing::MeasureKind)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) );
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
>@@ -1961,26 +1961,26 @@ SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPres
>     return ePres;
> }
> 
>-sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::MeasureTextHorzPos)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::MeasureTextHorzPos ePos;
>     if(!(rVal >>= ePos))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         ePos = (drawing::MeasureTextHorzPos)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
>@@ -2010,26 +2010,26 @@ SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPres
>     return ePres;
> }
> 
>-sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::MeasureTextVertPos)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::MeasureTextVertPos ePos;
>     if(!(rVal >>= ePos))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         ePos = (drawing::MeasureTextVertPos)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
>-    return sal_True;
>+    return true;
> }
> 
> TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
>@@ -2071,20 +2071,20 @@ SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresenta
>     return ePres;
> }
> 
>-sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nMeasure = 0;
>     if(!(rVal >>= nMeasure))
>-        return sal_False;
>+        return false;
> 
>     SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) );
>-    return sal_True;
>+    return true;
> }
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>@@ -2119,26 +2119,26 @@ SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentatio
>     return ePres;
> }
> 
>-sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (drawing::CircleKind)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     drawing::CircleKind eKind;
>     if(!(rVal >>= eKind))
>     {
>         sal_Int32 nEnum = 0;
>         if(!(rVal >>= nEnum))
>-            return sal_False;
>+            return false;
> 
>         eKind = (drawing::CircleKind)nEnum;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) );
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------
>@@ -2282,20 +2282,20 @@ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*
>     return new SdrGrafGamma100Item( rIn );
> }
> 
>-sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= ((double)GetValue()) / 100.0;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     double nGamma = 0;
>     if(!(rVal >>= nGamma))
>-        return sal_False;
>+        return false;
> 
>     SetValue( (UINT32)(nGamma * 100.0  ) );
>-    return sal_True;
>+    return true;
> }
> 
> //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
>index e4aaa17..b5af447 100644
>--- a/svx/source/xoutdev/xattr.cxx
>+++ b/svx/source/xoutdev/xattr.cxx
>@@ -484,19 +484,19 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
> 
> }
> 
>-sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetColorValue( nValue );
> 
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -609,14 +609,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
>     rVal <<= eLS;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     ::com::sun::star::drawing::LineStyle eLS;
>     if(!(rVal >>= eLS ))
>@@ -624,12 +624,12 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         // also try an int (for Basic)
>         sal_Int32 nLS = 0;
>         if(!(rVal >>= nLS))
>-            return sal_False;
>+            return false;
>         eLS = (::com::sun::star::drawing::LineStyle)nLS;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( eLS ) );
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
>@@ -1104,7 +1104,7 @@ FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv)
>     return TRUE;
> }
> 
>-sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1202,13 +1202,13 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
>             break;
>         }
> 
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;	
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
>-    
>-    return sal_True;
>+
>+    return true;
> }
> 
>-sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1231,7 +1231,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>                     else if ( aPropSeq[n].Name.equalsAsciiL( "LineDash", 8 ))
>                     {
>                         if ( aPropSeq[n].Value >>= aLineDash )
>-                            bLineDash = sal_True;
>+                            bLineDash = true;
>                     }
>                 }
>                 
>@@ -1253,17 +1253,17 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>                     SetDashValue( aXDash );
>                 }
>                 
>-                return sal_True;
>+                return true;
>             }
> 
>-            return sal_False;
>+            return false;
>         }
>     
>         case MID_NAME:
>         {
>             rtl::OUString aName;
>             if (!(rVal >>= aName))
>-                return sal_False;
>+                return false;
>             SetName( aName );
>             break;
>         }
>@@ -1272,7 +1272,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>         {
>             ::com::sun::star::drawing::LineDash aLineDash;
>             if(!(rVal >>= aLineDash))
>-                return sal_False;
>+                return false;
> 
>             XDash aXDash;
> 
>@@ -1294,7 +1294,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>         {
>             sal_Int16 nVal = sal_Int16();
>             if(!(rVal >>= nVal))
>-                return sal_False;
>+                return false;
> 
>             XDash aXDash = GetDashValue();
>             aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
>@@ -1312,7 +1312,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>         {
>             sal_Int16 nVal = sal_Int16();
>             if(!(rVal >>= nVal))
>-                return sal_False;
>+                return false;
>             
>             XDash aXDash = GetDashValue();
>             if ( nMemberId == MID_LINEDASH_DOTS )
>@@ -1333,7 +1333,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>         {
>             sal_Int32 nVal = 0;
>             if(!(rVal >>= nVal))
>-                return sal_False;
>+                return false;
>             
>             XDash aXDash = GetDashValue();
>             if ( nMemberId == MID_LINEDASH_DOTLEN )
>@@ -1351,7 +1351,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
>         }		
>     }
>     
>-    return sal_True;
>+    return true;
> }
> 
> BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>@@ -1472,17 +1472,17 @@ SfxItemPresentation XLineWidthItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     sal_Int32 nValue = GetValue();
>     if( 0 != (nMemberId&CONVERT_TWIPS) )
>         nValue = TWIP_TO_MM100(nValue);
>     
>     rVal <<= nValue;
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>@@ -1490,7 +1490,7 @@ sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         nValue = MM100_TO_TWIP(nValue);
> 
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -------------------
>@@ -1597,20 +1597,20 @@ SfxItemPresentation XLineColorItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue))
>-        return sal_False;
>+        return false;
> 
>     SetColorValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> //////////////////////////////////////////////////////////////////////////////
>@@ -1913,7 +1913,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1930,16 +1930,16 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
>         rVal <<= aBezier;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>     if( nMemberId == MID_NAME )
>     {
>-        return sal_False;
>+        return false;
>     }
>     else
>     {
>@@ -1948,7 +1948,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         if( rVal.hasValue() && rVal.getValue() )
>         {
>             if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
>-                return sal_False;
>+                return false;
> 
>             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
>             if( pCoords->Coordinates.getLength() > 0 )
>@@ -1960,7 +1960,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         }
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> /** this function searches in both the models pool and the styles pool for XLineStartItem
>@@ -2607,7 +2607,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -2623,16 +2623,16 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMembe
>         SvxConvertB2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
>         rVal <<= aBezier;
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>     if( nMemberId == MID_NAME )
>     {
>-        return sal_False;
>+        return false;
>     }
>     else
>     {
>@@ -2641,7 +2641,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nM
>         if( rVal.hasValue() && rVal.getValue() )
>         {
>             if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
>-                return sal_False;
>+                return false;
> 
>             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
>             if( pCoords->Coordinates.getLength() > 0 )
>@@ -2653,7 +2653,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nM
>         }
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // ----------------------------
>@@ -2748,18 +2748,18 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -2855,18 +2855,18 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -2961,20 +2961,20 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     sal_Bool bValue = GetValue();
>     rVal.setValue( &bValue, ::getCppuBooleanType()  );
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
>-        return sal_False;
>+        return false;
> 
>     SetValue( *(sal_Bool*)rVal.getValue() );
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -3069,20 +3069,20 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
>     }
> }
> 
>-sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     sal_Bool bValue = GetValue();
>     rVal.setValue( &bValue, ::getCppuBooleanType()  );
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
>-        return sal_False;
>+        return false;
> 
>     SetValue( *(sal_Bool*)rVal.getValue() );
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -3213,17 +3213,17 @@ USHORT XFillStyleItem::GetValueCount() const
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
> 
>     rVal <<= eFS;
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     ::com::sun::star::drawing::FillStyle eFS;
>     if(!(rVal >>= eFS))
>@@ -3231,13 +3231,13 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         // also try an int (for Basic)
>         sal_Int32 nFS = 0;
>         if(!(rVal >>= nFS))
>-            return sal_False;
>+            return false;
>         eFS = (::com::sun::star::drawing::FillStyle)nFS;
>     }
> 
>     SetValue( sal::static_int_cast< USHORT >( eFS ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -3347,23 +3347,23 @@ SfxItemPresentation XFillColorItem::GetPresentation
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     if(!(rVal >>= nValue ))
>-        return sal_False;
>+        return false;
> 
>     SetColorValue( nValue );
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------
>@@ -3774,7 +3774,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -3827,7 +3827,7 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
>             rVal <<= aGradient2;
>             break;
>         }
>-    
>+
>         case MID_NAME:
>         {
>             rtl::OUString aApiName;
>@@ -3835,7 +3835,7 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
>             rVal <<= aApiName;
>             break;
>         }
>-        
>+
>         case MID_GRADIENT_STYLE: rVal <<= (sal_Int16)GetGradientValue().GetGradientStyle(); break;
>         case MID_GRADIENT_STARTCOLOR: rVal <<= (sal_Int32)GetGradientValue().GetStartColor().GetColor(); break;
>         case MID_GRADIENT_ENDCOLOR: rVal <<= (sal_Int32)GetGradientValue().GetEndColor().GetColor(); break;
>@@ -3846,15 +3846,15 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
>         case MID_GRADIENT_STARTINTENSITY: rVal <<= GetGradientValue().GetStartIntens(); break;
>         case MID_GRADIENT_ENDINTENSITY: rVal <<= GetGradientValue().GetEndIntens(); break;
>         case MID_GRADIENT_STEPCOUNT: rVal <<= GetGradientValue().GetSteps(); break;
>-        
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -3900,17 +3900,17 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
>                     SetGradientValue( aXGradient );
>                 }
> 
>-                return sal_True;
>+                return true;
>             }
> 
>-            return sal_False;
>+            return false;
>         }
> 
>         case MID_NAME:
>         {
>             rtl::OUString aName;
>             if (!(rVal >>= aName ))
>-                return sal_False;
>+                return false;
>             SetName( aName );
>             break;
>         }
>@@ -3919,7 +3919,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
>         {
>             ::com::sun::star::awt::Gradient aGradient2;
>             if(!(rVal >>= aGradient2))
>-                return sal_False;
>+                return false;
> 
>             XGradient aXGradient;
> 
>@@ -3943,10 +3943,10 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
>         {
>             sal_Int32 nVal = 0;
>             if(!(rVal >>= nVal ))
>-                return sal_False;
>-            
>+                return false;
>+
>             XGradient aXGradient = GetGradientValue();
>-            
>+
>             if ( nMemberId == MID_GRADIENT_STARTCOLOR )
>                 aXGradient.SetStartColor( nVal );
>             else
>@@ -3966,10 +3966,10 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
>         {
>             sal_Int16 nVal = sal_Int16();
>             if(!(rVal >>= nVal ))
>-                return sal_False;
>+                return false;
> 
>             XGradient aXGradient = GetGradientValue();
>-            
>+
>             switch ( nMemberId )
>             {
>                 case MID_GRADIENT_STYLE:
>@@ -3989,13 +3989,13 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
>                 case MID_GRADIENT_YOFFSET:
>                     aXGradient.SetYOffset( nVal ); break;
>             }
>-            
>+
>             SetGradientValue( aXGradient );
>             break;
>         }
>     }
>-    
>-    return sal_True;
>+
>+    return true;
> }
> 
> BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>@@ -4134,14 +4134,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     return XFillGradientItem::QueryValue( rVal, nMemberId );
> }
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     return XFillGradientItem::PutValue( rVal, nMemberId );
> }
>@@ -4479,7 +4479,7 @@ FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -4536,14 +4536,14 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
>         case MID_HATCH_ANGLE:
>             rVal <<= aHatch.GetAngle(); break;
> 
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -4579,17 +4579,17 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>                     aHatch.SetAngle( aUnoHatch.Angle );
>                 }
> 
>-                return sal_True;
>+                return true;
>             }
> 
>-            return sal_False;
>+            return false;
>         }
> 
>         case MID_FILLHATCH:
>         {
>             ::com::sun::star::drawing::Hatch aUnoHatch;
>             if(!(rVal >>= aUnoHatch))
>-                return sal_False;
>+                return false;
> 
>             aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
>             aHatch.SetColor( aUnoHatch.Color );
>@@ -4602,7 +4602,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         {
>             rtl::OUString aName;
>             if (!(rVal >>= aName ))
>-                return sal_False;
>+                return false;
>             SetName( aName );
>             break;
>         }
>@@ -4611,7 +4611,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         {
>             sal_Int16 nVal = sal_Int16();
>             if (!(rVal >>= nVal ))
>-                return sal_False;
>+                return false;
>             aHatch.SetHatchStyle( (XHatchStyle)nVal );
>             break;
>         }
>@@ -4622,7 +4622,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>         {
>             sal_Int32 nVal = 0;
>             if (!(rVal >>= nVal ))
>-                return sal_False;
>+                return false;
> 
>             if ( nMemberId == MID_HATCH_COLOR )
>                 aHatch.SetColor( nVal );
>@@ -4632,11 +4632,11 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
>                 aHatch.SetAngle( nVal );
>             break;
>         }
>-        
>-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
>+
>+        default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
>@@ -4753,10 +4753,10 @@ USHORT XFormTextStyleItem::GetValueCount() const
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -4766,13 +4766,13 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) con
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue(sal::static_int_cast< USHORT >(nValue));
> 
>-    return sal_True;
>+    return true;
> }
> 
> //-------------------------
>@@ -4858,10 +4858,10 @@ USHORT XFormTextAdjustItem::GetValueCount() const
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -4871,13 +4871,13 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue(sal::static_int_cast< USHORT >(nValue));
> 
>-    return sal_True;
>+    return true;
> }
> 
> //----------------------------
>@@ -5220,10 +5220,10 @@ USHORT XFormTextShadowItem::GetValueCount() const
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -5233,13 +5233,13 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue(sal::static_int_cast< USHORT >(nValue));
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -------------------------------
>@@ -5539,10 +5539,10 @@ USHORT XFormTextStdFormItem::GetValueCount() const
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     rVal <<= (sal_Int32)GetValue();
>-    return sal_True;
>+    return true;
> }
> 
> /*************************************************************************
>@@ -5552,13 +5552,13 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
> \*************************************************************************/
> 
> // #FontWork#
>-sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     sal_Int32 nValue = 0;
>     rVal >>= nValue;
>     SetValue(sal::static_int_cast< USHORT >(nValue));
> 
>-    return sal_True;
>+    return true;
> }
> 
> // --------------------------
>diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
>index d00606f..eb42c43 100644
>--- a/svx/source/xoutdev/xattr2.cxx
>+++ b/svx/source/xoutdev/xattr2.cxx
>@@ -238,7 +238,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
> 
> // -----------------------------------------------------------------------------
> 
>-sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
>+bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
> {
>     ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
> 
>@@ -263,12 +263,12 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
>     }
> 
>     rVal <<= eJoint;
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------------
> 
>-BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
>+bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
> {
>     XLineJoint eJoint = XLINEJOINT_NONE;
>     ::com::sun::star::drawing::LineJoint eUnoJoint;
>@@ -278,7 +278,7 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
>         // also try an int (for Basic)
>         sal_Int32 nLJ = 0;
>         if(!(rVal >>= nLJ))
>-            return sal_False;
>+            return false;
>         eUnoJoint = (::com::sun::star::drawing::LineJoint)nLJ;
>     }
> 
>@@ -302,7 +302,7 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
> 
>     SetValue( sal::static_int_cast< USHORT >( eJoint ) );
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------------
>diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
>index d4456fb..51867ac 100644
>--- a/svx/source/xoutdev/xattrbmp.cxx
>+++ b/svx/source/xoutdev/xattrbmp.cxx
>@@ -716,7 +716,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -777,12 +777,12 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMe
>         rVal <<= aPropSeq;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------
> 
>-sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
> //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
>index fc51c93..aba6ab6 100644
>--- a/xmloff/inc/xmlcnitm.hxx
>+++ b/xmloff/inc/xmlcnitm.hxx
>@@ -61,8 +61,8 @@ public:
> 
>     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
>     { return new SvXMLAttrContainerItem( *this ); }
>diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
>index 93be5cc..43121e6 100644
>--- a/svl/inc/svl/cenumitm.hxx
>+++ b/svl/inc/svl/cenumitm.hxx
>@@ -54,9 +54,9 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
>+    virtual	bool QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
>+    virtual	bool PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
> 
>     virtual USHORT GetValueCount() const = 0;
> 
>@@ -154,9 +154,9 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
> 
>diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
>index d343986..a9e2fe8 100644
>--- a/svl/inc/svl/cintitem.hxx
>+++ b/svl/inc/svl/cintitem.hxx
>@@ -64,10 +64,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -126,10 +126,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -188,10 +188,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>@@ -250,10 +250,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
>index b81fa57..11c1cdd 100644
>--- a/svl/inc/svl/cntwall.hxx
>+++ b/svl/inc/svl/cntwall.hxx
>@@ -60,9 +60,9 @@ public:
>     virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
> 
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 );
> 
>     void					SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
>diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
>index 2532395..5260e99 100644
>--- a/svl/inc/svl/ctypeitm.hxx
>+++ b/svl/inc/svl/ctypeitm.hxx
>@@ -68,9 +68,9 @@ public:
>                                                  XubString &rText,
>                                                  const IntlWrapper* pIntlWrapper = 0 ) const;
> 
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
>-    virtual	BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0);
> 
>     INetContentType GetEnumValue() const;
>diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
>index 85d5bbc..1306252 100644
>--- a/svl/inc/svl/custritm.hxx
>+++ b/svl/inc/svl/custritm.hxx
>@@ -68,10 +68,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue(com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue(com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId = 0) const;
> 
>-    virtual	BOOL PutValue(const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue(const com::sun::star::uno::Any& rVal,
>                           BYTE nMemberId = 0);
> 
>     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
>diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
>index 8efd044..6db2bbd 100644
>--- a/svl/inc/svl/dateitem.hxx
>+++ b/svl/inc/svl/dateitem.hxx
>@@ -74,9 +74,9 @@ public:
>                                             "SetDateTime() with pooled item" );
>                                 aDateTime = rDT; }
> 
>-    virtual	BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue  ( const com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 );
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
>index 4c60641..3ced83c 100644
>--- a/svl/inc/svl/globalnameitem.hxx
>+++ b/svl/inc/svl/globalnameitem.hxx
>@@ -49,9 +49,9 @@ public:
>     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
>     SvGlobalName			GetValue() const { return m_aName; }
> 
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
>index fab4a8d..a377e1a 100644
>--- a/svl/inc/svl/ilstitem.hxx
>+++ b/svl/inc/svl/ilstitem.hxx
>@@ -55,8 +55,8 @@ public:
> 
>     virtual int 			operator==( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>-    virtual 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 );
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> };
> 
> #endif // _SFXINTITEM_HXX
>diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
>index 7d5a841..45d8bd4 100644
>--- a/svl/inc/svl/imageitm.hxx
>+++ b/svl/inc/svl/imageitm.hxx
>@@ -46,8 +46,8 @@ public:
> 
>     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
>     virtual int 			operator==( const SfxPoolItem& ) const;
>-    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 );
>+    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 );
> 
>     void                    SetRotation( long nValue );
>     long                    GetRotation() const;
>diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
>index e6f1312..c7adf5d 100644
>--- a/svl/inc/svl/intitem.hxx
>+++ b/svl/inc/svl/intitem.hxx
>@@ -82,10 +82,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> 
>-    virtual	BOOL PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
>                            BYTE nMemberId = 0 );
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
>index d2246cb..0749fb1 100644
>--- a/svl/inc/svl/lckbitem.hxx
>+++ b/svl/inc/svl/lckbitem.hxx
>@@ -55,9 +55,9 @@ public:
> 
>     SvLockBytes*			GetValue() const { return _xVal; }
> 
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
> };
> 
>diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
>index e371bc5..7c22509 100644
>--- a/svl/inc/svl/poolitem.hxx
>+++ b/svl/inc/svl/poolitem.hxx
>@@ -231,8 +231,8 @@ public:
>     virtual int              ScaleMetrics( long lMult, long lDiv );
>     virtual int              HasMetrics() const;
> 
>-    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 );
>+    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 );
> 
>     virtual SfxPoolItem*     Create( SvStream &, USHORT nItemVersion ) const;
>     virtual SvStream&        Store( SvStream &, USHORT nItemVersion ) const;
>diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
>index 61f99f3..a36ab89 100644
>--- a/svl/inc/svl/ptitem.hxx
>+++ b/svl/inc/svl/ptitem.hxx
>@@ -68,9 +68,9 @@ public:
>                                  aVal = rNewVal;
>                              }
> 
>-    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 );
> };
> 
>diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
>index d2e15f3..fb1abc6 100644
>--- a/svl/inc/svl/rectitem.hxx
>+++ b/svl/inc/svl/rectitem.hxx
>@@ -67,9 +67,9 @@ public:
>                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
>                                  aVal = rNewVal;
>                              }
>-    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 );
> };
> 
>diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
>index ac42e15..58cbf38 100644
>--- a/svl/inc/svl/slstitm.hxx
>+++ b/svl/inc/svl/slstitm.hxx
>@@ -76,9 +76,9 @@ public:
>     virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
>     void 					Sort( BOOL bAscending = TRUE, List* pParallelList = 0 );
> 
>-    virtual	BOOL 			PutValue  ( const com::sun::star::uno::Any& rVal,
>+    virtual	bool            PutValue  ( const com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 );
>-    virtual	BOOL 			QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
>                                          BYTE nMemberId = 0 ) const;
> };
> #endif
>diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
>index d8caf48..1fb3a21 100644
>--- a/svl/inc/svl/srchitem.hxx
>+++ b/svl/inc/svl/srchitem.hxx
>@@ -90,8 +90,8 @@ public:
>     SvxSearchItem( const SvxSearchItem& rItem );
>     virtual ~SvxSearchItem();
> 
>-    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 );
>     virtual int 			 operator == ( const SfxPoolItem& ) const;
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
>diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
>index e20ef1e..672abd5 100644
>--- a/svl/inc/svl/szitem.hxx
>+++ b/svl/inc/svl/szitem.hxx
>@@ -58,9 +58,9 @@ public:
>                                     const IntlWrapper * = 0 ) const;
> 
>     virtual int 			 operator==( const SfxPoolItem& ) const;
>-    virtual	BOOL 			 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 ) const;
>-    virtual	BOOL 			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal,
>                                           BYTE nMemberId = 0 );
> 
>     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
>diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
>index f4e1c8a..d1b1894 100644
>--- a/svl/inc/svl/visitem.hxx
>+++ b/svl/inc/svl/visitem.hxx
>@@ -69,10 +69,10 @@ public:
>                                                 const IntlWrapper * = 0)
>         const;
> 
>-    virtual	BOOL QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                              BYTE nMemberId = 0 ) const;
> 
>-    virtual	BOOL PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
>                            BYTE nMemberId = 0 );
> 
>     virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
>diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
>index a3d1090..072f083 100644
>--- a/svl/source/items/cenumitm.cxx
>+++ b/svl/source/items/cenumitm.cxx
>@@ -70,7 +70,7 @@ SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit,
> 
> //============================================================================
> // virtual
>-BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>+bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>     const
> {
>     rVal <<= sal_Int32(GetEnumValue());
>@@ -79,7 +79,7 @@ BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
> 
> //============================================================================
> // virtual
>-BOOL SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
>+bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
>                                     BYTE)
> {
>     sal_Int32 nTheValue = 0;
>@@ -233,7 +233,7 @@ SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
>+bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
> {
>     rVal <<= sal_Bool(m_bValue);
>     return true;
>@@ -241,7 +241,7 @@ BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
> 
> //============================================================================
> // virtual
>-BOOL CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
>+bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
> {
>     sal_Bool bTheValue = sal_Bool();
>     if (rVal >>= bTheValue)
>diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
>index ad78496..1f9be90 100644
>--- a/svl/source/items/cintitem.cxx
>+++ b/svl/source/items/cintitem.cxx
>@@ -87,26 +87,26 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int8 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int8 nValue = sal_Int8();
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntByteItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -222,27 +222,27 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         DBG_ASSERT( nValue <= USHRT_MAX, "Overflow in UInt16 value!");
>         m_nValue = (sal_uInt16)nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -354,26 +354,26 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>@@ -487,28 +487,28 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     sal_Int32 nValue = m_nValue;
>     DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     sal_Int32 nValue = 0;
>     if (rVal >>= nValue)
>     {
>         DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
>index 4031ed8..7370837 100644
>--- a/svl/source/items/cntwall.cxx
>+++ b/svl/source/items/cntwall.cxx
>@@ -150,18 +150,18 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
>+bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
> {
>     DBG_ERROR("Not implemented!");
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
>+bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
> {
>     DBG_ERROR("Not implemented!");
>-    return FALSE;
>+    return false;
> }
> 
> 
>diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
>index d76357b..654c20a 100644
>--- a/svl/source/items/ctypeitm.cxx
>+++ b/svl/source/items/ctypeitm.cxx
>@@ -223,7 +223,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType )
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     rVal <<= rtl::OUString(GetValue());
>     return true;
>@@ -231,7 +231,7 @@ BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     rtl::OUString aValue;
>     if ( rVal >>= aValue )
>diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
>index 580b674..7cb407f 100644
>--- a/svl/source/items/custritm.cxx
>+++ b/svl/source/items/custritm.cxx
>@@ -106,7 +106,7 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
> 
> //============================================================================
> // virtual
>-BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>+bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
>     const
> {
>     rVal <<= rtl::OUString(m_aValue);
>@@ -115,7 +115,7 @@ BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
> 
> //============================================================================
> // virtual
>-BOOL CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
>+bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
>                                          BYTE)
> {
>     rtl::OUString aTheValue;
>diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
>index 08436fc..ef7733d 100644
>--- a/svl/source/items/dateitem.cxx
>+++ b/svl/source/items/dateitem.cxx
>@@ -174,7 +174,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                    BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -188,16 +188,16 @@ BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                       aValue.Minutes,
>                                       aValue.Seconds,
>                                       aValue.HundredthSeconds ) );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                    BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -209,7 +209,7 @@ BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                            aDateTime.GetMonth(),
>                                            aDateTime.GetYear() );
>     rVal <<= aValue;
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
>index 06eee5c..4bd7dc6 100644
>--- a/svl/source/items/globalnameitem.cxx
>+++ b/svl/source/items/globalnameitem.cxx
>@@ -80,7 +80,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
>             ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
>@@ -94,21 +94,21 @@ BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>     if ( aSeq.getLength() == 16 )
>     {
>         m_aName.MakeFromMemory( (void*) aSeq.getConstArray() );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return true;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>        com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
>     void* pData = ( void* ) &m_aName.GetCLSID();
>     memcpy( aSeq.getArray(), pData, 16 );
>     rVal <<= aSeq;
>-    return TRUE;
>+    return true;
> }
> 
>diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
>index 6396d2f..802324e 100644
>--- a/svl/source/items/ilstitem.cxx
>+++ b/svl/source/items/ilstitem.cxx
>@@ -75,7 +75,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const
>     return new SfxIntegerListItem( *this );
> }
> 
>-BOOL SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter
>             ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
>@@ -84,16 +84,16 @@ BOOL SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE
>     try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); }
>     catch (::com::sun::star::uno::Exception&)
>     {
>-        return FALSE;
>+        return true;
>     }
> 
>     return ( aNew >>= m_aList );
> }
> 
>-BOOL SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     rVal <<= m_aList;
>-    return TRUE;
>+    return true;
> }
> 
> void SfxIntegerListItem::GetList( SvULongs& rList ) const
>diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
>index 6cca552..ec3ca31 100644
>--- a/svl/source/items/imageitm.cxx
>+++ b/svl/source/items/imageitm.cxx
>@@ -87,7 +87,7 @@ int SfxImageItem::operator==( const SfxPoolItem& rItem ) const
>     return( ((SfxImageItem&) rItem).GetValue() == GetValue() && (*pImp == *(((SfxImageItem&)rItem).pImp) ) );
> }
> 
>-BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>+bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
> {
>     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 4 );
>     aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() );
>@@ -96,10 +96,10 @@ BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
>     aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL ));
> 
>     rVal = ::com::sun::star::uno::makeAny( aSeq );
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq;
>     if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 ))
>@@ -112,10 +112,10 @@ BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>         aSeq[2] >>= pImp->bMirrored;
>         if ( aSeq[3] >>= aURL )
>             pImp->aURL = aURL;
>-        return TRUE;
>+        return true;
>     }
> 
>-    return FALSE;
>+    return false;
> }
> 
> void SfxImageItem::SetRotation( long nValue )
>diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
>index a1c107a..93d4c1a 100644
>--- a/svl/source/items/intitem.cxx
>+++ b/svl/source/items/intitem.cxx
>@@ -111,26 +111,26 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
>+bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
> {
>     sal_Int16 nValue = m_nValue;
>     rVal <<= nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
> {
>     sal_Int16 nValue = sal_Int16();
>     if (rVal >>= nValue)
>     {
>         m_nValue = nValue;
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
>index 5bfddc6..394d961 100644
>--- a/svl/source/items/lckbitem.cxx
>+++ b/svl/source/items/lckbitem.cxx
>@@ -137,7 +137,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>+bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
> {
>     com::sun::star::uno::Sequence< sal_Int8 > aSeq;
>     if ( rVal >>= aSeq )
>@@ -153,16 +153,16 @@ BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
>         else
>             _xVal = NULL;
> 
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return true;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     if ( _xVal.Is() )
>     {
>@@ -172,7 +172,7 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>         if ( _xVal->Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
>             nLen = aStat.nSize;
>         else
>-            return FALSE;
>+            return false;
> 
>         ULONG nRead = 0;
>         com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );
>@@ -186,6 +186,6 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>         rVal <<= aSeq;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
>diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
>index c8d7962..12828ac 100644
>--- a/svl/source/items/poolitem.cxx
>+++ b/svl/source/items/poolitem.cxx
>@@ -504,18 +504,18 @@ void SfxPoolItem::Store(SvStream &rStream) const
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
>+bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
> {
>     DBG_ERROR("There is no implementation for QueryValue for this item!");
>-    return FALSE;
>+    return false;
> }
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
>+bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
> {
>     DBG_ERROR("There is no implementation for PutValue for this item!");
>-    return FALSE;
>+    return false;
> }
> 
> SfxVoidItem::~SfxVoidItem()
>diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
>index 93f7e17..a3263f5 100644
>--- a/svl/source/items/ptitem.cxx
>+++ b/svl/source/items/ptitem.cxx
>@@ -139,7 +139,7 @@ SvStream& SfxPointItem::Store(SvStream &rStream, USHORT ) const
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPointItem::QueryValue( uno::Any& rVal,
>+bool SfxPointItem::QueryValue( uno::Any& rVal,
>                                BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -155,33 +155,33 @@ BOOL SfxPointItem::QueryValue( uno::Any& rVal,
>         case 0: rVal <<= aTmp; break;
>         case MID_X: rVal <<= aTmp.X; break;
>         case MID_Y: rVal <<= aTmp.Y; break;
>-        default: DBG_ERROR("Wrong MemberId!"); return FALSE;
>+        default: DBG_ERROR("Wrong MemberId!"); return true;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-BOOL SfxPointItem::PutValue( const uno::Any& rVal,
>+bool SfxPointItem::PutValue( const uno::Any& rVal,
>                              BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    BOOL bRet = FALSE;
>+    bool bRet = FALSE;
>     awt::Point aValue;
>     sal_Int32 nVal = 0;
>     if ( !nMemberId )
>-    {        
>+    {
>         bRet = ( rVal >>= aValue );
>         if( bConvert )
>         {
>             aValue.X = MM100_TO_TWIP(aValue.X);
>             aValue.Y = MM100_TO_TWIP(aValue.Y);
>-        }        
>+        }
>     }
>     else
>-    {        
>+    {
>         bRet = ( rVal >>= nVal );
>         if( bConvert )
>             nVal = MM100_TO_TWIP( nVal );
>diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
>index 146caa1..430a99a 100644
>--- a/svl/source/items/rectitem.cxx
>+++ b/svl/source/items/rectitem.cxx
>@@ -139,7 +139,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, USHORT ) const
> 
> 
> // -----------------------------------------------------------------------
>-BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                    BYTE nMemberId) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -157,17 +157,17 @@ BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
>         case MID_RECT_RIGHT: rVal <<= aVal.getY(); break;
>         case MID_WIDTH: rVal <<= aVal.getWidth(); break;
>         case MID_HEIGHT: rVal <<= aVal.getHeight(); break;
>-        default: DBG_ERROR("Wrong MemberID!"); return FALSE;
>+        default: DBG_ERROR("Wrong MemberID!"); return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>                                  BYTE nMemberId  )
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     nMemberId &= ~CONVERT_TWIPS;
>     com::sun::star::awt::Rectangle aValue;
>     sal_Int32 nVal = 0;
>@@ -190,7 +190,7 @@ BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
>             case MID_RECT_RIGHT: aVal.setY( nVal ); break;
>             case MID_WIDTH: aVal.setWidth( nVal ); break;
>             case MID_HEIGHT: aVal.setHeight( nVal ); break;
>-            default: DBG_ERROR("Wrong MemberID!"); return FALSE;
>+            default: DBG_ERROR("Wrong MemberID!"); return false;
>         }
>     }
> 
>diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
>index eb1d22f..66c5af9 100644
>--- a/svl/source/items/slstitm.cxx
>+++ b/svl/source/items/slstitm.cxx
>@@ -393,22 +393,22 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
>+bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
> {
>     com::sun::star::uno::Sequence< rtl::OUString > aValue;
>     if ( rVal >>= aValue )
>     {
>         SetStringList( aValue );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //----------------------------------------------------------------------------
> // virtual
>-BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>+bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
> {
>     // GetString() is not const!!!
>     SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this );
>@@ -416,7 +416,7 @@ BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
>     com::sun::star::uno::Sequence< rtl::OUString > aStringList;
>     pThis->GetStringList( aStringList );
>     rVal = ::com::sun::star::uno::makeAny( aStringList );
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
>index 4b0d1d9..f08d0e9 100644
>--- a/svl/source/items/srchitem.cxx
>+++ b/svl/source/items/srchitem.cxx
>@@ -429,7 +429,7 @@ void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags )
>     aSearchOpt.transliterateFlags = nFlags;
> }
> 
>-sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
>+bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -513,18 +513,18 @@ sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
> 
>         default:
>             DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" );
>-            return sal_False;
>+            return false;
>     }
> 
>-    return sal_True;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
> 
>-sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
>+bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_False;
>+    bool bRet = false;
>     sal_Int32 nInt = 0;
>     switch ( nMemberId )
>     {
>diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
>index 775b604..d00307d 100644
>--- a/svl/source/items/szitem.cxx
>+++ b/svl/source/items/szitem.cxx
>@@ -135,7 +135,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const
> }
> 
> // -----------------------------------------------------------------------
>-BOOL  SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
>+bool  SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
>                                BYTE nMemberId ) const
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>@@ -159,20 +159,20 @@ BOOL  SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
>             rVal <<= aTmp.getWidth(); break;
>         case MID_HEIGHT:
>             rVal <<= aTmp.getHeight(); break;
>-        default: DBG_ERROR("Wrong MemberId!"); return FALSE;
>+    default: DBG_ERROR("Wrong MemberId!"); return false;
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // -----------------------------------------------------------------------
>-BOOL SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
>+bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
>                             BYTE nMemberId )
> {
>     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
> 
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     com::sun::star::awt::Size aValue;
>     sal_Int32 nVal = 0;
>     if ( !nMemberId )
>diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
>index 1ff01a3..487f222 100644
>--- a/svl/source/items/visitem.cxx
>+++ b/svl/source/items/visitem.cxx
>@@ -85,21 +85,21 @@ SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation,
> 
> //============================================================================
> // virtual
>-BOOL SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
>+bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
> {
>     rVal <<= m_nValue;
>-    return TRUE;
>+    return true;
> }
> 
> //============================================================================
> // virtual
>-BOOL SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
>+bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
> {
>     if (rVal >>= m_nValue)
>-        return TRUE;
>+        return true;
> 
>     DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> //============================================================================
>diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
>index de3a149..e8d57e4 100644
>--- a/sw/inc/authfld.hxx
>+++ b/sw/inc/authfld.hxx
>@@ -97,8 +97,8 @@ public:
>     virtual SwFieldType* Copy()    const;
>     virtual void 		Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
> 
>     inline void     SetDoc(SwDoc* pNewDoc)              { m_pDoc = pNewDoc; }
>     SwDoc*          GetDoc(){ return m_pDoc; }
>@@ -178,8 +178,8 @@ public:
>     virtual void		SetPar1(const String& rStr);
>     virtual SwFieldType* ChgTyp( SwFieldType* );
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
> 
>     long                GetHandle() const       { return m_nHandle; }
> 
>diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
>index 8c9784e..ae94350 100644
>--- a/sw/inc/chpfld.hxx
>+++ b/sw/inc/chpfld.hxx
>@@ -90,8 +90,8 @@ public:
> 
>     inline const String& GetNumber() const;
>     inline const String& GetTitle() const;
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool         QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool         PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline BYTE SwChapterField::GetLevel() const 	{ return nLevel; }
>diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
>index ae287f7..06851c0 100644
>--- a/sw/inc/dbfld.hxx
>+++ b/sw/inc/dbfld.hxx
>@@ -60,8 +60,8 @@ public:
>     const String&	GetColumnName()	const {return sColumn;}
>     const SwDBData&	GetDBData()	const {return aDBData;}
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -124,8 +124,8 @@ public:
> 
>     // DBName
>     inline const SwDBData& 	GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline  void SwDBField::SetExpansion(const String& rStr)
>@@ -159,8 +159,8 @@ public:
> 
>     // Name oder Inhalt
>     virtual	String			GetCntnt(BOOL bName = FALSE) const;
>-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>     virtual USHORT          GetSubType() const;
>     virtual void            SetSubType(USHORT nType);
> };
>@@ -202,8 +202,8 @@ public:
>     // Condition
>     virtual const String&	GetPar1() const;
>     virtual void	   		SetPar1(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline BOOL	SwDBNextSetField::IsCondValid() const
>@@ -256,8 +256,8 @@ public:
>     virtual void			SetPar2(const String& rStr);
> 
>     // Die Datensatznummer steht in nFormat !!
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline BOOL	SwDBNumSetField::IsCondValid() const
>@@ -291,8 +291,8 @@ public:
> 
>     virtual String	 Expand() const;
>     virtual SwField* Copy() const;
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -324,8 +324,8 @@ public:
> 
>     inline long		GetSetNumber() const;
>     inline void		SetSetNumber(long nNum);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline long	SwDBSetNumberField::GetSetNumber() const
>diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
>index 52a9af6..c270e5c 100644
>--- a/sw/inc/ddefld.hxx
>+++ b/sw/inc/ddefld.hxx
>@@ -63,8 +63,8 @@ public:
>     virtual SwFieldType* Copy() const;
>     virtual const String& GetName() const;
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> 
>     String GetCmd() const;
>     void SetCmd( const String& rStr );
>diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
>index 4b39862..7659bff 100644
>--- a/sw/inc/docufld.hxx
>+++ b/sw/inc/docufld.hxx
>@@ -184,8 +184,8 @@ public:
> 
>     virtual USHORT		GetSubType() const;
>     // virtual void        SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> 
>     const String& GetUserString() const			{ return sUserStr; }
>     void SetUserString( const String& rS ) 		{ sUserStr = rS; }
>@@ -221,8 +221,8 @@ public:
>     inline void 		SetExpansion(const String& rStr) { aContent = rStr; }
>     inline const String& GetContent() const { return aContent; }
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -256,8 +256,8 @@ public:
>     inline void 		SetExpansion(const String& rStr) { aContent = rStr; }
>     inline const String& GetContent() const { return aContent; }
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -285,8 +285,8 @@ public:
> 
>     virtual String	 	Expand() const;
>     virtual SwField* 	Copy() const;
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> 
>@@ -326,8 +326,8 @@ public:
> 
>     virtual	USHORT		GetSubType() const;
>     virtual void		SetSubType(USHORT nSub);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -398,8 +398,8 @@ public:
> 
>     virtual USHORT		GetSubType() const;
>     // virtual void        SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -435,8 +435,8 @@ public:
>     // Bedingung erfragen/setzen
>     virtual const String& GetPar1() const;
>     virtual void		SetPar1(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -484,8 +484,8 @@ public:
>     // Macrotext
>     virtual String	GetPar2() const;
>     virtual void	SetPar2(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> 
>     static void CreateMacroString( String& rMacro,
>                                    const String& rMacroName,
>@@ -547,8 +547,8 @@ public:
> 
>     sal_uInt32 GetNumberOfParagraphs() const;
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>     virtual String      GetDescription() const;
> };
> 
>@@ -584,8 +584,8 @@ public:
>     String					GetName() const { return aName; }
>     void                    SetName( const String& rName ) { aName = rName; }
>     inline void 			SetExpansion(const String& rStr) { aContent = rStr; }
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -621,8 +621,8 @@ public:
> 
>     inline void 		SetExpansion(const String& rStr) { aContent = rStr; }
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> 
>@@ -663,8 +663,8 @@ public:
> 
>     short GetOffset() const 		{ return nOffset; }
>     void SetOffset( short nOff )	{ nOffset = nOff; }
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -705,8 +705,8 @@ public:
>     void SetText( const String& rTxt )		{ sTxt = rTxt; }
> 
>     void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -745,8 +745,8 @@ public:
> 
>     SwCharFmt* GetCharFmt() const
>         { return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); }
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -792,8 +792,8 @@ public:
> 
>     BOOL 					IsCodeURL() const { return bCodeURL; }
>     void					SetCodeURL( BOOL bURL ) { bCodeURL = bURL; }
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -828,8 +828,8 @@ public:
>     virtual const String& 	GetPar1() const;
>     virtual void			SetPar1(const String& rStr);
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> 
>diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
>index 46fd26c..ed0f342 100644
>--- a/sw/inc/expfld.hxx
>+++ b/sw/inc/expfld.hxx
>@@ -127,8 +127,8 @@ public:
> 
>     virtual USHORT				GetSubType() const;
>     virtual void				SetSubType(USHORT nType);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> 
>     static USHORT 		GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc);
>     // #i82544# 
>@@ -204,8 +204,8 @@ public:
>     const SwNode* GetOutlineChgNd() const	{ return pOutlChgNd; }
>     void SetOutlineChgNd( const SwNode* p )	{ pOutlChgNd = p; }
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline void SwSetExpFieldType::SetType( USHORT nTyp )
>@@ -268,8 +268,8 @@ public:
>     // Die Formel
>     virtual String				GetPar2() 	const;
>     virtual void				SetPar2(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> inline const String& SwSetExpField::GetExpStr() const
>@@ -347,8 +347,8 @@ public:
> 
>     virtual USHORT			GetSubType() const;
>     virtual void			SetSubType(USHORT nSub);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> /*--------------------------------------------------------------------
>@@ -428,8 +428,8 @@ public:
>     // Die Formel
>     virtual String		GetPar2() 	const;
>     virtual void		SetPar2(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> };
> 
> 
>diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
>index 73766c6..06c2a74 100644
>--- a/sw/inc/fchrfmt.hxx
>+++ b/sw/inc/fchrfmt.hxx
>@@ -69,8 +69,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     // an das SwTxtCharFmt weiterleiten (vom SwClient)
>     virtual void    Modify( SfxPoolItem*, SfxPoolItem* );
>diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
>index 500a4f1..5409482 100644
>--- a/sw/inc/fldbas.hxx
>+++ b/sw/inc/fldbas.hxx
>@@ -283,8 +283,8 @@ public:
>     // nur in abgeleiteten Klassen
>     virtual const String&	GetName() const;
>     virtual SwFieldType* 	Copy()    const = 0;
>-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>-    virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
>+    virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
>+    virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
> 
>             USHORT 			Which() const { return nWhich; }
> 
>@@ -369,8 +369,8 @@ public:
>     virtual void		SetPar1(const String& rStr);
>     virtual void		SetPar2(const String& rStr);
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>     // hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..)
>     BOOL		 	HasClickHdl() const;
>     // ist es ein Fix-Feld?
>diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
>index 6bc30d8..64ceaae 100644
>--- a/sw/inc/flddat.hxx
>+++ b/sw/inc/flddat.hxx
>@@ -141,8 +141,8 @@ public:
>         virtual String 			Expand() const;
>         virtual SwField* 		Copy() const;
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
>+        virtual bool            QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
>+        virtual bool            PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
> };
> 
> #endif // _FLDDAT_HXX
>diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
>index 4a7bcf0..938d825 100644
>--- a/sw/inc/flddropdown.hxx
>+++ b/sw/inc/flddropdown.hxx
>@@ -261,7 +261,7 @@ public:
>           - FIELD_PROP_PAR3 Get the help text of the field.
>           - FIELD_PROP_PAR4 Get the tool tip of the field.
>     */
>-    virtual BOOL QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const;
>+    virtual bool QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const;
> 
>     /**
>        API: Sets a property value on the dropdown field.
>@@ -273,7 +273,7 @@ public:
>           - FIELD_PROP_PAR3  Set the help text of the field.
>           - FIELD_PROP_PAR4  Set the tool tip of the field.
>     */
>-        virtual BOOL PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId);
>+    virtual bool PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId);
> };
> 
> #endif
>diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
>index 569a80e..794e50b 100644
>--- a/sw/inc/fmtanchr.hxx
>+++ b/sw/inc/fmtanchr.hxx
>@@ -68,8 +68,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     RndStdIds GetAnchorId() const { return nAnchorId; }
>     USHORT GetPageNum() const { return nPageNum; }
>diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
>index 4e6bb26..caf03af 100644
>--- a/sw/inc/fmtautofmt.hxx
>+++ b/sw/inc/fmtautofmt.hxx
>@@ -63,8 +63,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
>     const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
>diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
>index b3da5b8..dd0bfe7 100644
>--- a/sw/inc/fmtclds.hxx
>+++ b/sw/inc/fmtclds.hxx
>@@ -115,8 +115,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     const SwColumns &GetColumns() const { return aColumns; }
>           SwColumns &GetColumns()		{ return aColumns; }
>diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
>index 93e45c2..68b8025 100644
>--- a/sw/inc/fmtcnct.hxx
>+++ b/sw/inc/fmtcnct.hxx
>@@ -59,7 +59,7 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
> 
>     SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
>     SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
>diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
>index e781191..bef2e4f 100644
>--- a/sw/inc/fmtfsize.hxx
>+++ b/sw/inc/fmtfsize.hxx
>@@ -80,8 +80,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     SwFrmSize GetHeightSizeType() const { return eFrmHeightType; }
>     void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; }
>diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
>index dd55cfa..e8f6979 100644
>--- a/sw/inc/fmtftntx.hxx
>+++ b/sw/inc/fmtftntx.hxx
>@@ -65,8 +65,8 @@ public:
> 
>     virtual int				operator==( const SfxPoolItem& ) const;
> 
>-    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 );
>+    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 );
> 
> // will be used at time??
> //	void					FillVariable( SbxVariable &rVar,
>diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
>index 0a6d5fc..183eba9 100644
>--- a/sw/inc/fmtinfmt.hxx
>+++ b/sw/inc/fmtinfmt.hxx
>@@ -68,9 +68,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
> 
>-    virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
> 
>diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
>index f9aa5a4..1c73455 100644
>--- a/sw/inc/fmtline.hxx
>+++ b/sw/inc/fmtline.hxx
>@@ -54,8 +54,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     ULONG GetStartValue() const { return nStartValue; }
>     BOOL  IsCount()		  const { return bCountLines != 0; }
>diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
>index cce80a7..9f5bb0c 100644
>--- a/sw/inc/fmtornt.hxx
>+++ b/sw/inc/fmtornt.hxx
>@@ -60,8 +60,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     sal_Int16 GetVertOrient() const { return eOrient; }
>     sal_Int16 GetRelationOrient() const { return eRelation; }
>@@ -98,8 +98,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     sal_Int16 GetHoriOrient() const { return eOrient; }
>     sal_Int16 GetRelationOrient() const { return eRelation; }
>diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
>index 1577b3a..b5c0397 100644
>--- a/sw/inc/fmtpdsc.hxx
>+++ b/sw/inc/fmtpdsc.hxx
>@@ -72,8 +72,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
> 
>diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
>index 7324f44..a5c49da 100644
>--- a/sw/inc/fmtruby.hxx
>+++ b/sw/inc/fmtruby.hxx
>@@ -61,9 +61,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
> 
>-    virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
> 
>diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
>index 3f12c5c..062a255 100644
>--- a/sw/inc/fmtsrnd.hxx
>+++ b/sw/inc/fmtsrnd.hxx
>@@ -60,8 +60,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
> 
>     SwSurround GetSurround()const { return SwSurround( GetValue() ); }
>diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
>index f28f33f..4a5162c 100644
>--- a/sw/inc/fmturl.hxx
>+++ b/sw/inc/fmturl.hxx
>@@ -64,8 +64,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; }
>     void SetURL( const String &rURL, BOOL bServerMap );
>diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
>index 6616f92..2480473 100644
>--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
>+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
>@@ -56,8 +56,8 @@ public:
>     virtual int operator==( const SfxPoolItem& _rAttr ) const;
>     virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     // direct accessors to data
>     void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition );
>diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
>index 943e4ef..d071584 100644
>--- a/sw/inc/grfatr.hxx
>+++ b/sw/inc/grfatr.hxx
>@@ -75,9 +75,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> 
>     inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
>@@ -127,9 +127,9 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
>-    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 );
> 
>     void SetUnrotatedSize( const Size& rSz ) 		{ aUnrotatedSize = rSz; }
>@@ -236,9 +236,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
> 
>-    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal,
>                                             BYTE nMemberId = 0 );
> 
> 
>@@ -276,9 +276,9 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper* pIntl = 0 ) const;
>-    virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool        	QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool			PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> };
> 
>@@ -300,9 +300,9 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
>+    virtual	bool        	QueryValue( com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 ) const;
>-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal,
>+    virtual	bool			PutValue( const com::sun::star::uno::Any& rVal,
>                                         BYTE nMemberId = 0 );
> };
> 
>diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
>index f6dcfaa..de22948 100644
>--- a/sw/inc/paratr.hxx
>+++ b/sw/inc/paratr.hxx
>@@ -79,8 +79,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0) const;
>-    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 );
>+    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 );
> 
>     inline BYTE GetLines() const { return nLines; }
>     inline BYTE &GetLines() { return nLines; }
>@@ -165,8 +165,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>-    virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
>+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
>+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
> };
> 
> class SwParaConnectBorderItem : public SfxBoolItem
>diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
>index 5819339..0649d23 100644
>--- a/sw/inc/reffld.hxx
>+++ b/sw/inc/reffld.hxx
>@@ -149,8 +149,8 @@ public:
>     virtual void		SetPar1(const String& rStr);
> 
>     virtual String 		GetPar2() const;
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
> 
>     void                ConvertProgrammaticToUIName();
> 
>diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
>index 3b8240c..f575b51 100644
>--- a/sw/inc/tgrditem.hxx
>+++ b/sw/inc/tgrditem.hxx
>@@ -63,8 +63,8 @@ public:
>                                     SfxMapUnit ePresMetric,
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
>-    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 );
>+    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 );
> 
>     SwTextGridItem&  operator=( const SwTextGridItem& );
> 
>diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
>index 0af250b..f40dbe5 100644
>--- a/sw/inc/usrfld.hxx
>+++ b/sw/inc/usrfld.hxx
>@@ -73,8 +73,8 @@ public:
>     BOOL					IsDeleted() const 		{ return bDeleted; }
>     void					SetDeleted( BOOL b )	{ bDeleted = b; }
> 
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
>+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
>+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
> };
> 
> inline BOOL SwUserFieldType::IsValid() const
>@@ -125,8 +125,8 @@ public:
>     // Inhalt
>     virtual String	 		GetPar2() const;
>     virtual void	 		SetPar2(const String& rStr);
>-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
>+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
>+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
> };
> 
> #endif // _USRFLD_HXX
>diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
>index f7383f1..f3037ad 100644
>--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
>+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
>@@ -77,10 +77,10 @@ SfxPoolItem* SwFmtWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
>     return new SwFmtWrapInfluenceOnObjPos(*this);
> }
> 
>-BOOL SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
>+bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_WRAP_INFLUENCE:
>@@ -90,16 +90,16 @@ BOOL SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
>         break;
>         default:
>             ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
> 
>     return bRet;
> }
> 
>-BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
>+bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
> {
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
> 
>     switch ( nMemberId )
>     {
>@@ -119,13 +119,13 @@ BOOL SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
>             else
>             {
>                 ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
>-                bRet = sal_False;
>+                bRet = false;
>             }
>         }
>         break;
>         default:
>             ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
> 
>     return bRet;
>diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
>index 7e32e2f..92dd8a5 100644
>--- a/sw/source/core/fields/authfld.cxx
>+++ b/sw/source/core/fields/authfld.cxx
>@@ -442,7 +442,7 @@ USHORT	SwAuthorityFieldType::GetSequencePos(long nHandle)
> /* -----------------------------15.11.00 17:33--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL    SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
>+bool    SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -494,14 +494,14 @@ BOOL    SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /* -----------------------------15.11.00 17:33--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL    SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
>+bool    SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
> {
>-    sal_Bool bRet = TRUE;
>+    bool bRet = true;
>     String sTmp;
>     switch( nWhichId )
>     {
>@@ -554,7 +554,7 @@ BOOL    SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
>                             if(nVal >= 0 && nVal < AUTH_FIELD_END)
>                                 pSortKey->eField = (ToxAuthorityField) nVal;
>                             else
>-                                bRet = FALSE;
>+                                bRet = false;
>                         }
>                         else if(pValue[j].Name.equalsAsciiL(SW_PROP_NAME(UNO_NAME_IS_SORT_ASCENDING)))
>                         {
>@@ -742,13 +742,13 @@ const char* aFieldNames[] =
> /* -----------------------------16.11.00 12:27--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL    SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const
>+bool    SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const
> {
>     if(!GetTyp())
>-        return FALSE;
>+        return false;
>     const SwAuthEntry* pAuthEntry = ((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle);
>     if(!pAuthEntry)
>-        return FALSE;
>+        return false;
>     Sequence <PropertyValue> aRet(AUTH_FIELD_END);
>     PropertyValue* pValues = aRet.getArray();
>     for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
>@@ -761,7 +761,8 @@ BOOL    SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const
>             pValues[i].Value <<= OUString(rField);
>     }
>     rAny <<= aRet;
>-    return FALSE;
>+    /* FIXME: it is weird that we always return false here */
>+    return false;
> }
> /* -----------------------------15.11.00 17:33--------------------------------
> 
>@@ -774,14 +775,14 @@ sal_Int16 lcl_Find(const OUString& rFieldName)
>     return -1;
> }
> //----------------------------------------------------------------------------
>-BOOL    SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ )
>+bool    SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ )
> {
>     if(!GetTyp() || !((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle))
>-        return FALSE;
>+        return false;
> 
>     Sequence <PropertyValue> aParam;
>     if(!(rAny >>= aParam))
>-        return FALSE;
>+        return false;
> 
>     String sToSet;
>     sToSet.Fill(AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER);
>@@ -807,7 +808,8 @@ BOOL    SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ )
>     ((SwAuthorityFieldType*)GetTyp())->RemoveField(m_nHandle);
>     m_nHandle = ((SwAuthorityFieldType*)GetTyp())->AddField(sToSet);
> 
>-    return FALSE;
>+    /* FIXME: it is weird that we always return false here */
>+    return false;
> }
> /* -----------------11.10.99 09:43-------------------
> 
>diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
>index 693d7ce..b673a8e 100644
>--- a/sw/source/core/fields/chpfld.cxx
>+++ b/sw/source/core/fields/chpfld.cxx
>@@ -229,7 +229,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
> /*-----------------05.03.98 16:19-------------------
> 
> --------------------------------------------------*/
>-BOOL SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -260,12 +260,12 @@ BOOL SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 16:19-------------------
> 
> --------------------------------------------------*/
>-BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     BOOL bRet = TRUE;
>     switch( nWhichId )
>@@ -277,7 +277,7 @@ BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>         if(nTmp >= 0 && nTmp < MAXLEVEL)
>             nLevel = nTmp;
>         else
>-            bRet = FALSE;
>+            bRet = false;
>         break;
>     }
> 
>@@ -303,7 +303,7 @@ BOOL SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> 
>     default:
>         DBG_ERROR("illegal property");
>-        bRet = FALSE;
>+        bRet = false;
>     }
>     return bRet;
> }
>diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
>index 92ad0ed..da19af7 100644
>--- a/sw/source/core/fields/dbfld.cxx
>+++ b/sw/source/core/fields/dbfld.cxx
>@@ -131,7 +131,7 @@ void SwDBFieldType::ReleaseRef()
> /* -----------------24.02.99 14:51-------------------
>  *
>  * --------------------------------------------------*/
>-BOOL SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -150,12 +150,12 @@ BOOL SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /* -----------------24.02.99 14:51-------------------
>  *
>  * --------------------------------------------------*/
>-BOOL SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -195,7 +195,7 @@ BOOL SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: SwDBField
>@@ -423,7 +423,7 @@ void SwDBField::SetSubType(USHORT nType)
> /*-----------------06.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -451,13 +451,13 @@ BOOL SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> 
> }
> /*-----------------06.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -513,7 +513,7 @@ BOOL SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -567,7 +567,7 @@ String SwDBNameInfField::GetCntnt(BOOL bName) const
> /*-----------------06.03.98 16:55-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -589,12 +589,12 @@ BOOL SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------06.03.98 16:55-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -612,7 +612,7 @@ BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>         USHORT nSubTyp = GetSubType();
>         sal_Bool bVisible = sal_False;
>         if(!(rAny >>= bVisible))
>-            return FALSE;
>+            return false;
>         if(bVisible)
>             nSubTyp &= ~nsSwExtendedSubType::SUB_INVISIBLE;
>         else
>@@ -623,7 +623,7 @@ BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /* -----------------4/10/2003 15:03------------------
> 
>@@ -712,9 +712,9 @@ void SwDBNextSetField::SetPar1(const String& rStr)
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_PAR3:
>@@ -728,9 +728,9 @@ BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_PAR3:
>@@ -848,9 +848,9 @@ void SwDBNumSetField::SetPar2(const String& rStr)
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_PAR3:
>@@ -867,9 +867,9 @@ BOOL SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL    SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool    SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_PAR3:
>@@ -949,14 +949,14 @@ SwField* SwDBNameField::Copy() const
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     return SwDBNameInfField::QueryValue(rAny, nWhichId );
> }
> /*-----------------06.03.98 16:16-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     return SwDBNameInfField::PutValue(rAny, nWhichId );
> }
>@@ -1028,9 +1028,9 @@ SwField* SwDBSetNumberField::Copy() const
> /*-----------------06.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_USHORT1:
>@@ -1047,9 +1047,9 @@ BOOL SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> /*-----------------06.03.98 16:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_USHORT1:
>diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
>index 7979d33..6eb7211 100644
>--- a/sw/source/core/fields/ddefld.cxx
>+++ b/sw/source/core/fields/ddefld.cxx
>@@ -331,7 +331,7 @@ void SwDDEFieldType::_RefCntChgd()
> /* -----------------------------28.08.00 16:23--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>+bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
> {
>     BYTE nPart = 0;
>     switch( nWhichId )
>@@ -353,12 +353,12 @@ BOOL SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>     }
>     if( nPart )
>         rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator));
>-    return TRUE;
>+    return true;
> }
> /* -----------------------------28.08.00 16:23--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
>+bool SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
> {
>     BYTE nPart = 0;
>     switch( nWhichId )
>@@ -389,7 +389,7 @@ BOOL SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
>         sCmd.SetToken( nPart-1, sfx2::cTokenSeperator, ::GetString( rVal, sTmp ) );
>         SetCmd( sCmd );
>     }
>-    return TRUE;
>+    return true;
> }
> /* ---------------------------------------------------------------------------
> 
>diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
>index 66245b3..4478286 100644
>--- a/sw/source/core/fields/docufld.cxx
>+++ b/sw/source/core/fields/docufld.cxx
>@@ -252,7 +252,7 @@ sal_uInt16 SwPageNumberField::GetSubType() const
> /*-----------------05.03.98 10:25-------------------
> 
> --------------------------------------------------*/
>-BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -280,14 +280,14 @@ BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 10:25-------------------
> 
> --------------------------------------------------*/
>-BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     sal_Int16 nSet = 0;
>     switch( nWhichId )
>     {
>@@ -319,7 +319,7 @@ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>                 nSubType = PG_NEXT;
>             break;
>             default:
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>     case FIELD_PROP_PAR1:
>@@ -386,9 +386,9 @@ SwField* SwAuthorField::Copy() const
> /*-----------------05.03.98 11:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>-    sal_Bool bVal;
>+    bool bVal;
>     switch( nWhichId )
>     {
>     case FIELD_PROP_BOOL1:
>@@ -408,12 +408,12 @@ BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 11:15-------------------
> 
> --------------------------------------------------*/
>-BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -435,7 +435,7 @@ BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -532,7 +532,7 @@ SwField* SwFileNameField::Copy() const
> /*-----------------05.03.98 08:59-------------------
> 
> --------------------------------------------------*/
>-BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -569,12 +569,12 @@ BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 09:01-------------------
> 
> --------------------------------------------------*/
>-BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -619,7 +619,7 @@ BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: SwTemplNameFieldType
>@@ -708,7 +708,7 @@ SwField* SwTemplNameField::Copy() const
> /*-----------------05.03.98 08:59-------------------
> 
> --------------------------------------------------*/
>-BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch ( nWhichId )
>     {
>@@ -731,12 +731,12 @@ BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 09:01-------------------
> 
> --------------------------------------------------*/
>-BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch ( nWhichId )
>     {
>@@ -771,7 +771,7 @@ BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: SwDocStatFieldType
>@@ -863,7 +863,7 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm )
> /*-----------------05.03.98 11:38-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch ( nWhichId )
>     {
>@@ -873,14 +873,14 @@ BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 11:38-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     switch ( nWhichId )
>     {
>     case FIELD_PROP_USHORT2:
>@@ -892,7 +892,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>                     nSet != SVX_NUM_BITMAP)
>             {
>                 SetFormat(nSet);
>-                bRet = TRUE;
>+                bRet = true;
>             }
>         }
>         break;
>@@ -1261,7 +1261,7 @@ void SwDocInfoField::SetLanguage(sal_uInt16 nLng)
> /* ---------------------------------------------------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -1306,12 +1306,12 @@ BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         return SwField::QueryValue(rAny, nWhichId);
>     }
>-    return sal_True;
>+    return true;
> }
> /* ---------------------------------------------------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     sal_Int32 nValue = 0;
>     switch( nWhichId )
>@@ -1356,7 +1356,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         return SwField::PutValue(rAny, nWhichId);
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -1611,7 +1611,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const
> /* ---------------------------------------------------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     const String* pOut = 0;
>     switch( nWhichId )
>@@ -1639,12 +1639,12 @@ BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     }
>     if( pOut )
>         rAny <<= OUString( *pOut );
>-    return sal_True;
>+    return true;
> }
> /* ---------------------------------------------------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -1670,7 +1670,7 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> //------------------------------------------------------------------------------
>@@ -1751,7 +1751,7 @@ SwField* SwHiddenParaField::Copy() const
> /*-----------------05.03.98 13:25-------------------
> 
> --------------------------------------------------*/
>-BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch ( nWhichId )
>     {
>@@ -1768,12 +1768,12 @@ BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 13:25-------------------
> 
> --------------------------------------------------*/
>-BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch ( nWhichId )
>     {
>@@ -1787,7 +1787,7 @@ BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -1916,7 +1916,7 @@ sal_uInt32 SwPostItField::GetNumberOfParagraphs() const
> /*-----------------05.03.98 13:42-------------------
> 
> --------------------------------------------------*/
>-BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -1973,14 +1973,14 @@ BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> 
> /*-----------------05.03.98 13:42-------------------
> 
> --------------------------------------------------*/
>-BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -2024,7 +2024,7 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: DokumentinfoFields
>@@ -2124,7 +2124,7 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub)
> /*-----------------05.03.98 14:14-------------------
> 
> --------------------------------------------------*/
>-BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -2147,12 +2147,12 @@ BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 14:14-------------------
> 
> --------------------------------------------------*/
>-BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -2176,7 +2176,7 @@ BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> //-------------------------------------------------------------------------
> 
>@@ -2244,7 +2244,7 @@ void SwRefPageSetField::SetPar2(const String& rStr)
> /*-----------------05.03.98 14:52-------------------
> 
> --------------------------------------------------*/
>-BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -2257,12 +2257,12 @@ BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 14:52-------------------
> 
> --------------------------------------------------*/
>-BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -2275,7 +2275,7 @@ BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: relatives Seitennummern - Abfrage Feld
>@@ -2515,7 +2515,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
> /*-----------------05.03.98 14:52-------------------
> 
> --------------------------------------------------*/
>-BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -2528,12 +2528,12 @@ BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>         default:
>             DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 14:52-------------------
> 
> --------------------------------------------------*/
>-BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -2559,7 +2559,7 @@ BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -2651,7 +2651,7 @@ void SwJumpEditField::SetPar2(const String& rStr)
> /*-----------------05.03.98 15:00-------------------
> 
> --------------------------------------------------*/
>-BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -2680,12 +2680,12 @@ BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------05.03.98 15:00-------------------
> 
> --------------------------------------------------*/
>-BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -2715,7 +2715,7 @@ BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> 
>@@ -2763,7 +2763,7 @@ void SwCombinedCharField::SetPar1(const String& rStr)
>     sCharacters = rStr.Copy( 0, MAX_COMBINED_CHARACTERS );
> }
> 
>-BOOL SwCombinedCharField::QueryValue( uno::Any& rAny,
>+bool SwCombinedCharField::QueryValue( uno::Any& rAny,
>                                         USHORT nWhichId ) const
> {
>     switch( nWhichId )
>@@ -2774,10 +2774,10 @@ BOOL SwCombinedCharField::QueryValue( uno::Any& rAny,
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SwCombinedCharField::PutValue( const uno::Any& rAny,
>+bool SwCombinedCharField::PutValue( const uno::Any& rAny,
>                                         USHORT nWhichId )
> {
>     switch( nWhichId )
>@@ -2788,6 +2788,6 @@ BOOL SwCombinedCharField::PutValue( const uno::Any& rAny,
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
>diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
>index 07c8839..f8aa7db 100644
>--- a/sw/source/core/fields/expfld.cxx
>+++ b/sw/source/core/fields/expfld.cxx
>@@ -423,7 +423,7 @@ void SwGetExpField::SetLanguage(USHORT nLng)
> /*-----------------07.03.98 16:08-------------------
> 
> --------------------------------------------------*/
>-BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -457,12 +457,12 @@ BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         return SwField::QueryValue(rAny, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------07.03.98 16:08-------------------
> 
> --------------------------------------------------*/
>-BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     sal_Int32 nTmp = 0;
>     String sTmp;
>@@ -499,7 +499,7 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         return SwField::PutValue(rAny, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> 
> /*-----------------JP: 17.06.93 -------------------
>@@ -655,7 +655,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
> /* -----------------24.03.99 09:44-------------------
>  *
>  * --------------------------------------------------*/
>-BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -677,10 +677,10 @@ BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -714,7 +714,7 @@ BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> 
> BOOL SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
>@@ -1069,7 +1069,7 @@ String SwInputField::Expand() const
> /*-----------------06.03.98 11:12-------------------
> 
> --------------------------------------------------*/
>-BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -1088,12 +1088,12 @@ BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------06.03.98 11:12-------------------
> 
> --------------------------------------------------*/
>-BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -1112,7 +1112,7 @@ BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*--------------------------------------------------------------------
>     Beschreibung: Bedingung setzen
>@@ -1179,7 +1179,7 @@ void SwInputField::SetSubType(USHORT nSub)
> /*-----------------05.03.98 17:22-------------------
> 
> --------------------------------------------------*/
>-BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -1241,12 +1241,12 @@ BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         return SwField::QueryValue(rAny, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------05.03.98 17:22-------------------
> 
> --------------------------------------------------*/
>-BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     sal_Int32 nTmp32 = 0;
>     sal_Int16 nTmp16 = 0;
>@@ -1323,7 +1323,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         return SwField::PutValue(rAny, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
>index 7abd94e..6e79643 100644
>--- a/sw/source/core/fields/fldbas.cxx
>+++ b/sw/source/core/fields/fldbas.cxx
>@@ -178,13 +178,13 @@ const String& SwFieldType::GetName() const
>     return aEmptyStr;
> }
> 
>-BOOL SwFieldType::QueryValue( uno::Any&, USHORT ) const
>+bool SwFieldType::QueryValue( uno::Any&, USHORT ) const
> {
>-    return FALSE;
>+    return false;
> }
>-BOOL SwFieldType::PutValue( const uno::Any& , USHORT )
>+bool SwFieldType::PutValue( const uno::Any& , USHORT )
> {
>-    return FALSE;
>+    return false;
> }
> 
> /*--------------------------------------------------------------------
>@@ -326,7 +326,7 @@ void SwField::SetSubType(USHORT )
> //	ASSERT(0, "Sorry Not implemented");
> }
> 
>-BOOL  SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>+bool  SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -339,9 +339,9 @@ BOOL  SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>         default:
>             DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
>-BOOL SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
>+bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -355,7 +355,7 @@ BOOL SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
>         default:
>             DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> 
> 
>diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
>index 321b0b5..281a676 100644
>--- a/sw/source/core/fields/flddat.cxx
>+++ b/sw/source/core/fields/flddat.cxx
>@@ -229,7 +229,7 @@ Time SwDateTimeField::GetTime(BOOL bUseOffset) const
> /*-----------------04.03.98 11:05-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>+bool SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -269,12 +269,12 @@ BOOL SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
>     default:
>         return SwField::QueryValue(rVal, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------04.03.98 11:05-------------------
> 
> --------------------------------------------------*/
>-BOOL SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId )
>+bool SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId )
> {
>     sal_Int32 nTmp = 0;
>     switch( nWhichId )
>@@ -316,6 +316,6 @@ BOOL SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId )
>         default:
>             return SwField::PutValue(rVal, nWhichId);
>     }
>-    return TRUE;
>+    return true;
> }
> 
>diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
>index 25f7fbf..83cfcfc 100644
>--- a/sw/source/core/fields/flddropdown.cxx
>+++ b/sw/source/core/fields/flddropdown.cxx
>@@ -200,7 +200,7 @@ void SwDropDownField::SetToolTip(const String & rToolTip)
>     aToolTip = rToolTip;
> }
> 
>-BOOL SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const
>+bool SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const
> {
>     nWhich &= ~CONVERT_TWIPS;
>     switch( nWhich )
>@@ -225,10 +225,10 @@ BOOL SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SwDropDownField::PutValue(const uno::Any &rVal,
>+bool SwDropDownField::PutValue(const uno::Any &rVal,
>                                USHORT nWhich)
> {
>     switch( nWhich )
>@@ -280,5 +280,5 @@ BOOL SwDropDownField::PutValue(const uno::Any &rVal,
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
>diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
>index 1471d46..86f9546 100644
>--- a/sw/source/core/fields/macrofld.cxx
>+++ b/sw/source/core/fields/macrofld.cxx
>@@ -180,7 +180,7 @@ String SwMacroField::GetPar2() const
> /*-----------------05.03.98 13:38-------------------
> 
> --------------------------------------------------*/
>-BOOL SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -199,12 +199,12 @@ BOOL SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------05.03.98 13:38-------------------
> 
> --------------------------------------------------*/
>-BOOL SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     String sTmp;
>     switch( nWhichId )
>@@ -226,7 +226,7 @@ BOOL SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>         DBG_ERROR("illegal property");
>     }
> 
>-    return TRUE;
>+    return true;
> }
> 
> // create an internally used macro name from the library and macro name parts
>diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
>index d0c39fb..12475e3 100644
>--- a/sw/source/core/fields/reffld.cxx
>+++ b/sw/source/core/fields/reffld.cxx
>@@ -589,7 +589,7 @@ String SwGetRefField::GetPar2() const
> /*-----------------06.03.98 13:34-------------------
> 
> --------------------------------------------------*/
>-BOOL SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -658,12 +658,12 @@ BOOL SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------06.03.98 13:34-------------------
> 
> --------------------------------------------------*/
>-BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     String sTmp;
>     switch( nWhichId )
>@@ -687,7 +687,7 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>             case ReferenceFieldPart::NUMBER_NO_CONTEXT:   nPart = REF_NUMBER_NO_CONTEXT;   break;
>             case ReferenceFieldPart::NUMBER_FULL_CONTEXT: nPart = REF_NUMBER_FULL_CONTEXT; break;
>             // <--
>-            default: return FALSE;
>+            default: return false;
>             }
>             SetFormat(nPart);
>         }
>@@ -735,7 +735,7 @@ BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /* -----------------------------11.01.2002 12:50------------------------------
> 
>diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
>index b9e64b2..aa3cb8e 100644
>--- a/sw/source/core/fields/scrptfld.cxx
>+++ b/sw/source/core/fields/scrptfld.cxx
>@@ -111,7 +111,7 @@ String SwScriptField::GetPar2() const
> /*-----------------05.03.98 15:00-------------------
> 
> --------------------------------------------------*/
>-BOOL SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -127,12 +127,12 @@ BOOL SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> /*-----------------05.03.98 15:00-------------------
> 
> --------------------------------------------------*/
>-BOOL SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -148,6 +148,6 @@ BOOL SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return TRUE;
>+    return true;
> }
> 
>diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
>index 5b43ea2..8fb12bb 100644
>--- a/sw/source/core/fields/tblcalc.cxx
>+++ b/sw/source/core/fields/tblcalc.cxx
>@@ -194,9 +194,9 @@ void SwTblField::SetPar2(const String& rStr)
> /*-----------------04.03.98 10:33-------------------
> 
> --------------------------------------------------*/
>-BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch ( nWhichId )
>     {
>     case FIELD_PROP_PAR2:
>@@ -221,16 +221,16 @@ BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>         rAny <<= (sal_Int32)GetFormat();
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>     }
>     return bRet;
> }
> /*-----------------04.03.98 10:33-------------------
> 
> --------------------------------------------------*/
>-BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     String sTmp;
>     switch ( nWhichId )
>     {
>@@ -254,11 +254,8 @@ BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>         }
>         break;
>     default:
>-        bRet = sal_False;
>+        bRet = false;
>     }
>     return bRet;
> }
> 
>-
>-
>-
>diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
>index aff0e38..a5e9b37 100644
>--- a/sw/source/core/fields/usrfld.cxx
>+++ b/sw/source/core/fields/usrfld.cxx
>@@ -132,7 +132,7 @@ void SwUserField::SetSubType(sal_uInt16 nSub)
> /*-----------------09.03.98 08:04-------------------
> 
> --------------------------------------------------*/
>-BOOL SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -154,12 +154,12 @@ BOOL SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         return SwField::QueryValue(rAny, nWhichId);
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------09.03.98 08:04-------------------
> 
> --------------------------------------------------*/
>-sal_Bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -185,7 +185,7 @@ sal_Bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         return SwField::PutValue(rAny, nWhichId);
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /*--------------------------------------------------------------------
>@@ -312,7 +312,7 @@ void SwUserFieldType::SetContent( const String& rStr, sal_uInt32 nFmt )
> /*-----------------04.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-BOOL SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>+bool SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
> {
>     switch( nWhichId )
>     {
>@@ -331,12 +331,12 @@ BOOL SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> /*-----------------04.03.98 17:05-------------------
> 
> --------------------------------------------------*/
>-BOOL SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>+bool SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
> {
>     switch( nWhichId )
>     {
>@@ -371,7 +371,7 @@ BOOL SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
>     default:
>         DBG_ERROR("illegal property");
>     }
>-    return sal_True;
>+    return true;
> }
> 
> 
>diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
>index 43e9ba0..1540098 100644
>--- a/sw/source/core/graphic/grfatr.cxx
>+++ b/sw/source/core/graphic/grfatr.cxx
>@@ -91,10 +91,10 @@ BOOL lcl_IsHoriOnOddPages(int nEnum)
>                    nEnum == RES_MIRROR_GRAPH_BOTH;
>             return bEnum;
> }
>-BOOL SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>-    sal_Bool bRet = sal_True,
>-         bVal;
>+    bool bRet = true;
>+    sal_Bool bVal;
>     // Vertikal und Horizontal sind mal getauscht worden!
>     nMemberId &= ~CONVERT_TWIPS;
>     switch ( nMemberId )
>@@ -111,15 +111,15 @@ BOOL SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     rVal.setValue( &bVal, ::getBooleanCppuType() );
>     return bRet;
> }
> 
>-BOOL SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     sal_Bool bVal = *(sal_Bool*)rVal.getValue();
>     // Vertikal und Horizontal sind mal getauscht worden!
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -160,7 +160,7 @@ BOOL SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -198,15 +198,15 @@ int	SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const
> }
> 
> 
>-BOOL SwRotationGrf::QueryValue( uno::Any& rVal, BYTE ) const
>+bool SwRotationGrf::QueryValue( uno::Any& rVal, BYTE ) const
> {
>     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
>     // where we still want this to be a sal_Int16
>     rVal <<= (sal_Int16)GetValue();
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SwRotationGrf::PutValue( const uno::Any& rVal, BYTE )
>+bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE )
> {
>     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
>     // where we still want this to be a sal_Int16
>@@ -215,11 +215,11 @@ BOOL SwRotationGrf::PutValue( const uno::Any& rVal, BYTE )
>     {
>         // UINT16 argument needed
>         SetValue( (UINT16) nValue );
>-        return TRUE;
>+        return true;
>     }
> 
>     DBG_ERROR( "SwRotationGrf::PutValue - Wrong type!" );
>-    return FALSE;
>+    return false;
> }
> 
> // ------------------------------------------------------------------
>@@ -270,13 +270,13 @@ int	SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const
>         nValue == ((SwGammaGrf&)rCmp).GetValue();
> }
> 
>-BOOL SwGammaGrf::QueryValue( uno::Any& rVal, BYTE ) const
>+bool SwGammaGrf::QueryValue( uno::Any& rVal, BYTE ) const
> {
>     rVal <<= nValue;
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SwGammaGrf::PutValue( const uno::Any& rVal, BYTE )
>+bool SwGammaGrf::PutValue( const uno::Any& rVal, BYTE )
> {
>     return rVal >>= nValue;
> }
>@@ -295,24 +295,24 @@ SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool * ) const
>     return new SwTransparencyGrf( *this );
> }
> // ------------------------------------------------------------------
>-BOOL SwTransparencyGrf::QueryValue( uno::Any& rVal,
>+bool SwTransparencyGrf::QueryValue( uno::Any& rVal,
>                                         BYTE ) const
> {
>     DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!");
>     sal_Int16 nRet = GetValue();
>     DBG_ASSERT( 0 <= nRet && nRet <= 100, "value out of range" );
>     rVal <<= nRet;
>-    return TRUE;
>+    return true;
> }
> // ------------------------------------------------------------------
>-BOOL SwTransparencyGrf::PutValue( const uno::Any& rVal,
>+bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
>                                         BYTE )
> {
>     //temporary conversion until this is a SfxInt16Item!
>     DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!");
>     sal_Int16 nVal = 0;
>     if(!(rVal >>= nVal) || nVal < -100 || nVal > 100)
>-        return FALSE;
>+        return false;
>     if(nVal < 0)
>     {
>         // for compatibility with old documents
>@@ -323,7 +323,7 @@ BOOL SwTransparencyGrf::PutValue( const uno::Any& rVal,
>     }
>     DBG_ASSERT( 0 <= nVal && nVal <= 100, "value out of range" );
>     SetValue(static_cast<BYTE>(nVal));
>-    return TRUE;
>+    return true;
> }
> 
> // ------------------------------------------------------------------
>@@ -342,24 +342,24 @@ USHORT SwDrawModeGrf::GetValueCount() const
>     return GRAPHICDRAWMODE_WATERMARK + 1;
> }
> 
>-BOOL SwDrawModeGrf::QueryValue( uno::Any& rVal,
>+bool SwDrawModeGrf::QueryValue( uno::Any& rVal,
>                                 BYTE ) const
> {
>     drawing::ColorMode eRet = (drawing::ColorMode)GetEnumValue();
>     rVal <<= eRet;
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SwDrawModeGrf::PutValue( const uno::Any& rVal,
>+bool SwDrawModeGrf::PutValue( const uno::Any& rVal,
>                                 BYTE )
> {
>     sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal );
>     if(eVal >= 0 && eVal <= GRAPHICDRAWMODE_WATERMARK)
>     {
>         SetEnumValue((USHORT)eVal);
>-        return TRUE;
>+        return true;
>     }
>-    return FALSE;
>+    return false;
> }
> 
> 
>diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
>index 3118e73..7e02d11 100644
>--- a/sw/source/core/layout/atrfrm.cxx
>+++ b/sw/source/core/layout/atrfrm.cxx
>@@ -298,7 +298,7 @@ SfxPoolItem*  SwFmtFrmSize::Clone( SfxItemPool* ) const
> /* -----------------24.04.98 11:36-------------------
>  *
>  * --------------------------------------------------*/
>-BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -353,24 +353,24 @@ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             rVal <<= (sal_Int16)GetWidthSizeType();
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> /* -----------------24.04.98 11:36-------------------
>  *
>  * --------------------------------------------------*/
>-BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_FRMSIZE_SIZE:
>         {
>             awt::Size aVal;
>             if(!(rVal >>= aVal))
>-                bRet = sal_False;
>+                bRet = false;
>             else
>             {
>                 Size aTmp(aVal.Width, aVal.Height);
>@@ -382,7 +382,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 if(aTmp.Height() && aTmp.Width())
>                     aSize = aTmp;
>                 else
>-                    bRet = sal_False;
>+                    bRet = false;
>             }
>         }
>         break;
>@@ -393,7 +393,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if(nSet >= 0 && nSet <= 0xfe)
>                 SetHeightPercent((BYTE)nSet);
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_FRMSIZE_REL_WIDTH:
>@@ -403,7 +403,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if(nSet >= 0 && nSet <= 0xfe)
>                 SetWidthPercent((BYTE)nSet);
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
>@@ -451,7 +451,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 aSize.Height() = nHg;
>             }
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_FRMSIZE_SIZE_TYPE:
>@@ -462,7 +462,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 SetHeightSizeType((SwFrmSize)nType);
>             }
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_FRMSIZE_IS_AUTO_HEIGHT:
>@@ -479,11 +479,11 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 SetWidthSizeType((SwFrmSize)nType);
>             }
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         default:
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -704,11 +704,11 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
>     }
> }
> 
>-BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool	bRet = sal_True;
>+    bool	bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_PAGEDESC_PAGENUMOFFSET:
>@@ -730,12 +730,12 @@ BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -748,7 +748,7 @@ BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if(rVal >>= nOffset)
>                 SetNumOffset( nOffset );
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
> 
>@@ -759,7 +759,7 @@ BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
>              */
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1010,7 +1010,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
>     }
> }
> 
>-BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>@@ -1023,14 +1023,14 @@ BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         uno::Reference< text::XTextColumns >  xCols = new SwXTextColumns(*this);
>         rVal.setValue(&xCols, ::getCppuType((uno::Reference< text::XTextColumns>*)0));
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_False;
>+    bool bRet = false;
>     if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
>     {
>         DBG_ERROR("not implemented");
>@@ -1060,7 +1060,7 @@ BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                     pCol->SetRight( static_cast<USHORT>(MM100_TO_TWIP(pArray[i].RightMargin)) );
>                     aColumns.Insert(pCol, i);
>                 }
>-            bRet = sal_True;
>+            bRet = true;
>             nWidth = nWidthSum;
>             bOrtho = sal_False;
> 
>@@ -1131,11 +1131,11 @@ sal_uInt16  SwFmtSurround::GetValueCount() const
> }
> 
> 
>-BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_SURROUND_SURROUNDTYPE:
>@@ -1161,16 +1161,16 @@ BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>                 break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_SURROUND_SURROUNDTYPE:
>@@ -1196,7 +1196,7 @@ BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1225,11 +1225,11 @@ SfxPoolItem*  SwFmtVertOrient::Clone( SfxItemPool* ) const
>     return new SwFmtVertOrient( nYPos, eOrient, eRelation );
> }
> 
>-BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_VERTORIENT_ORIENT:
>@@ -1259,16 +1259,16 @@ BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>                 break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_VERTORIENT_ORIENT:
>@@ -1306,7 +1306,7 @@ BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1339,11 +1339,11 @@ SfxPoolItem*  SwFmtHoriOrient::Clone( SfxItemPool* ) const
>     return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle );
> }
> 
>-BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_HORIORIENT_ORIENT:
>@@ -1381,16 +1381,16 @@ BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>                 break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_HORIORIENT_ORIENT:
>@@ -1421,7 +1421,7 @@ BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         {
>             sal_Int32 nVal = 0;
>             if(!(rVal >>= nVal))
>-                bRet = sal_False;
>+                bRet = false;
>             if(bConvert)
>                 nVal = MM100_TO_TWIP(nVal);
>             SetPos( nVal );
>@@ -1432,7 +1432,7 @@ BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1524,11 +1524,11 @@ sal_uInt32 SwFmtAnchor::GetOrder() const
> /*-----------------16.02.98 15:21-------------------
> 
> --------------------------------------------------*/
>-BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_ANCHOR_ANCHORTYPE:
>@@ -1573,16 +1573,16 @@ BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_ANCHOR_ANCHORTYPE:
>@@ -1636,14 +1636,14 @@ BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 }
>             }
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_ANCHOR_ANCHORFRAME:
>         //no break here!;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1711,11 +1711,11 @@ void SwFmtURL::SetMap( const ImageMap *pM )
> }
> extern const SvEventDescription* lcl_GetSupportedMacroItems();
> 
>-BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_URL_URL:
>@@ -1757,16 +1757,16 @@ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_URL_URL:
>@@ -1802,7 +1802,7 @@ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 bRet = SvUnoImageMap_fillImageMap( xCont, *pMap );
>             }
>             else
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>         case MID_URL_SERVERMAP:
>@@ -1810,7 +1810,7 @@ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -1873,7 +1873,7 @@ int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const
>             sSuffix == rAttr.sSuffix;
> }
> 
>-BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     nMemberId &= ~CONVERT_TWIPS;
>     switch(nMemberId)
>@@ -1902,12 +1902,12 @@ BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>         case MID_SUFFIX      : rVal <<= OUString(sSuffix); break;
>         default: return FALSE;
>     }
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch(nMemberId)
>     {
>@@ -1936,7 +1936,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if(nVal >= 0)
>                 nOffset = nVal;
>             else
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>         case MID_OWN_NUM     :
>@@ -1958,7 +1958,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                         SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
>                 aFmt.SetNumberingType(nVal);
>             else
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>         case MID_PREFIX      :
>@@ -1973,7 +1973,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             sSuffix = sVal;
>         }
>         break;
>-        default: bRet = FALSE;
>+        default: bRet = false;
>     }
>     return bRet;
> }
>@@ -2039,11 +2039,11 @@ void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt )
>         ((SwModify*)aNext.GetRegisteredIn())->Remove( &aNext );
> }
> 
>-BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool   bRet = sal_True;
>+    bool   bRet = true;
>     XubString aRet;
>     switch ( nMemberId )
>     {
>@@ -2057,7 +2057,7 @@ BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     rVal <<= OUString(aRet);
>     return bRet;
>@@ -2092,11 +2092,11 @@ SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const
>     return new SwFmtLineNumber( *this );
> }
> 
>-BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_LINENUMBER_COUNT:
>@@ -2110,16 +2110,16 @@ BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> 
>-BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>     // hier wird immer konvertiert!
>     nMemberId &= ~CONVERT_TWIPS;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch ( nMemberId )
>     {
>         case MID_LINENUMBER_COUNT:
>@@ -2131,12 +2131,12 @@ BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if(rVal >>= nVal)
>                 SetStartValue( nVal );
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         default:
>             ASSERT( !this, "unknown MemberId" );
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -2195,9 +2195,9 @@ SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy )
>     return *this;
> }
> 
>-BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
> 
>     switch( nMemberId & ~CONVERT_TWIPS )
>     {
>@@ -2245,7 +2245,7 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>                     break;
>                 default:
>                     DBG_ERROR("unknown SwTextGrid value");
>-                    bRet = FALSE;
>+                    bRet = false;
>                     break;
>             }
>             break;
>@@ -2260,16 +2260,16 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>             break;
>         default:
>             DBG_ERROR("Unknown SwTextGridItem member");
>-            bRet = FALSE;
>+            bRet = false;
>             break;
>     }
> 
>     return bRet;
> }
> 
>-BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>+bool SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     switch( nMemberId & ~CONVERT_TWIPS )
>     {
>         case MID_GRID_COLOR:
>@@ -2287,7 +2287,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>             if( bRet && (nTmp >= 0) )
>                 SetLines( (sal_uInt16)nTmp );
>             else
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>         case MID_GRID_RUBY_BELOW:
>@@ -2316,7 +2316,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                 else
>                     SetRubyHeight( (USHORT)nTmp );
>             else
>-                bRet = FALSE;
>+                bRet = false;
>         }
>         break;
>         case MID_GRID_TYPE:
>@@ -2337,7 +2337,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>                         SetGridType( GRID_LINES_CHARS );
>                         break;
>                     default:
>-                        bRet = FALSE;
>+                        bRet = false;
>                         break;
>                 }
>             }
>@@ -2354,7 +2354,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
>         }
>         default:
>             DBG_ERROR("Unknown SwTextGridItem member");
>-            bRet = FALSE;
>+            bRet = false;
>     }
> 
>     return bRet;
>diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
>index e29c02e..a836575 100644
>--- a/sw/source/core/para/paratr.cxx
>+++ b/sw/source/core/para/paratr.cxx
>@@ -158,7 +158,7 @@ SfxPoolItem* SwFmtDrop::Clone( SfxItemPool* ) const
>     return new SwFmtDrop( *this );
> }
> 
>-sal_Bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
>+bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
> {
>     switch(nMemberId&~CONVERT_TWIPS)
>     {
>@@ -187,10 +187,10 @@ sal_Bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
>         }
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
>-sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
>+bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
> {
>     switch(nMemberId&~CONVERT_TWIPS)
>     {
>@@ -216,7 +216,7 @@ sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
>             if ( rVal >>= nVal )
>                 nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal);
>             else
>-                return sal_False;
>+                return false;
>             break;
>         }
>         case MID_DROPCAP_FORMAT:
>@@ -241,7 +241,7 @@ sal_Bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
>             DBG_ERROR("char format cannot be set in PutValue()!");
>         break;
>     }
>-    return sal_True;
>+    return true;
> }
> 
> // class SwRegisterItem -------------------------------------------------
>@@ -267,21 +267,21 @@ int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
> /* -----------------------------27.06.00 11:05--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL    SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const
>+bool    SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const
> {
>     rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE );
>     rVal <<= sRet;
>-    return TRUE;
>+    return true;
> }
> /* -----------------------------27.06.00 11:05--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL    SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE )
>+bool    SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE )
> {
>     rtl::OUString uName;
>     rVal >>= uName;
>     SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE));
>-    return TRUE;
>+    return true;
> }
> /* -----------------19.05.2003 10:44-----------------
> 
>diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
>index 3833ede..f2973ea 100644
>--- a/sw/source/core/txtnode/fmtatr2.cxx
>+++ b/sw/source/core/txtnode/fmtatr2.cxx
>@@ -127,18 +127,18 @@ BOOL SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const
> {
>     return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : FALSE;
> }
>-BOOL SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE ) const
>+bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE ) const
> {
>     String sCharFmtName;
>     if(GetCharFmt())
>         SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName,  nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
>     rVal <<= OUString( sCharFmtName );
>-    return TRUE;
>+    return true;
> }
>-BOOL SwFmtCharFmt::PutValue( const uno::Any& , BYTE   )
>+bool SwFmtCharFmt::PutValue( const uno::Any& , BYTE   )
> {
>     DBG_ERROR("Zeichenvorlage kann mit PutValue nicht gesetzt werden!");
>-    return FALSE;
>+    return false;
> }
> 
> /*************************************************************************
>@@ -175,17 +175,17 @@ SfxPoolItem* SwFmtAutoFmt::Clone( SfxItemPool* ) const
>     return new SwFmtAutoFmt( *this );
> }
> 
>-BOOL SwFmtAutoFmt::QueryValue( uno::Any& rVal, BYTE ) const
>+bool SwFmtAutoFmt::QueryValue( uno::Any& rVal, BYTE ) const
> {
>     String sCharFmtName = StylePool::nameOf( mpHandle );
>     rVal <<= OUString( sCharFmtName );
>-    return TRUE;
>+    return true;
> }
> 
>-BOOL SwFmtAutoFmt::PutValue( const uno::Any& , BYTE )
>+bool SwFmtAutoFmt::PutValue( const uno::Any& , BYTE )
> {
>     //the format is not renameable via API
>-    return FALSE;
>+    return false;
> }
> 
> /*************************************************************************
>@@ -331,9 +331,9 @@ const SvxMacro* SwFmtINetFmt::GetMacro( USHORT nEvent ) const
> 
> 
> 
>-BOOL SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>+bool SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     XubString sVal;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch(nMemberId)
>@@ -379,9 +379,9 @@ BOOL SwFmtINetFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
>     rVal <<= OUString(sVal);
>     return bRet;
> }
>-BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>+bool SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     nMemberId &= ~CONVERT_TWIPS;
> 
>     // all properties except HyperlinkEvents are of type string, hence
>@@ -403,14 +403,14 @@ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>         else
>         {
>             // wrong type!
>-            bRet = FALSE;
>+            bRet = false;
>         }
>     }
>     else
>     {
>         // all string properties:
>         if(rVal.getValueType() != ::getCppuType((rtl::OUString*)0))
>-            return FALSE;
>+            return false;
>         XubString sVal = *(rtl::OUString*)rVal.getValue();
>         switch(nMemberId)
>         {
>@@ -441,7 +441,7 @@ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId  )
>             }
>             break;
>             default:
>-                bRet = FALSE;
>+                bRet = false;
>         }
>     }
>     return bRet;
>@@ -503,10 +503,10 @@ SfxPoolItem* SwFmtRuby::Clone( SfxItemPool* ) const
>     return new SwFmtRuby( *this );
> }
> 
>-BOOL SwFmtRuby::QueryValue( uno::Any& rVal,
>+bool SwFmtRuby::QueryValue( uno::Any& rVal,
>                             BYTE nMemberId ) const
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch( nMemberId )
>     {
>@@ -526,14 +526,14 @@ BOOL SwFmtRuby::QueryValue( uno::Any& rVal,
>         }
>         break;
>         default:
>-            bRet = FALSE;
>+            bRet = false;
>     }
>     return bRet;
> }
>-BOOL SwFmtRuby::PutValue( const uno::Any& rVal,
>+bool SwFmtRuby::PutValue( const uno::Any& rVal,
>                             BYTE nMemberId  )
> {
>-    BOOL bRet = TRUE;
>+    bool bRet = true;
>     nMemberId &= ~CONVERT_TWIPS;
>     switch( nMemberId )
>     {
>@@ -551,7 +551,7 @@ BOOL SwFmtRuby::PutValue( const uno::Any& rVal,
>             if(nSet >= 0 && nSet <= text::RubyAdjust_INDENT_BLOCK)
>                 nAdjustment = nSet;
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_RUBY_ABOVE:
>@@ -573,7 +573,7 @@ BOOL SwFmtRuby::PutValue( const uno::Any& rVal,
>         }
>         break;
>         default:
>-            bRet = FALSE;
>+            bRet = false;
>     }
>     return bRet;
> }
>diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
>index 2bf989f..46b56f7 100644
>--- a/sw/source/ui/envelp/envimg.cxx
>+++ b/sw/source/ui/envelp/envimg.cxx
>@@ -322,9 +322,9 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
>     return aNames;
> }
> 
>-BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>+bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
> {
>-    sal_Bool bRet = sal_True;
>+    sal_Bool bRet = true;
>     switch(nMemberId & ~CONVERT_TWIPS)
>     {
>         case MID_ENV_ADDR_TEXT : rVal <<= aAddrText; break;
>@@ -342,16 +342,16 @@ BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>         case MID_ENV_SHIFT_DOWN       : rVal <<= lShiftDown; break;
>         default:
>             DBG_ERROR("Wrong memberId");
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> /* -----------------------------26.04.01 12:26--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId)
>+bool SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId)
> {
>-    BOOL bRet = FALSE;
>+    bool bRet = false;
>     switch(nMemberId  & ~CONVERT_TWIPS)
>     {
>         case MID_ENV_ADDR_TEXT : bRet = (rVal >>= aAddrText); break;
>diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx
>index ed767d2..ec280a0 100644
>--- a/sw/source/ui/inc/envimg.hxx
>+++ b/sw/source/ui/inc/envimg.hxx
>@@ -77,8 +77,8 @@ public:
>     virtual int operator ==(const SfxPoolItem& rItem) const;
> 
>     virtual SfxPoolItem*     Clone(SfxItemPool* = 0) const;
>-    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 );
>+    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 );
> };
> 
> // class SwEnvCfgItem -------------------------------------------------------
>diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx
>index d430abb..9b3dea0 100644
>--- a/sw/source/ui/inc/uiitems.hxx
>+++ b/sw/source/ui/inc/uiitems.hxx
>@@ -56,8 +56,8 @@ public:
>                                     String &rText,
>                                     const IntlWrapper*    pIntl = 0 ) const;
> 
>-    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 );
>+    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 );
> 
>     SwPageFtnInfo& GetPageFtnInfo()             { return aFtnInfo; }
>     const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; }
>@@ -95,8 +95,8 @@ public:
>     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
>     virtual int             operator==( const SfxPoolItem& ) const;
> 
>-    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 );
>+    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 );
> 
>     const SwNumRule* GetNumRule() const 		{ return pRule; }
>           SwNumRule* GetNumRule() 				{ return pRule; }
>diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
>index 311c731..664b49f 100644
>--- a/sw/source/ui/utlui/uiitems.cxx
>+++ b/sw/source/ui/utlui/uiitems.cxx
>@@ -125,9 +125,9 @@ SfxItemPresentation  SwPageFtnInfoItem::GetPresentation
> /* -----------------------------26.04.01 12:25--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>+bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
> {
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch(nMemberId & ~CONVERT_TWIPS)
>     {
>         case MID_FTN_HEIGHT        :     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetHeight());break;
>@@ -144,17 +144,17 @@ BOOL SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
>         case MID_LINE_TEXT_DIST    :     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetTopDist());break;
>         case MID_LINE_FOOTNOTE_DIST:     rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetBottomDist());break;
>         default:
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
> /* -----------------------------26.04.01 12:26--------------------------------
> 
>  ---------------------------------------------------------------------------*/
>-BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>+bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
> {
>     sal_Int32 nSet32 = 0;
>-    sal_Bool bRet = sal_True;
>+    bool bRet = true;
>     switch(nMemberId  & ~CONVERT_TWIPS)
>     {
>         case MID_LINE_COLOR        :
>@@ -166,7 +166,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>         case MID_LINE_FOOTNOTE_DIST:
>                 rVal >>= nSet32;
>                 if(nSet32 < 0)
>-                    bRet = sal_False;
>+                    bRet = false;
>                 else
>                 {
>                     nSet32 = MM100_TO_TWIP(nSet32);
>@@ -185,7 +185,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>             if(nSet >= 0)
>                 aFtnInfo.SetLineWidth(MM100_TO_TWIP(nSet));
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         case MID_LINE_RELWIDTH     :
>@@ -193,7 +193,7 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>             sal_Int8 nSet = 0;
>             rVal >>= nSet;
>             if(nSet < 0)
>-                bRet = sal_False;
>+                bRet = false;
>             else
>                 aFtnInfo.SetWidth(Fraction(nSet, 100));
>         }
>@@ -205,11 +205,11 @@ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
>             if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
>                 aFtnInfo.SetAdj((SwFtnAdj)nSet);
>             else
>-                bRet = sal_False;
>+                bRet = false;
>         }
>         break;
>         default:
>-            bRet = sal_False;
>+            bRet = false;
>     }
>     return bRet;
> }
>@@ -284,13 +284,13 @@ int  SwUINumRuleItem::operator==( const SfxPoolItem& rAttr ) const
>     return *pRule == *((SwUINumRuleItem&)rAttr).pRule;
> }
> 
>-BOOL SwUINumRuleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
>+bool SwUINumRuleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
> {
>     uno::Reference< container::XIndexReplace >xRules = new SwXNumberingRules(*pRule);
>     rVal.setValue(&xRules, ::getCppuType((uno::Reference< container::XIndexReplace>*)0));
>-    return TRUE;
>+    return true;
> }
>-BOOL SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>+bool SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
> {
>     uno::Reference< container::XIndexReplace> xRulesRef;
>     if(rVal >>= xRulesRef)
>@@ -303,7 +303,7 @@ BOOL SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
>             *pRule = *pSwXRules->GetNumRule();
>         }
>     }
>-    return TRUE;
>+    return true;
> }
> /* -----------------17.06.98 17:43-------------------
>  *

Actions: View

Attachments on bug 30556: 39112