strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#101758# LEFT_TO_RIGHT and RIGHT_TO_LEFT is now a toggle slot

Browse source
This commit is contained in:
Christian Lippka 2002-09-13 09:34:58 +00:00
parent 0f46e3c9ee
commit 25e7cb0d1f
2 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sd/source/ui/view/drtxtob.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drtxtob.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: ka $ $Date: 2002-08-15 07:25:48 $
* last change: $Author: cl $ $Date: 2002-09-13 10:34:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -506,9 +506,11 @@ void SdDrawTextObjectBar::GetAttrState( SfxItemSet& rSet )
case FRMDIR_HORI_LEFT_TOP:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, TRUE ) );
rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, FALSE ) );
break;
case FRMDIR_HORI_RIGHT_TOP:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, FALSE ) );
rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, TRUE ) );
break;
}

52
sd/source/ui/view/drtxtob1.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drtxtob1.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: ka $ $Date: 2002-08-15 07:25:49 $
* last change: $Author: cl $ $Date: 2002-09-13 10:34:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -374,6 +374,7 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
}
break;
default:
{
SfxItemSet aEditAttr( pView->GetDoc()->GetPool() );
@ -472,19 +473,6 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
aNewAttr.Put( aItem );
}
break;
case SID_ATTR_PARA_LEFT_TO_RIGHT:
{
aNewAttr.Put( SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_LEFT ) );
}
break;
case SID_ATTR_PARA_RIGHT_TO_LEFT:
{
aNewAttr.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT ) );
}
break;
case SID_SET_SUPER_SCRIPT:
{
SvxEscapementItem aItem;
@ -573,6 +561,40 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
rReq.Done( aNewAttr );
pArgs = rReq.GetArgs();
}
else if ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ||
nSlot == SID_ATTR_PARA_RIGHT_TO_LEFT )
{
sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
const SfxPoolItem* pPoolItem;
if( SFX_ITEM_SET == pArgs->GetItemState( nSlot, TRUE, &pPoolItem ) )
{
if( false == ( (SfxBoolItem*)pPoolItem)->GetValue() )
{
bLeftToRight = !bLeftToRight;
}
}
USHORT nAdjust = SVX_ADJUST_LEFT;
if( SFX_ITEM_ON == aEditAttr.GetItemState(ITEMID_ADJUST, TRUE, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )
{
aNewAttr.Put( SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
if( nAdjust == SVX_ADJUST_RIGHT )
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_LEFT ) );
}
else
{
aNewAttr.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
if( nAdjust == SVX_ADJUST_LEFT )
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT ) );
}
rReq.Done( aNewAttr );
pArgs = rReq.GetArgs();
}
else if ( nSlot == SID_ATTR_CHAR_FONT ||
nSlot == SID_ATTR_CHAR_FONTHEIGHT ||
nSlot == SID_ATTR_CHAR_POSTURE ||