From 33740b7d5abb8aca34692fbdaa787b26a60652a9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 24 Feb 2014 12:25:02 +0100 Subject: Replace exisiting TriState, AutoState with more generic TriState Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be --- sd/source/ui/view/drviews7.cxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sd/source/ui/view') diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index f9be5a1d21fe..c82e123049f4 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -429,13 +429,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { // percent TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent(); - if( eState == STATE_DONTKNOW ) + if( eState == TRISTATE_INDET ) rSet.InvalidateItem( SID_GLUE_PERCENT ); else - rSet.Put( SfxBoolItem( SID_GLUE_PERCENT, eState == STATE_CHECK ) ); + rSet.Put( SfxBoolItem( SID_GLUE_PERCENT, eState == TRISTATE_TRUE ) ); // alignment has no effect by percent - if( eState == STATE_CHECK ) + if( eState == TRISTATE_TRUE ) { rSet.DisableItem( SID_GLUE_HORZALIGN_CENTER ); rSet.DisableItem( SID_GLUE_HORZALIGN_LEFT ); @@ -464,28 +464,28 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Escape direction // left eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_LEFT ); - if( eState == STATE_DONTKNOW ) + if( eState == TRISTATE_INDET ) rSet.InvalidateItem( SID_GLUE_ESCDIR_LEFT ); else - rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_LEFT, eState == STATE_CHECK ) ); + rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_LEFT, eState == TRISTATE_TRUE ) ); // right eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_RIGHT ); - if( eState == STATE_DONTKNOW ) + if( eState == TRISTATE_INDET ) rSet.InvalidateItem( SID_GLUE_ESCDIR_RIGHT ); else - rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_RIGHT, eState == STATE_CHECK ) ); + rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_RIGHT, eState == TRISTATE_TRUE ) ); // top eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_TOP ); - if( eState == STATE_DONTKNOW ) + if( eState == TRISTATE_INDET ) rSet.InvalidateItem( SID_GLUE_ESCDIR_TOP ); else - rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_TOP, eState == STATE_CHECK ) ); + rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_TOP, eState == TRISTATE_TRUE ) ); // bottom eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_BOTTOM ); - if( eState == STATE_DONTKNOW ) + if( eState == TRISTATE_INDET ) rSet.InvalidateItem( SID_GLUE_ESCDIR_BOTTOM ); else - rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_BOTTOM, eState == STATE_CHECK ) ); + rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_BOTTOM, eState == TRISTATE_TRUE ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GRID_FRONT ) || -- cgit