diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:25:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 12:27:32 +0100 |
commit | 33740b7d5abb8aca34692fbdaa787b26a60652a9 (patch) | |
tree | ad2574a7850e2aa8ac18eaff89f4a85567896692 /svx/source/tbxctrls | |
parent | offapi: document the 4 new properties which are no longer read-only (diff) | |
download | core-33740b7d5abb8aca34692fbdaa787b26a60652a9.tar.gz core-33740b7d5abb8aca34692fbdaa787b26a60652a9.zip |
Replace exisiting TriState, AutoState with more generic TriState
Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be
Diffstat (limited to 'svx/source/tbxctrls')
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 24 |
4 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index eb49b9e77f62..aafeed7b7bfe 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -1021,7 +1021,7 @@ void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 1d5aa7688f54..16ea98a21673 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -778,7 +778,7 @@ void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, cons rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, - ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } // class SvxColumnsToolBoxControl ------------------------------------------ diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 29586d4f997a..78303aa1ff86 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -752,7 +752,7 @@ void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, co ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b282f8fb016f..c40c639fb248 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2190,7 +2190,7 @@ void SvxStyleToolBoxControl::StateChanged( sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)(rTbx.GetItemWindow( nId )); - TriState eTri = STATE_NOCHECK; + TriState eTri = TRISTATE_FALSE; DBG_ASSERT( pBox, "Control not found!" ); @@ -2205,12 +2205,12 @@ void SvxStyleToolBoxControl::StateChanged( { case SFX_ITEM_AVAILABLE: eTri = ((const SfxBoolItem*)pState)->GetValue() - ? STATE_CHECK - : STATE_NOCHECK; + ? TRISTATE_TRUE + : TRISTATE_FALSE; break; case SFX_ITEM_DONTCARE: - eTri = STATE_DONTKNOW; + eTri = TRISTATE_INDET; break; } @@ -2373,7 +2373,7 @@ void SvxFontColorToolBoxControl::StateChanged( } rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } //======================================================================== @@ -2445,7 +2445,7 @@ void SvxColorToolBoxControl::StateChanged( sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } //======================================================================== @@ -2563,7 +2563,7 @@ void SvxColorExtToolBoxControl::StateChanged( ToolBox& rTbx = GetToolBox(); sal_uInt16 nId = GetId(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); if (bChoiceFromPalette) { @@ -2679,8 +2679,8 @@ void SvxFrameToolBoxControl::StateChanged( rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, (SFX_ITEM_DONTCARE == eState) - ? STATE_DONTKNOW - : STATE_NOCHECK ); + ? TRISTATE_INDET + : TRISTATE_FALSE ); } //======================================================================== @@ -2729,8 +2729,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged( rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, (SFX_ITEM_DONTCARE == eState) - ? STATE_DONTKNOW - : STATE_NOCHECK ); + ? TRISTATE_INDET + : TRISTATE_FALSE ); } //======================================================================== @@ -2791,7 +2791,7 @@ void SvxFrameLineColorToolBoxControl::StateChanged( sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); + rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); const SvxColorItem* pItem = 0; if ( SFX_ITEM_DONTCARE != eState ) |