diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-03-14 11:24:04 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-03-14 11:24:04 +0100 |
| commit | 16384a53f7fb5b3eeaaa6e624c7416f7e13b17d2 (patch) | |
| tree | ea5f59a57b58aa09662e8d8c7212a0f99ca25dc6 /sw/source/filter/ww8/wrtw8num.cxx | |
| parent | e86e7e5c4bb6c4b6d28cf72671e69f42257fb924 (diff) | |
Code cleanup for i#120928 patch
Change-Id: Ic46acc5207bab70f080c4eba5a8113de8376ad36
Diffstat (limited to 'sw/source/filter/ww8/wrtw8num.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 4d086b8beaf7..25d1ece2711f 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -255,18 +255,18 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, } m_rWW8Export.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rWW8Export.mbExportModeRTF ); - //For i120928,achieve graphic's index of bullet from the bullet bookmark - if (SVX_NUM_BITMAP == nNumberingType && pBrush) - { - int nIndex = m_rWW8Export.GetGrfIndex(*pBrush); - if ( nIndex != -1 ) + //For i120928,achieve graphic's index of bullet from the bullet bookmark + if (SVX_NUM_BITMAP == nNumberingType && pBrush) { - m_rWW8Export.InsUInt16(0x6887); - m_rWW8Export.InsUInt32(nIndex); - m_rWW8Export.InsUInt16(0x4888); - m_rWW8Export.InsUInt16(1); + int nIndex = m_rWW8Export.GetGrfIndex(*pBrush); + if ( nIndex != -1 ) + { + m_rWW8Export.InsUInt16(0x6887); + m_rWW8Export.InsUInt32(nIndex); + m_rWW8Export.InsUInt16(0x4888); + m_rWW8Export.InsUInt16(1); + } } - } m_rWW8Export.pO = pOldpO; } @@ -493,7 +493,7 @@ void MSWordExportBase::AbstractNumberingDefinitions() pPseudoFont, pOutSet, nIndentAt, nFirstLineIndex, nListTabPos, sNumStr, - rFmt.GetNumberingType()==SVX_NUM_BITMAP ? rFmt.GetBrush():0);//Start for i120928,export graphic bullet,2012.9.25 + rFmt.GetNumberingType()==SVX_NUM_BITMAP ? rFmt.GetBrush():0); delete pPseudoFont; } |