[Libreoffice-commits] core.git: 2 commits - include/basegfx oox/source

[Miklos Vajna]

 include/basegfx/vector/b2dvector.hxx |    2 +-
 oox/source/helper/graphichelper.cxx  |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit d95f50689f915b92211714495e866e2f47909f11
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jun 1 16:55:37 2017 +0200

    tdf#70415 PPTX import: fix assert fail in importEmbeddedGraphics()
    
    The intention for the parallel import is that the number of input and
    output arguments is always the same. On error just empty references are
    returned.
    
    That means we should not check for empty references here, otherwise the
    input and output length won't equal.
    
    Change-Id: Ief86162e7f827bc413c4dde4a4c9f606a83ea803
    Reviewed-on: https://gerrit.libreoffice.org/38316
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 692937baeb48..30c570b01eec 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -271,14 +271,11 @@ std::vector< uno::Reference<graphic::XGraphic> > GraphicHelper::importGraphics(c
 
     for (const auto& rStream : rStreams)
     {
-        if (rStream.is())
+        uno::Sequence<beans::PropertyValue > aArgs = comphelper::InitPropertySequence(
         {
-            uno::Sequence<beans::PropertyValue > aArgs = comphelper::InitPropertySequence(
-            {
-                {"InputStream", uno::makeAny(rStream)}
-            });
-            aArgsVec.push_back(aArgs);
-        }
+            {"InputStream", uno::makeAny(rStream)}
+        });
+        aArgsVec.push_back(aArgs);
     }
 
     std::vector< uno::Reference<graphic::XGraphic> > aRet;
commit 6664c1fc92bcf9a7fa9f66896a65bc1b44bdab37
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Fri Jun 2 00:33:07 2017 +0200

    fix comment: B2DVector::angle ranges from -pi to +pi
    
    Change-Id: I53f9bad932c0d389081575a0c99f1d86a872ea54
    Reviewed-on: https://gerrit.libreoffice.org/38334
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index 13301d18974f..6c452f89bd47 100644
--- a/include/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
@@ -153,7 +153,7 @@ namespace basegfx
             The second 2D Vector
 
             @return
-            The Angle value of the two involved 2D Vectors in -pi/2 < return < pi/2
+            The Angle value of the two involved 2D Vectors ranging from -pi to +pi
         */
         double angle( const B2DVector& rVec ) const;