summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-11-06 10:53:10 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-11-06 11:10:27 +0100
commit7b7bee4ed5722ce59ffd3394a0330d71d69d66b3 (patch)
tree809ae701156f59f8f42552362e4aba1f5575c501 /writerfilter/source
parent13d21b1f039870c3f6b4b0b55466648fa503b001 (diff)
fdo#48442 fix default hori/vert frame anchor during RTF import
We used to send nothing when we got nothing, but this is not correct: \pvmrg and \phmrg is the default in RTF, but not in Writer. Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4393aa0bfb3e..fd00febd19cd 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4347,12 +4347,14 @@ RTFSprms RTFFrame::getSprms()
pValue.reset(new RTFValue(nVertPadding));
break;
case NS_ooxml::LN_CT_FramePr_hAnchor:
- if ( nHoriAnchor != 0 )
- pValue.reset(new RTFValue(nHoriAnchor));
+ if ( nHoriAnchor == 0 )
+ nHoriAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin;
+ pValue.reset(new RTFValue(nHoriAnchor));
break;
case NS_ooxml::LN_CT_FramePr_vAnchor:
- if ( nVertAnchor != 0 )
- pValue.reset(new RTFValue(nVertAnchor));
+ if ( nVertAnchor == 0 )
+ nVertAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
+ pValue.reset(new RTFValue(nVertAnchor));
break;
case NS_ooxml::LN_CT_FramePr_xAlign:
pValue.reset(new RTFValue(nHoriAlign));