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

(-)a/main/sw/source/filter/ww8/ww8graf.cxx (-3 / +2 lines)
Lines 2398-2404 RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, Link Here
2398
        if ( nInTable &&
2398
        if ( nInTable &&
2399
             ( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
2399
             ( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
2400
             pFSPA->nwr == 3 &&
2400
             pFSPA->nwr == 3 &&
2401
//             pRecord->nLayoutInTableCell == 0x80000000 )
2402
             !IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
2401
             !IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
2403
        {
2402
        {
2404
            eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
2403
            eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
Lines 2468-2474 bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable Link Here
2468
            {
2467
            {
2469
                bIsObjectLayoutInTableCell = false;
2468
                bIsObjectLayoutInTableCell = false;
2470
                ASSERT( nLayoutInTableCell == 0xFFFFFFFF,
2469
                ASSERT( nLayoutInTableCell == 0xFFFFFFFF,
2471
                        "no explicit object attribute layout in table cell excepted." );
2470
                        "no explicit object attribute layout in table cell expected." );
2472
            }
2471
            }
2473
            break;
2472
            break;
2474
            case 0x2000: // version 9 aka Microsoft Word 2000
2473
            case 0x2000: // version 9 aka Microsoft Word 2000
Lines 2480-2486 bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable Link Here
2480
                // adjustment of conditions needed after deeper analysis of
2479
                // adjustment of conditions needed after deeper analysis of
2481
                // certain test cases.
2480
                // certain test cases.
2482
                if ( nLayoutInTableCell == 0xFFFFFFFF || // no explicit attribute value given
2481
                if ( nLayoutInTableCell == 0xFFFFFFFF || // no explicit attribute value given
2483
                     nLayoutInTableCell & 0x80008000 ||
2482
                     nLayoutInTableCell == 0x80008000 ||
2484
                     ( nLayoutInTableCell & 0x02000000 &&
2483
                     ( nLayoutInTableCell & 0x02000000 &&
2485
                       !(nLayoutInTableCell & 0x80000000 ) ) )
2484
                       !(nLayoutInTableCell & 0x80000000 ) ) )
2486
                // <--
2485
                // <--

Return to issue 119624