The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 865354b68f0922f015ea2f7a5d15954250a45281
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Jan 9 14:37:32 2013 +0100
lp#1097735: fix default hori/vert frame anchor during RTF importfix default
hori/vert frame anchor during RTF importfix default hori/vert frame anchor
during RTF import
diff --git a/changelog b/changelog
index 41f2a6f..3cfe33e 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport torn off popups trigger keyboard focus problems (LP: #1097718)
* backport a11y: call doShow after we have a valid view (LP: #1097722)
* backport Clipboard must be disposed before Selection (LP: #1097727)
+ * backport fix default hori/vert frame anchor during RTF import (LP:
#1097735)
-- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 08 Jan 2013
17:09:36 +0100
diff --git
a/patches/lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
b/patches/lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
new file mode 100644
index 0000000..c031d8a
--- /dev/null
+++
b/patches/lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
@@ -0,0 +1,51 @@
+From 4fef9e7cdec07f387bdf79b29c3271df353fa37d Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmik...@suse.cz>
+Date: Tue, 6 Nov 2012 10:53:10 +0100
+Subject: [PATCH 06/14] 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 <caol...@redhat.com>
+Reviewed-by: Caolán McNamara <caol...@redhat.com>
+---
+ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+index 79991eb..85401c2 100644
+--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
++++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+@@ -3898,12 +3898,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));
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 4b71abb..843671c 100644
--- a/patches/series
+++ b/patches/series
@@ -47,3 +47,4 @@ lp-1097715-Enable-NPP_Initialize-Shutdown-again.diff
lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff
lp-1097722-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.diff
lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff
+lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ttcml-0003a3...@vasks.debian.org
