[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 4383506623d23efdfd584ea42aa7a480a6122258
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jan 8 20:48:57 2013 +0100
lp#1097433: Objects anchored to cell wrongly positionned to A1
diff --git a/changelog b/changelog
index b8fc4c9..a5888a3 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport multi-threaded XIOError segv (LP: #1097370)
* backport GetSdrPageView() might return NULL (LP: #1097393)
* backport Writer crashed while editing a table (LP: #1097406)
+ * backport Objects anchored to cell wrongly positionned to A1 (LP: #1097433)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff b/patches/lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
new file mode 100644
index 0000000..ea87b77
--- /dev/null
+++ b/patches/lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
@@ -0,0 +1,44 @@
+From dc9560e271aeda7ebbd01de6794ade09c7b0152d Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Tue, 14 Aug 2012 16:46:44 -0400
+Subject: [PATCH] Resolves: fdo#56009 fdo#54695 Calculate positions of
+ cell-anchored objects
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+on ods import
+
+Since we no longer re-calc row heights on ods import, we need to do
+this manually, in order to position cell-anchored objects correctly.
+Previously we were getting this for free since the row height recalc
+code path did it as part of it.
+
+Signed-off-by: Noel Power <noel.power@suse.com>
+(cherry picked from commit 89e34ef5e4ff5efc202656bd9a2122745fdc6530)
+
+Change-Id: I8ab5dd1fe7cd8a45b7968e101c893b442d7ce132
+Signed-off-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sc/source/filter/xml/xmlimprt.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
+index 166cef9..6a67c6a 100644
+--- a/sc/source/filter/xml/xmlimprt.cxx
++++ b/sc/source/filter/xml/xmlimprt.cxx
+@@ -2929,8 +2929,11 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
+
+ SCTAB nTabCount = pDoc->GetTableCount();
+ for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
++ {
++ pDoc->SetDrawPageSize(nTab);
+ if (!pSheetData->IsSheetBlocked( nTab ))
+ pDoc->SetStreamValid( nTab, true );
++ }
+ }
+
+ aTables.FixupOLEs();
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 3785f6a..a947051 100644
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ lp-1097560-rhbz-842292-crash-in-calling-callback-whose.diff
lp-1097370-rhbz-855541-XIOError-handler-multithread-wo.diff
lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
lp-1097406-rhbz-852128-sw-avoid-table-undo-crash.diff
+lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
--
LibreOffice packaging repository
Reply to: