Kaydet (Commit) 6a56f5db authored tarafından Andre Fischer's avatar Andre Fischer

122027: Fixed crash when processing .uno:NumberType command.

Reported by:  Ariel Constenla-Haile
Patch by:  Ariel Constenla-Haile
Review by: Andre Fischer
üst 717671a6
......@@ -1105,45 +1105,49 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
break;
case SID_NUMBER_TYPE_FORMAT:
if ( pReqArgs )
{
SfxInt16Item aFormatItem((const SfxInt16Item&)rReq.GetArgs()->Get(nSlot));
sal_uInt16 nFormat = aFormatItem.GetValue();
switch(nFormat)
const SfxPoolItem* pItem;
if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
{
case 0:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER); //Modify
break;
case 1:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 2 ); //Modify
break;
case 2:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT );
break;
case 3:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY );
break;
case 4:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE );
break;
case 5:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME );
break;
case 6:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC );
break;
case 7:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_FRACTION );
break;
case 8:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_LOGICAL );
break;
case 9:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_TEXT );
break;
default:
;
sal_uInt16 nFormat = ((SfxInt16Item *)pItem)->GetValue();
switch(nFormat)
{
case 0:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER); //Modify
break;
case 1:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 2 ); //Modify
break;
case 2:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT );
break;
case 3:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY );
break;
case 4:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE );
break;
case 5:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME );
break;
case 6:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC );
break;
case 7:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_FRACTION );
break;
case 8:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_LOGICAL );
break;
case 9:
pTabViewShell->SetNumberFormat( NUMBERFORMAT_TEXT );
break;
default:
;
}
rReq.Done();
}
rReq.Done();
}
break;
......
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