diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-23 15:36:47 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-23 15:50:38 +0100 |
commit | 393ece995a0761a72c8341bf56e40fe4c57a4824 (patch) | |
tree | 582a1f952e4a2048538f19dfd0b4e948b72b0408 /sw | |
parent | e3b7e62b0dc34787f66c504230252b2c5edd18c3 (diff) |
DocxAttributeOutput: m_i -> m_n
Change-Id: I5d67b53ddf74be2b1ef315cdbef8cc3fabaac9aa
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 20 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 21ca3c81d79f..e21be5b8e02e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5653,7 +5653,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_INFO("sw.ww8", "DocxAttributeOutput::FormatULSpace: setting spacing" << rULSpace.GetUpper() ); // check if before auto spacing was set during import and spacing we get from actual object is same // that we set in import. If yes just write beforeAutoSpacing tag. - if (m_bParaBeforeAutoSpacing && m_iParaBeforeSpacing == rULSpace.GetUpper()) + if (m_bParaBeforeAutoSpacing && m_nParaBeforeSpacing == rULSpace.GetUpper()) { m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_beforeAutospacing ), "1" ); @@ -5666,7 +5666,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) m_bParaBeforeAutoSpacing = false; // check if after auto spacing was set during import and spacing we get from actual object is same // that we set in import. If yes just write afterAutoSpacing tag. - if (m_bParaAfterAutoSpacing && m_iParaAfterSpacing == rULSpace.GetLower()) + if (m_bParaAfterAutoSpacing && m_nParaAfterSpacing == rULSpace.GetLower()) { m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_afterAutospacing ), "1" ); @@ -6204,17 +6204,17 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem) { m_bParaBeforeAutoSpacing = true; // get fixed value which was set during import - i->second >>= m_iParaBeforeSpacing; - m_iParaBeforeSpacing = MM100_TO_TWIP(m_iParaBeforeSpacing); - SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: property =" << i->first << " : m_iParaBeforeSpacing= " << m_iParaBeforeSpacing); + i->second >>= m_nParaBeforeSpacing; + m_nParaBeforeSpacing = MM100_TO_TWIP(m_nParaBeforeSpacing); + SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: property =" << i->first << " : m_nParaBeforeSpacing= " << m_nParaBeforeSpacing); } else if (i->first == "ParaBottomMarginAfterAutoSpacing") { m_bParaAfterAutoSpacing = true; // get fixed value which was set during import - i->second >>= m_iParaAfterSpacing; - m_iParaAfterSpacing = MM100_TO_TWIP(m_iParaAfterSpacing); - SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: property =" << i->first << " : m_iParaBeforeSpacing= " << m_iParaAfterSpacing); + i->second >>= m_nParaAfterSpacing; + m_nParaAfterSpacing = MM100_TO_TWIP(m_nParaAfterSpacing); + SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: property =" << i->first << " : m_nParaBeforeSpacing= " << m_nParaAfterSpacing); } else SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: unhandled grab bag property " << i->first ); @@ -6272,8 +6272,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)), m_bParaBeforeAutoSpacing(false), m_bParaAfterAutoSpacing(false), - m_iParaBeforeSpacing(0), - m_iParaAfterSpacing(0), + m_nParaBeforeSpacing(0), + m_nParaAfterSpacing(0), m_setFootnote(false) { } diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 57d33e03bfae..18d6c81e23fa 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -782,7 +782,7 @@ private: // flag to check if auto spacing was set in original file bool m_bParaBeforeAutoSpacing,m_bParaAfterAutoSpacing; // store hardcoded value which was set during import. - sal_Int32 m_iParaBeforeSpacing,m_iParaAfterSpacing; + sal_Int32 m_nParaBeforeSpacing,m_nParaAfterSpacing; bool m_setFootnote; |