Kaydet (Commit) 6c4b11e3 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann Kaydeden (comit) Michael Meeks

Resolves: #i122074# paragraph property panel

correct enable/disable of indentation increase/decrease controls

(cherry picked from commit cc9eaeaa)

Change-Id: Ia7c676435859027f0526d6253db771e2359bb7cc
üst b8fe3f84
...@@ -1280,9 +1280,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1280,9 +1280,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
maTbxIndent_IncDec->Enable(); maTbxIndent_IncDec->Enable();
maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_True); maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_True);
if(maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) if ( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text)
&& maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) && maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default)
&& maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table)) && maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
{ {
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True); maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True);
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True); maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True);
...@@ -1407,27 +1407,20 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS ...@@ -1407,27 +1407,20 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{ {
if (nSID==SID_INC_INDENT) if ( ( maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Text)
|| maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Default)
|| maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Table) )
&& ( nSID == SID_INC_INDENT || nSID == SID_DEC_INDENT ) )
{ {
if( pState && eState == SFX_ITEM_UNKNOWN ) // Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True); // - namely SFX_ITEM_UNKNOWN and SFX_ITEM_DISABLED
else maTbxIndent_IncDec->EnableItem(
if( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) && nSID == SID_INC_INDENT ? BT_TBX_INDENT_INC : BT_TBX_INDENT_DEC,
maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) && ( pState && eState == SFX_ITEM_UNKNOWN ) ? sal_True : sal_False );
maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_False);
}
if (nSID==SID_DEC_INDENT)
{
if( pState && eState == SFX_ITEM_UNKNOWN )
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True);
else
if( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) &&
maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) &&
maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_False);
} }
} }
// Add toggle state for numbering and bullet icons // Add toggle state for numbering and bullet icons
void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment