Author: orw
Date: Fri Jul 4 14:16:12 2014
New Revision: 1607861
URL: http://svn.apache.org/r1607861
Log:
124107: ODF export - suppress export of fo:margin for paragraph styles
cherry-picked from trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1607793
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1607793
Modified: openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx?rev=1607861&r1=1607860&r2=1607861&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx (original)
+++ openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx Fri Jul 4
14:16:12 2014
@@ -464,7 +464,9 @@ void XMLTextExportPropertySetMapper::Con
XMLPropertyState* pClip11State = NULL;
XMLPropertyState* pClipState = NULL;
+ // filter fo:margin
XMLPropertyState* pAllParaMargin = NULL;
+ XMLPropertyState* pAllParaMarginRel = NULL;
XMLPropertyState* pAllMargin = NULL;
sal_Bool bNeedsAnchor = sal_False;
@@ -584,6 +586,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;
}
}
@@ -641,6 +644,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...
