include/filter/msfilter/sprmids.hxx | 1 + sw/source/filter/ww8/wrtw8num.cxx | 2 +- sw/source/filter/ww8/ww8par3.cxx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 2df08acc4c0bdbe1df96770cab347d1f5df9d7a7 Author: Miklos Vajna <[email protected]> Date: Fri Jan 31 10:50:44 2014 +0100 sw: hardcoded NS_sprm::LN_CPbiIBullet Change-Id: I51d4638b588da290853422750b90365b454c046f diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx index 1aa84c2..85c97a0 100644 --- a/include/filter/msfilter/sprmids.hxx +++ b/include/filter/msfilter/sprmids.hxx @@ -171,6 +171,7 @@ namespace NS_sprm { const sal_uInt16 LN_CFUsePgsuSettings = 0x0868; const sal_uInt16 LN_CCpg = 0x486b; const sal_uInt16 LN_CPbiGrf = 0x4888; + const sal_uInt16 LN_CPbiIBullet = 0x6887; const sal_uInt16 LN_CRgLid0_80 = 0x486d; const sal_uInt16 LN_CRgLid1_80 = 0x486e; const sal_uInt16 LN_CIdctHint = 0x286f; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 9fc8f44..c4b7d69 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -261,7 +261,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, int nIndex = m_rWW8Export.GetGrfIndex(*pBrush); if ( nIndex != -1 ) { - m_rWW8Export.InsUInt16(0x6887); + m_rWW8Export.InsUInt16(NS_sprm::LN_CPbiIBullet); m_rWW8Export.InsUInt32(nIndex); m_rWW8Export.InsUInt16(NS_sprm::LN_CPbiGrf); m_rWW8Export.InsUInt16(1); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 7f688a7..9a7440a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -666,7 +666,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, return false; //For i120928,parse the graphic info of bullets - sal_uInt8 *pSprmWhichPis = GrpprlHasSprm(0x6887,aGrpprlChpx[0],aLVL.nLenGrpprlChpx); + sal_uInt8 *pSprmWhichPis = GrpprlHasSprm(NS_sprm::LN_CPbiIBullet, aGrpprlChpx[0],aLVL.nLenGrpprlChpx); sal_uInt8 *pSprmIsPicBullet = GrpprlHasSprm(NS_sprm::LN_CPbiGrf, aGrpprlChpx[0],aLVL.nLenGrpprlChpx); if (pSprmWhichPis) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
