View | Details | Raw Unified | Return to issue 117825
Collapse All | Expand All

(-)a/sw/source/core/table/swtable.cxx (-2 / +13 lines)
Lines 2582-2587 sal_uLong SwTableBox::IsValidNumTxtNd( s Link Here
2582
                // Flys/Felder/..
2582
                // Flys/Felder/..
2583
                if( pHts )
2583
                if( pHts )
2584
                {
2584
                {
2585
                    xub_StrLen nNextSetField = 0;
2585
                    for( sal_uInt16 n = 0; n < pHts->Count(); ++n )
2586
                    for( sal_uInt16 n = 0; n < pHts->Count(); ++n )
2586
                    {
2587
                    {
2587
                        const SwTxtAttr* pAttr = (*pHts)[ n ];
2588
                        const SwTxtAttr* pAttr = (*pHts)[ n ];
Lines 2589-2599 sal_uLong SwTableBox::IsValidNumTxtNd( s Link Here
2589
                            *pAttr->GetStart() ||
2590
                            *pAttr->GetStart() ||
2590
                            *pAttr->GetAnyEnd() < rTxt.Len() )
2591
                            *pAttr->GetAnyEnd() < rTxt.Len() )
2591
                        {
2592
                        {
2592
                            if ( pAttr->Which() == RES_TXTATR_FIELD )
2593
                            if ((*pAttr->GetStart() == nNextSetField) &&
2594
                                (pAttr->Which() == RES_TXTATR_FIELD))
2593
                            {
2595
                            {
2596
                                // #i104949# hideous hack for report builder:
2597
                                // it inserts hidden variable-set fields at
2598
                                // the beginning of para in cell, but they
2599
                                // should not turn cell into text cell
2594
                                const SwField* pField = pAttr->GetFld().GetFld();
2600
                                const SwField* pField = pAttr->GetFld().GetFld();
2595
                                if ( pField && pField->GetTypeId() == TYP_SETFLD )
2601
                                if (pField &&
2602
                                    (pField->GetTypeId() == TYP_SETFLD) &&
2603
                                    (0 != (static_cast<SwSetExpField const*>
2604
                                           (pField)->GetSubType() &
2605
                                        nsSwExtendedSubType::SUB_INVISIBLE)))
2596
                                {
2606
                                {
2607
                                    nNextSetField = *pAttr->GetStart() + 1;
2597
                                    continue;
2608
                                    continue;
2598
                                }
2609
                                }
2599
                            }
2610
                            }

Return to issue 117825