[libreoffice/f17] Resolves: rhbz#810739 Incorrect displaying attached rtf document

[David Tardon]

commit 44ec17e0cdb6a933022f19ed88eee6d695d0b694
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 21 09:20:10 2012 +0100

    Resolves: rhbz#810739 Incorrect displaying attached rtf document

 ...ix-default-hori-vert-frame-anchor-during-.patch |   43 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/0001-fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch b/0001-fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch
new file mode 100644
index 0000000..1d464e2
--- /dev/null
+++ b/0001-fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch
@@ -0,0 +1,43 @@
+From d56ad9d8bd27f795dd3f5d9eedaaea4d30a08832 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos at suse.cz>
+Date: Tue, 6 Nov 2012 10:53:10 +0100
+Subject: [PATCH] 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.
+
+Conflicts:
+	sw/qa/extras/rtfimport/rtfimport.cxx
+
+Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
+---
+ 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.8.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 1a3bf90..f7d81cf 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -35,7 +35,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -171,6 +171,7 @@ Patch53: 0001-kill-this-hard-coded-sheet-limit-for-xlsx-import-rhb.patch
 Patch54: 0001-Resolves-fdo-56009-fdo-54695-Calculate-positions-of-.patch
 Patch55: 0001-Enable-NPP_Initialize-Shutdown-again.patch
 Patch56: 0001-Do-not-move-nCurUndoAction-0.patch
+Patch57: 0001-fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1057,6 +1058,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch54 -p1 -b .fdo-56009-fdo-54695-Calculate-positions-of-.patch
 %patch55 -p1 -b .Enable-NPP_Initialize-Shutdown-again.patch
 %patch56 -p1 -b .Do-not-move-nCurUndoAction-0.patch
+%patch57 -p1 -b .fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2343,6 +2345,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Dec 21 2012 David Tardon <dtardon at redhat.com> - 1:3.5.7.2-8-UNBUILT
+- Resolves: rhbz#810739 Incorrect displaying attached rtf document
+
 * Thu Dec 06 2012 Stephan Bergmann <sbergman at redhat.com> - 1:3.5.7.2-7
 - Resolves: rendering documents in browser plug-in
 - Resolves: rhbz#882240 end of undo stack crash