diff options
| author | Christian Lippka <cl@openoffice.org> | 2001-01-22 12:26:26 +0000 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2001-01-22 12:26:26 +0000 |
| commit | 22c459e558a08a9a5647fa19b42c1a9e5e13dd7d (patch) | |
| tree | f1c00d40c281d1708df0237def8231cd0e0cb9c7 /svx | |
| parent | 52ced86d3b46bacaa44e2204047df636339db55c (diff) | |
fixed missing enum types for WritingMode und BitmapMode
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 223fa1821b4a..af2a568df107 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: cl $ $Date: 2001-01-17 22:14:03 $ + * last change: $Author: cl $ $Date: 2001-01-22 13:26:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1028,10 +1028,11 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } case OWN_ATTR_WRITINGMODE: { - if( pObj && pObj->ISA(SdrTextObj) ) + drawing::WritingMode eMode; + if( pObj && pObj->ISA(SdrTextObj) && rVal >>= eMode ) { SdrTextObj* pText = (SdrTextObj*)pObj; - pText->SetVerticalWriting( ::cppu::any2bool(rVal) ); + pText->SetVerticalWriting( eMode == drawing::WritingMode_TB_RL ); return; } } @@ -1208,8 +1209,8 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u sal_Int32 nMode; if( rVal >>= nMode ) { - pObj->SetItem( XFillBmpStretchItem( nMode == 1 ) ); - pObj->SetItem( XFillBmpTileItem( nMode == 0 ) ); + pObj->SetItem( XFillBmpStretchItem( nMode == drawing::BitmapMode_STRETCH ) ); + pObj->SetItem( XFillBmpTileItem( nMode == drawing::BitmapMode_REPEAT ) ); } break; } @@ -1484,7 +1485,8 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) if( pObj && pObj->ISA(SdrTextObj) ) { SdrTextObj* pText = (SdrTextObj*)pObj; - aAny = ::cppu::bool2any( pText->IsVerticalWriting() ); + drawing::WritingMode eMode = pText->IsVerticalWriting() ? drawing::WritingMode_TB_RL : drawing::WritingMode_LR_TB; + aAny <<= eMode; break; } } @@ -1684,11 +1686,11 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) if( pStretchItem && pTileItem ) { if( pTileItem->GetValue() ) - aAny <<= (sal_Int32)0; + aAny <<= (sal_Int32)drawing::BitmapMode_REPEAT; else if( pStretchItem->GetValue() ) - aAny <<= (sal_Int32)1; + aAny <<= (sal_Int32)drawing::BitmapMode_STRETCH; else - aAny <<= (sal_Int32)2; + aAny <<= (sal_Int32)drawing::BitmapMode_NO_REPEAT; } break; } |