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

[Caolán McNamara]

 basegfx/source/polygon/b3dpolypolygon.cxx  |   11 +++++++++++
 include/basegfx/polygon/b3dpolypolygon.hxx |    2 ++
 sw/source/core/docnode/ndtbl.cxx           |   14 ++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 59097e8d4c4d0570a0863ebaad1259a4436ef816
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 23 09:11:57 2016 +0100

    coverity#1371281 Missing move assignment operator
    
    Change-Id: I7d0351931b0baa434bd24db05358e096cfa1b6e2

diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index aa7ee18..1ff3cac 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -201,6 +201,11 @@ namespace basegfx
     {
     }
 
+    B3DPolyPolygon::B3DPolyPolygon(B3DPolyPolygon&& rPolyPolygon) :
+        mpPolyPolygon(std::move(rPolyPolygon.mpPolyPolygon))
+    {
+    }
+
     B3DPolyPolygon::B3DPolyPolygon(const B3DPolygon& rPolygon) :
         mpPolyPolygon( ImplB3DPolyPolygon(rPolygon) )
     {
@@ -216,6 +221,12 @@ namespace basegfx
         return *this;
     }
 
+    B3DPolyPolygon& B3DPolyPolygon::operator=(B3DPolyPolygon&& rPolyPolygon)
+    {
+        mpPolyPolygon = std::move(rPolyPolygon.mpPolyPolygon);
+        return *this;
+    }
+
     bool B3DPolyPolygon::operator==(const B3DPolyPolygon& rPolyPolygon) const
     {
         if(mpPolyPolygon.same_object(rPolyPolygon.mpPolyPolygon))
diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx
index 9e3472d..ebab91a 100644
--- a/include/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
@@ -46,11 +46,13 @@ namespace basegfx
     public:
         B3DPolyPolygon();
         B3DPolyPolygon(const B3DPolyPolygon& rPolyPolygon);
+        B3DPolyPolygon(B3DPolyPolygon&& rPolygon);
         explicit B3DPolyPolygon(const B3DPolygon& rPolygon);
         ~B3DPolyPolygon();
 
         // assignment operator
         B3DPolyPolygon& operator=(const B3DPolyPolygon& rPolyPolygon);
+        B3DPolyPolygon& operator=(B3DPolyPolygon&& rPolyPolygon);
 
         // compare operators
         bool operator==(const B3DPolyPolygon& rPolyPolygon) const;
commit 5840a28fd43146e1d76beacdedacd48107e5f8c6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 23 09:04:25 2016 +0100

    coverity#1373351 make SetTabRows the same as SetTabCols
    
    Change-Id: I9cfe2f3ec96ee72ff2e7657661a003086d301db6

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index eb15585a..e051892 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2767,11 +2767,17 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
 void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly,
                         const SwCellFrame* pBoxFrame )
 {
-    SwTabFrame *pTab;
-
-    OSL_ENSURE( pBoxFrame, "SetTabRows called without pBoxFrame" );
+    SwTabFrame *pTab = nullptr;
 
-    pTab = const_cast<SwFrame*>(static_cast<SwFrame const *>(pBoxFrame))->ImplFindTabFrame();
+    if( pBoxFrame )
+    {
+        pTab = const_cast<SwFrame*>(static_cast<SwFrame const *>(pBoxFrame))->ImplFindTabFrame();
+    }
+    else
+    {
+        OSL_ENSURE( false, "must specify pBoxFrame" );
+        return ;
+    }
 
     // If the Table is still using relative values (USHRT_MAX)
     // we need to switch to absolute ones.