xmloff/source/text/txtexppr.cxx | 8 ++++++++ 1 file changed, 8 insertions(+)
New commits: commit 1ae655db954030d04fb3a413d57af2e47bea53af Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri Jul 4 08:19:12 2014 +0000 124107: ODF export - suppress export of fo:margin for paragraph styles diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 102523d..a9b7144 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::ContextFilter( XMLPropertyState* pClip11State = NULL; XMLPropertyState* pClipState = NULL; + // filter fo:margin XMLPropertyState* pAllParaMargin = NULL; + XMLPropertyState* pAllParaMarginRel = NULL; XMLPropertyState* pAllMargin = NULL; //UUUU @@ -586,6 +588,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_TEXT_CLIP11: pClip11State = propertie; break; case CTF_TEXT_CLIP: pClipState = propertie; break; case CTF_PARAMARGINALL: pAllParaMargin = propertie; break; + case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break; case CTF_MARGINALL: pAllMargin = propertie; break; //UUUU @@ -675,6 +678,11 @@ void XMLTextExportPropertySetMapper::ContextFilter( pAllParaMargin->mnIndex = -1; // just export individual attributes... pAllParaMargin->maValue.clear(); } + if (pAllParaMarginRel) + { + pAllParaMarginRel->mnIndex = -1; // just export individual attributes... + pAllParaMarginRel->maValue.clear(); + } if (pAllMargin) { pAllMargin->mnIndex = -1; // just export individual attributes... _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits