[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa

[Miklos Vajna]

 sc/source/core/data/document10.cxx       |    4 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 4cdce63daf162709c3eff0f9c6c90ecc32109c21
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Oct 9 13:36:44 2014 +0200

    testCropPixel: relax requirements a bit for OS X
    
    Change-Id: I5b72e39371671718ac31bbd92a4649a66a1241cf

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3c0a592..cf2c5c0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -440,9 +440,11 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, "crop-pixel.docx")
     // If map mode of the graphic is in pixels, then we used to handle original
     // size of the graphic as mm100, but it was in pixels.
     if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
-        // This is 17667 in the original document (i.e. should be < 20000), but
-        // was 504666, so the image become invisible.
-        assertXPath(pXmlDoc, "//a:srcRect", "l", "19072");
+    {
+        // This is 17667 in the original document, was 504666 (so the image
+        // become invisible), now is around 19072.
+        CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() < 20000);
+    }
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 2b6619c597a791775e2d41a68f7e85ef75d1aaa2
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date:   Thu Oct 9 13:02:18 2014 +0800

    fdo#84810 Avoid calc crash when using Paste Special - Link
    
    Change-Id: I52c072578ccc0b9f75a850613056e74d400eb532
    Reviewed-on: https://gerrit.libreoffice.org/11867
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 5689a68..5b286ec 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -84,6 +84,8 @@ bool ScDocument::CopyOneCellFromClip(
         return false;
 
     ScCellValue& rSrcCell = rCxt.getSingleCell();
+    const ScPatternAttr* pAttr = pClipDoc->GetPattern(aSrcPos);
+    rCxt.setSingleCellPattern(pAttr);
     if (rCxt.isAsLink())
     {
         ScSingleRefData aRef;
@@ -97,8 +99,6 @@ bool ScDocument::CopyOneCellFromClip(
     else
     {
         rSrcCell.set(pClipDoc->GetRefCellValue(aSrcPos));
-        const ScPatternAttr* pAttr = pClipDoc->GetPattern(aSrcPos);
-        rCxt.setSingleCellPattern(pAttr);
 
         // Check the paste flag to see whether we want to paste this cell.  If the
         // flag says we don't want to paste this cell, we'll return with true.