strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS swdrawobjapi (1.4.60); FILE MERGED

Browse source 
2004/08/12 07:14:16 od 1.4.60.3: RESYNC: (1.4-1.6); FILE MERGED
2004/08/06 04:47:13 od 1.4.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:54 od 1.4.60.1: #i31698# - adjustments for changed drawing object API in Writer
This commit is contained in:
Rüdiger Timm 2004-08-23 07:03:02 +00:00
parent fc94b50fe6
commit 1f708469ee
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tocntntanchoredobjectposition.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: kz $ $Date: 2004-08-02 14:53:05 $
* last change: $Author: rt $ $Date: 2004-08-23 08:03:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -309,7 +309,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
// determine vertical positioning and alignment attributes
SwFmtVertOrient aVert( rFrmFmt.GetVertOrient() );
bool bVertChgd = false;
// OD 22.09.2003 #i18732# - determine layout frame for vertical
// positions aligned to 'page areas'.
@ -451,12 +450,19 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
_GetTopForObjPos( rAnchorTxtFrm, fnRect, bVert ) );
}
// ??? Why saving calculated relative position
// keep calculated relative vertical position
if ( nRelPosY != aVert.GetPos() )
// keep calculated relative vertical position - needed for filters
// (including the xml-filter)
{
aVert.SetPos( nRelPosY );
bVertChgd = true;
// determine position
SwTwips nAttrRelPosY = nRelPosY - nAlignAreaOffset;
// set
if ( nAttrRelPosY != aVert.GetPos() )
{
aVert.SetPos( nAttrRelPosY );
const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
const_cast<SwFrmFmt&>(rFrmFmt).SetAttr( aVert );
const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
}
}
// determine absolute 'vertical' position, depending on layout-direction
@ -942,12 +948,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
}
}
// save calculated vertical position
const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
if ( bVertChgd )
const_cast<SwFrmFmt&>(rFrmFmt).SetAttr( aVert );
const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
// keep layout frame vertical position is oriented at.
mpVertPosOrientFrm = pUpperOfOrientFrm;
@ -957,7 +957,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
{
// determine horizontal positioning and alignment attributes
SwFmtHoriOrient aHori( rFrmFmt.GetHoriOrient() );
bool bHoriChgd = false;
// set calculated vertical position in order to determine correct
// frame, the horizontal position is oriented at.
@ -995,20 +994,18 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
maOffsetToFrmAnchorPos.X() = nHoriOffsetToFrmAnchorPos;
}
if ( HORI_NONE != aHori.GetHoriOrient() &&
aHori.GetPos() != nRelPosX )
// save calculated horizontal position - needed for filters
// (including the xml-filter)
{
aHori.SetPos( nRelPosX );
bHoriChgd = true;
}
// WHY ???
// save calculated horizontal position
if ( bHoriChgd )
{
const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
const_cast<SwFrmFmt&>(rFrmFmt).SetAttr( aHori );
const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
SwTwips nAttrRelPosX = nRelPosX - nHoriOffsetToFrmAnchorPos;
if ( aHori.GetHoriOrient() != HORI_NONE &&
aHori.GetPos() != nAttrRelPosX )
{
aHori.SetPos( nAttrRelPosX );
const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
const_cast<SwFrmFmt&>(rFrmFmt).SetAttr( aHori );
const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
}
}
}