[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 12 04:30:46 PST 2012


 sc/source/filter/xml/xmlimprt.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7ba78c7712abb83f515e45a744786af45a7fbc64
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Aug 14 16:46:44 2012 -0400

    Resolves: fdo#56009 fdo#54695 Calculate positions of cell-anchored objects
    
    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 at suse.com>
    (cherry picked from commit 89e34ef5e4ff5efc202656bd9a2122745fdc6530)
    
    Change-Id: I8ab5dd1fe7cd8a45b7968e101c893b442d7ce132
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

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();


More information about the Libreoffice-commits mailing list