summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-24 12:25:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-24 12:27:32 +0100
commit33740b7d5abb8aca34692fbdaa787b26a60652a9 (patch)
treead2574a7850e2aa8ac18eaff89f4a85567896692 /sd
parent43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (diff)
Replace exisiting TriState, AutoState with more generic TriState
Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx10
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/dlg/paragr.cxx10
-rw-r--r--sd/source/ui/view/drviews7.cxx22
4 files changed, 22 insertions, 22 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index c66b5e70f5e9..3c27cf8ba5ec 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1845,7 +1845,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
}
else
{
- mpCBXRewind->SetState( STATE_DONTKNOW );
+ mpCBXRewind->SetState( TRISTATE_INDET );
}
}
@@ -2019,7 +2019,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
- if( mpCBXRewind->GetState() != STATE_DONTKNOW )
+ if( mpCBXRewind->GetState() != TRISTATE_INDET )
{
sal_Int16 nFill = mpCBXRewind->IsChecked() ? AnimationFill::REMOVE : AnimationFill::HOLD;
@@ -2126,10 +2126,10 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
}
else
{
- maCBXGroupAuto->SetState( STATE_DONTKNOW );
+ maCBXGroupAuto->SetState( TRISTATE_INDET );
}
- maCBXAnimateForm->SetState( STATE_DONTKNOW );
+ maCBXAnimateForm->SetState( TRISTATE_INDET );
if( pSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS )
{
sal_Bool bAnimateForm = sal_False;
@@ -2143,7 +2143,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
maCBXAnimateForm->Enable( false );
}
- maCBXReverse->SetState( STATE_DONTKNOW );
+ maCBXReverse->SetState( TRISTATE_INDET );
if( pSet->getPropertyState( nHandleTextReverse ) != STLPropertyState_AMBIGUOUS )
{
sal_Bool bTextReverse = sal_False;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 677ddd7f2587..fc8a1521ff62 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -653,7 +653,7 @@ void SlideTransitionPane::updateControls()
if( aEffect.mbLoopSoundAmbiguous )
{
- mpCB_LOOP_SOUND->SetState( STATE_DONTKNOW );
+ mpCB_LOOP_SOUND->SetState( TRISTATE_INDET );
}
else
{
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 689fec1cf7e0..c30e42396f73 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -97,8 +97,8 @@ sal_Bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue())
{
mbModified = true;
- sal_Bool bNewStartChecked = STATE_CHECK == m_pNewStartCB->GetState();
- sal_Bool bNumberNewStartChecked = STATE_CHECK == m_pNewStartNumberCB->GetState();
+ sal_Bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState();
+ sal_Bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState();
rSet.Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked));
const sal_Int16 nStartAt = (sal_Int16)m_pNewStartNF->GetValue();
@@ -114,12 +114,12 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet )
if(eItemState > SFX_ITEM_AVAILABLE )
{
const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(ATTR_NUMBER_NEWSTART);
- m_pNewStartCB->SetState( rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK );
+ m_pNewStartCB->SetState( rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
m_pNewStartCB->EnableTriState(false);
}
else
{
- m_pNewStartCB->SetState(STATE_DONTKNOW);
+ m_pNewStartCB->SetState(TRISTATE_INDET);
m_pNewStartCB->Disable();
}
m_pNewStartCB->SaveValue();
@@ -137,7 +137,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet )
}
else
{
- m_pNewStartCB->SetState(STATE_DONTKNOW);
+ m_pNewStartCB->SetState(TRISTATE_INDET);
}
ImplNewStartHdl(m_pNewStartCB);
m_pNewStartNF->SaveValue();
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 ) ||