From b3099fad1c84d74da23418839147b776c2fa1233 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 22 May 2002 11:05:15 +0000 Subject: #98405#: Query/PutValue changed --- svx/source/items/algitem.cxx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'svx/source/items/algitem.cxx') diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 9a13f332666d..cfaa9547e640 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: algitem.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: nn $ $Date: 2001-05-23 17:24:48 $ + * last change: $Author: mba $ $Date: 2002-05-22 12:03:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,8 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { + sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case MID_HORJUST_HORJUST: @@ -212,6 +214,8 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { + sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case MID_HORJUST_HORJUST: @@ -635,8 +639,9 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT nItemVersion) const sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); - switch ( nMemberId & ~CONVERT_TWIPS ) + sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + nMemberId &= ~CONVERT_TWIPS; + switch ( nMemberId ) { // jetzt alles signed case MID_MARGIN_L_MARGIN: -- cgit