You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2014/07/04 10:19:13 UTC
svn commit: r1607793 - /openoffice/trunk/main/xmloff/source/text/txtexppr.cxx
Author: orw
Date: Fri Jul 4 08:19:12 2014
New Revision: 1607793
URL: http://svn.apache.org/r1607793
Log:
124107: ODF export - suppress export of fo:margin for paragraph styles
Modified:
openoffice/trunk/main/xmloff/source/text/txtexppr.cxx
Modified: openoffice/trunk/main/xmloff/source/text/txtexppr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtexppr.cxx?rev=1607793&r1=1607792&r2=1607793&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/text/txtexppr.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtexppr.cxx Fri Jul 4 08:19:12 2014
@@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::Con
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::Con
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::Con
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...