|
Lines 204-209
Link Here
|
| 204 |
short nConvertedLeft; |
204 |
short nConvertedLeft; |
| 205 |
short nMaxRight; |
205 |
short nMaxRight; |
| 206 |
short nSwWidth; |
206 |
short nSwWidth; |
|
|
207 |
short nPreferredWidth; |
| 208 |
short nOrgDxaLeft; |
| 207 |
|
209 |
|
| 208 |
bool bOk; |
210 |
bool bOk; |
| 209 |
bool bClaimLineFmt; |
211 |
bool bClaimLineFmt; |
|
Lines 1628-1634
Link Here
|
| 1628 |
{ |
1630 |
{ |
| 1629 |
sprmNil, |
1631 |
sprmNil, |
| 1630 |
|
1632 |
|
| 1631 |
sprmTTextFlow, sprmTFCantSplit, sprmTFCantSplit90,sprmTJc, sprmTFBiDi, sprmTDefTable, |
1633 |
sprmTTableWidth,sprmTTextFlow, sprmTFCantSplit, sprmTFCantSplit90,sprmTJc, sprmTFBiDi, sprmTDefTable, |
| 1632 |
sprmTDyaRowHeight, sprmTDefTableShd, sprmTDxaLeft, sprmTSetBrc, |
1634 |
sprmTDyaRowHeight, sprmTDefTableShd, sprmTDxaLeft, sprmTSetBrc, |
| 1633 |
sprmTDxaCol, sprmTInsert, sprmTDelete, sprmTTableHeader, |
1635 |
sprmTDxaCol, sprmTInsert, sprmTDelete, sprmTTableHeader, |
| 1634 |
sprmTDxaGapHalf, sprmTTableBorders, |
1636 |
sprmTDxaGapHalf, sprmTTableBorders, |
|
Lines 1643-1648
Link Here
|
| 1643 |
case ww::eWW8: |
1645 |
case ww::eWW8: |
| 1644 |
switch (nId) |
1646 |
switch (nId) |
| 1645 |
{ |
1647 |
{ |
|
|
1648 |
case 0xF614: |
| 1649 |
return sprmTTableWidth; |
| 1646 |
case 0x7629: |
1650 |
case 0x7629: |
| 1647 |
return sprmTTextFlow; |
1651 |
return sprmTTextFlow; |
| 1648 |
case 0x3403: |
1652 |
case 0x3403: |
|
Lines 1762-1767
Link Here
|
| 1762 |
nConvertedLeft(0), |
1766 |
nConvertedLeft(0), |
| 1763 |
nMaxRight(0), |
1767 |
nMaxRight(0), |
| 1764 |
nSwWidth(0), |
1768 |
nSwWidth(0), |
|
|
1769 |
nPreferredWidth(0), |
| 1770 |
nOrgDxaLeft(0), |
| 1765 |
bOk(true), |
1771 |
bOk(true), |
| 1766 |
bClaimLineFmt(false), |
1772 |
bClaimLineFmt(false), |
| 1767 |
eOri(text::HoriOrientation::NONE), |
1773 |
eOri(text::HoriOrientation::NONE), |
|
Lines 1828-1833
Link Here
|
| 1828 |
wwTableSprm eSprm = GetTableSprm(nId, pIo->GetFib().GetFIBVersion()); |
1834 |
wwTableSprm eSprm = GetTableSprm(nId, pIo->GetFib().GetFIBVersion()); |
| 1829 |
switch (eSprm) |
1835 |
switch (eSprm) |
| 1830 |
{ |
1836 |
{ |
|
|
1837 |
case sprmTTableWidth: |
| 1838 |
{ |
| 1839 |
const BYTE b0 = pParams[0]; |
| 1840 |
const BYTE b1 = pParams[1]; |
| 1841 |
const BYTE b2 = pParams[2]; |
| 1842 |
if (b0 == 3) // Twips |
| 1843 |
nPreferredWidth = b2 * 0x100 + b1; |
| 1844 |
} |
| 1845 |
break; |
| 1831 |
case sprmTTextFlow: |
1846 |
case sprmTTextFlow: |
| 1832 |
pNewBand->ProcessDirection(pParams); |
1847 |
pNewBand->ProcessDirection(pParams); |
| 1833 |
break; |
1848 |
break; |
|
Lines 1881-1886
Link Here
|
| 1881 |
// shift the whole table to that margin (see below) |
1896 |
// shift the whole table to that margin (see below) |
| 1882 |
{ |
1897 |
{ |
| 1883 |
short nDxaNew = (INT16)SVBT16ToShort( pParams ); |
1898 |
short nDxaNew = (INT16)SVBT16ToShort( pParams ); |
|
|
1899 |
nOrgDxaLeft = nDxaNew; |
| 1884 |
if( nDxaNew < nTabeDxaNew ) |
1900 |
if( nDxaNew < nTabeDxaNew ) |
| 1885 |
nTabeDxaNew = nDxaNew; |
1901 |
nTabeDxaNew = nDxaNew; |
| 1886 |
} |
1902 |
} |
|
Lines 2326-2332
Link Here
|
| 2326 |
} |
2342 |
} |
| 2327 |
} */ |
2343 |
} */ |
| 2328 |
|
2344 |
|
| 2329 |
if (nMinLeft && (text::HoriOrientation::LEFT == eOri)) |
2345 |
if (nMinLeft && ((!bIsBiDi && text::HoriOrientation::LEFT == eOri) || (bIsBiDi && text::HoriOrientation::RIGHT == eOri))) |
| 2330 |
eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned |
2346 |
eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned |
| 2331 |
|
2347 |
|
| 2332 |
nDefaultSwCols = nMinCols; // da Zellen einfuegen billiger ist als Mergen |
2348 |
nDefaultSwCols = nMinCols; // da Zellen einfuegen billiger ist als Mergen |
|
Lines 2491-2497
Link Here
|
| 2491 |
//inside the frame, in word the dialog involved greys out the |
2507 |
//inside the frame, in word the dialog involved greys out the |
| 2492 |
//ability to set the margin. |
2508 |
//ability to set the margin. |
| 2493 |
SvxLRSpaceItem aL( RES_LR_SPACE ); |
2509 |
SvxLRSpaceItem aL( RES_LR_SPACE ); |
| 2494 |
aL.SetLeft( GetMinLeft() ); |
2510 |
// set right to original DxaLeft (i28656) |
|
|
2511 |
aL.SetLeft( !bIsBiDi ? GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft); |
| 2495 |
aItemSet.Put(aL); |
2512 |
aItemSet.Put(aL); |
| 2496 |
} |
2513 |
} |
| 2497 |
} |
2514 |
} |