|
Lines 2234-2239
Link Here
|
| 2234 |
ASSERT(pRecord || pFSPA, "give me something! to work with for anchoring"); |
2234 |
ASSERT(pRecord || pFSPA, "give me something! to work with for anchoring"); |
| 2235 |
if (!pRecord && !pFSPA) |
2235 |
if (!pRecord && !pFSPA) |
| 2236 |
return FLY_AT_PAGE; |
2236 |
return FLY_AT_PAGE; |
|
|
2237 |
sal_Bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical(); |
| 2237 |
|
2238 |
|
| 2238 |
SvxMSDffImportRec aRecordFromFSPA; |
2239 |
SvxMSDffImportRec aRecordFromFSPA; |
| 2239 |
if (!pRecord) |
2240 |
if (!pRecord) |
|
Lines 2269-2275
Link Here
|
| 2269 |
// is a hint that these values aren't set by the escher import - see |
2270 |
// is a hint that these values aren't set by the escher import - see |
| 2270 |
// method <SwMSDffManager::ProcessObj(..)>. Then, check if for each |
2271 |
// method <SwMSDffManager::ProcessObj(..)>. Then, check if for each |
| 2271 |
// values, if it differs from the one in the FSPA. |
2272 |
// values, if it differs from the one in the FSPA. |
| 2272 |
if ( pRecord->nXRelTo == 2 && pRecord->nYRelTo == 2 ) |
2273 |
if ( pRecord->nXRelTo == 2 && pRecord->nYRelTo == 2 && !bCurSectionVertical) |
| 2273 |
{ |
2274 |
{ |
| 2274 |
// if <nYRelTo> differs from <FSPA.nby> overwrite <nYRelTo> |
2275 |
// if <nYRelTo> differs from <FSPA.nby> overwrite <nYRelTo> |
| 2275 |
if ( pFSPA->nby != pRecord->nYRelTo ) |
2276 |
if ( pFSPA->nby != pRecord->nYRelTo ) |
|
Lines 2408-2418
Link Here
|
| 2408 |
} |
2409 |
} |
| 2409 |
// <-- |
2410 |
// <-- |
| 2410 |
|
2411 |
|
| 2411 |
SwFmtHoriOrient aHoriOri(MakeSafePositioningValue(pFSPA->nXaLeft), |
|
|
| 2412 |
eHoriOri, eHoriRel); |
| 2413 |
if( 4 <= nXAlign ) |
| 2414 |
aHoriOri.SetPosToggle(true); |
| 2415 |
rFlySet.Put( aHoriOri ); |
| 2416 |
|
2412 |
|
| 2417 |
//Writer honours this wrap distance when aligned as "left" or "right", |
2413 |
//Writer honours this wrap distance when aligned as "left" or "right", |
| 2418 |
//Word doesn't. Writer doesn't honour it when its "from left". |
2414 |
//Word doesn't. Writer doesn't honour it when its "from left". |
|
Lines 2424-2429
Link Here
|
| 2424 |
sal_Int16 eVertRel; |
2420 |
sal_Int16 eVertRel; |
| 2425 |
// OD 14.10.2003 #i18732# |
2421 |
// OD 14.10.2003 #i18732# |
| 2426 |
eVertRel = aVertRelOriTab[ nYRelTo ]; |
2422 |
eVertRel = aVertRelOriTab[ nYRelTo ]; |
|
|
2423 |
if ( bCurSectionVertical && nYRelTo == 2 ) |
| 2424 |
eVertRel = text::RelOrientation::PAGE_PRINT_AREA; |
| 2427 |
// CMC, OD 24.11.2003 #i22673# - fill <eVertOri> in dependence of <eVertRel> |
2425 |
// CMC, OD 24.11.2003 #i22673# - fill <eVertOri> in dependence of <eVertRel> |
| 2428 |
sal_Int16 eVertOri; |
2426 |
sal_Int16 eVertOri; |
| 2429 |
if ( eVertRel == text::RelOrientation::TEXT_LINE ) |
2427 |
if ( eVertRel == text::RelOrientation::TEXT_LINE ) |
|
Lines 2442-2450
Link Here
|
| 2442 |
if ((eVertRel == text::RelOrientation::TEXT_LINE) && (eVertOri == text::VertOrientation::NONE)) |
2440 |
if ((eVertRel == text::RelOrientation::TEXT_LINE) && (eVertOri == text::VertOrientation::NONE)) |
| 2443 |
nYPos = -nYPos; |
2441 |
nYPos = -nYPos; |
| 2444 |
|
2442 |
|
| 2445 |
rFlySet.Put(SwFmtVertOrient(MakeSafePositioningValue(nYPos), |
2443 |
SwFmtHoriOrient aHoriOri(MakeSafePositioningValue( bCurSectionVertical ? nYPos : pFSPA->nXaLeft ), |
| 2446 |
eVertOri, eVertRel)); |
2444 |
bCurSectionVertical ? eVertOri : eHoriOri, |
|
|
2445 |
bCurSectionVertical ? eVertRel : eHoriRel); |
| 2446 |
if( 4 <= nXAlign ) |
| 2447 |
aHoriOri.SetPosToggle(true); |
| 2448 |
rFlySet.Put( aHoriOri ); |
| 2447 |
|
2449 |
|
|
|
2450 |
rFlySet.Put(SwFmtVertOrient(MakeSafePositioningValue( !bCurSectionVertical ? nYPos : -pFSPA->nXaRight ), |
| 2451 |
!bCurSectionVertical ? eVertOri : eHoriOri, |
| 2452 |
!bCurSectionVertical ? eVertRel : eHoriRel )); |
| 2453 |
|
| 2448 |
if ( |
2454 |
if ( |
| 2449 |
(pFSPA->nYaTop < 0) && (eVertOri == text::VertOrientation::NONE) && |
2455 |
(pFSPA->nYaTop < 0) && (eVertOri == text::VertOrientation::NONE) && |
| 2450 |
((eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR)) |
2456 |
((eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR)) |