Skip to content

C
core
Kaydet (Commit) 1ae655db authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann
Dosyalara gözat
Seçenekler

124107: ODF export - suppress export of fo:margin for paragraph styles

üst 247d5bc4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
xmloff/source/text/txtexppr.cxx
Dosyayı görüntüle @ 1ae655db
...@@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::ContextFilter( ...@@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::ContextFilter(
XMLPropertyState* pClip11State = NULL; XMLPropertyState* pClip11State = NULL;
XMLPropertyState* pClipState = NULL; XMLPropertyState* pClipState = NULL;
// filter fo:margin
XMLPropertyState* pAllParaMargin = NULL; XMLPropertyState* pAllParaMargin = NULL;
XMLPropertyState* pAllParaMarginRel = NULL;
XMLPropertyState* pAllMargin = NULL; XMLPropertyState* pAllMargin = NULL;
//UUUU //UUUU
...@@ -586,6 +588,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( ...@@ -586,6 +588,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
case CTF_TEXT_CLIP11: pClip11State = propertie; break; case CTF_TEXT_CLIP11: pClip11State = propertie; break;
case CTF_TEXT_CLIP: pClipState = propertie; break; case CTF_TEXT_CLIP: pClipState = propertie; break;
case CTF_PARAMARGINALL: pAllParaMargin = propertie; break; case CTF_PARAMARGINALL: pAllParaMargin = propertie; break;
case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break;
case CTF_MARGINALL: pAllMargin = propertie; break; case CTF_MARGINALL: pAllMargin = propertie; break;
//UUUU //UUUU
...@@ -675,6 +678,11 @@ void XMLTextExportPropertySetMapper::ContextFilter( ...@@ -675,6 +678,11 @@ void XMLTextExportPropertySetMapper::ContextFilter(
pAllParaMargin->mnIndex = -1; // just export individual attributes... pAllParaMargin->mnIndex = -1; // just export individual attributes...
pAllParaMargin->maValue.clear(); pAllParaMargin->maValue.clear();
} }
if (pAllParaMarginRel)
{
pAllParaMarginRel->mnIndex = -1; // just export individual attributes...
pAllParaMarginRel->maValue.clear();
}
if (pAllMargin) if (pAllMargin)
{ {
pAllMargin->mnIndex = -1; // just export individual attributes... pAllMargin->mnIndex = -1; // just export individual attributes...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment