|
 |
44ec17e |
From d56ad9d8bd27f795dd3f5d9eedaaea4d30a08832 Mon Sep 17 00:00:00 2001
|
|
|
44ec17e |
From: Miklos Vajna <vmiklos@suse.cz>
|
|
|
44ec17e |
Date: Tue, 6 Nov 2012 10:53:10 +0100
|
|
|
44ec17e |
Subject: [PATCH] fdo#48442 fix default hori/vert frame anchor during RTF
|
|
|
44ec17e |
import
|
|
|
44ec17e |
|
|
|
44ec17e |
We used to send nothing when we got nothing, but this is not correct:
|
|
|
44ec17e |
\pvmrg and \phmrg is the default in RTF, but not in Writer.
|
|
|
44ec17e |
|
|
|
44ec17e |
Conflicts:
|
|
|
44ec17e |
sw/qa/extras/rtfimport/rtfimport.cxx
|
|
|
44ec17e |
|
|
|
44ec17e |
Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
|
|
|
44ec17e |
---
|
|
|
44ec17e |
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++++++----
|
|
|
44ec17e |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
44ec17e |
|
|
|
44ec17e |
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
44ec17e |
index 79991eb..85401c2 100644
|
|
|
44ec17e |
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
44ec17e |
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
44ec17e |
@@ -3898,12 +3898,14 @@ RTFSprms RTFFrame::getSprms()
|
|
|
44ec17e |
pValue.reset(new RTFValue(nVertPadding));
|
|
|
44ec17e |
break;
|
|
|
44ec17e |
case NS_ooxml::LN_CT_FramePr_hAnchor:
|
|
|
44ec17e |
- if ( nHoriAnchor != 0 )
|
|
|
44ec17e |
- pValue.reset(new RTFValue(nHoriAnchor));
|
|
|
44ec17e |
+ if ( nHoriAnchor == 0 )
|
|
|
44ec17e |
+ nHoriAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin;
|
|
|
44ec17e |
+ pValue.reset(new RTFValue(nHoriAnchor));
|
|
|
44ec17e |
break;
|
|
|
44ec17e |
case NS_ooxml::LN_CT_FramePr_vAnchor:
|
|
|
44ec17e |
- if ( nVertAnchor != 0 )
|
|
|
44ec17e |
- pValue.reset(new RTFValue(nVertAnchor));
|
|
|
44ec17e |
+ if ( nVertAnchor == 0 )
|
|
|
44ec17e |
+ nVertAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
|
|
|
44ec17e |
+ pValue.reset(new RTFValue(nVertAnchor));
|
|
|
44ec17e |
break;
|
|
|
44ec17e |
case NS_ooxml::LN_CT_FramePr_xAlign:
|
|
|
44ec17e |
pValue.reset(new RTFValue(nHoriAlign));
|
|
|
44ec17e |
--
|
|
|
44ec17e |
1.8.0
|
|
|
44ec17e |
|