diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-09 13:43:56 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-09 13:47:04 +0200 |
| commit | bfaff2a51f67a9e33f1d8fc11ab91f364a49c50d (patch) | |
| tree | a5e02068eda0eb97c7a7ff9143792fc519ab86cb /sw/source/filter/ww8 | |
| parent | e1e83d14c9e738da9e824ccefe254ddf74cfca9c (diff) | |
WW8FlyPara::Read: replace hardwired numbers with constants
Change-Id: I298499d09ac44e0fdbbd62fc0bd07a25f1b33aa3
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 39e865f7d096..a8ff78dd4073 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -67,6 +67,7 @@ #include <editeng/frmdiritem.hxx> #include <editeng/charhiddenitem.hxx> #include <i18nlangtag/mslangid.hxx> +#include <doctok/sprmids.hxx> #include <fmtpdsc.hxx> #include <node.hxx> #include <ndtxt.hxx> // SwTxtNode, siehe unten: JoinNode() @@ -1558,17 +1559,17 @@ void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8PLCFx_Cp_FKP* pPap) } else { - SetValSprm( &nSp26, pPap, 0x8418 ); // X-Position + SetValSprm( &nSp26, pPap, NS_sprm::LN_PDxaAbs ); // X-Position //set in me or in parent style - mbVertSet |= SetValSprm( &nSp27, pPap, 0x8419 ); // Y-Position - SetValSprm( &nSp45, pPap, 0x442B ); // Hoehe - SetValSprm( &nSp28, pPap, 0x841A ); // Breite - SetValSprm( &nLeMgn, pPap, 0x842F ); // L-Raender - SetValSprm( &nRiMgn, pPap, 0x842F ); // R-Raender - SetValSprm( &nUpMgn, pPap, 0x842E ); // U-Raender - SetValSprm( &nLoMgn, pPap, 0x842E ); // D-Raender - - pS = pPap->HasSprm( 0x2423 ); // Umfluss + mbVertSet |= SetValSprm( &nSp27, pPap, NS_sprm::LN_PDyaAbs ); // Y-Position + SetValSprm( &nSp45, pPap, NS_sprm::LN_PWHeightAbs ); // Hoehe + SetValSprm( &nSp28, pPap, NS_sprm::LN_PDxaWidth ); // Breite + SetValSprm( &nLeMgn, pPap, NS_sprm::LN_PDxaFromText ); // L-Raender + SetValSprm( &nRiMgn, pPap, NS_sprm::LN_PDxaFromText ); // R-Raender + SetValSprm( &nUpMgn, pPap, NS_sprm::LN_PDyaFromText ); // U-Raender + SetValSprm( &nLoMgn, pPap, NS_sprm::LN_PDyaFromText ); // D-Raender + + pS = pPap->HasSprm( NS_sprm::LN_PWr ); // Umfluss if( pS ) nSp37 = *pS; } |