From 97e6aa6a8f2d7ce486197da03d1711f946562d14 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 6 Nov 2012 10:53:10 +0100 Subject: fdo#48442 fix default hori/vert frame anchor during RTF import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. (cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3 Reviewed-on: https://gerrit.libreoffice.org/993 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index bf981d901b87..dbaa6e5fc0ca 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3942,12 +3942,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)); -- cgit