[Libreoffice-commits] core.git: 2 commits - external/libzmf sw/source

[Bjoern Michaelsen]

 external/libzmf/UnpackedTarball_libzmf.mk  |    4 ++
 external/libzmf/android-workaround.patch.1 |   14 +++++++++
 sw/source/core/unocore/unotext.cxx         |   44 ++++++-----------------------
 3 files changed, 28 insertions(+), 34 deletions(-)

New commits:
commit 035f205202da2756fe1aaea5f730228f3d40cf51
Author: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
Date:   Sun Sep 17 13:29:35 2017 +0200

    replace some boilerplate with C11++
    
    - also get rid of old OSL_* in favor of SAL_WARN*
    
    Change-Id: I4292cb3292c37fe9905a40903d9094c6206ab7f6
    Reviewed-on: https://gerrit.libreoffice.org/42374
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index ab240ba3cdf2..70d3b682deb9 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2005,18 +2005,11 @@ lcl_ApplyCellProperties(
             {
                 // 'close' all the cell with the same left position
                 // if separate vertical merges in the same column exist
-                if (rMergedCells.size())
+                for(auto& aMergedCell : rMergedCells)
                 {
-                    std::vector<VerticallyMergedCell>::iterator aMergedIter =
-                        rMergedCells.begin();
-                    while (aMergedIter != rMergedCells.end())
+                    if(lcl_SimilarPosition(aMergedCell.nLeftPosition, nLeftPos))
                     {
-                        if (lcl_SimilarPosition(aMergedIter->nLeftPosition,
-                                    nLeftPos))
-                        {
-                            aMergedIter->bOpen = false;
-                        }
-                        ++aMergedIter;
+                        aMergedCell.bOpen = false;
                     }
                 }
                 // add the new group of merged cells
@@ -2024,34 +2017,17 @@ lcl_ApplyCellProperties(
             }
             else
             {
-                // find the cell that
-                OSL_ENSURE(rMergedCells.size(),
-                        "the first merged cell is missing");
-                if (rMergedCells.size())
+                bool bFound = false;
+                SAL_WARN_IF(rMergedCells.empty(), "sw.uno", "the first merged cell is missing");
+                for(auto& aMergedCell : rMergedCells)
                 {
-                    std::vector<VerticallyMergedCell>::iterator aMergedIter =
-                        rMergedCells.begin();
-#if OSL_DEBUG_LEVEL > 0
-                    bool bDbgFound = false;
-#endif
-                    while (aMergedIter != rMergedCells.end())
+                    if (aMergedCell.bOpen && lcl_SimilarPosition(aMergedCell.nLeftPosition, nLeftPos))
                     {
-                        if (aMergedIter->bOpen &&
-                            lcl_SimilarPosition(aMergedIter->nLeftPosition,
-                                nLeftPos))
-                        {
-                            aMergedIter->aCells.push_back( xCellPS );
-#if OSL_DEBUG_LEVEL > 0
-                            bDbgFound = true;
-#endif
-                        }
-                        ++aMergedIter;
+                        aMergedCell.aCells.push_back( xCellPS );
+                        bFound = true;
                     }
-#if OSL_DEBUG_LEVEL > 0
-                    OSL_ENSURE( bDbgFound,
-                            "couldn't find first vertically merged cell" );
-#endif
                 }
+                SAL_WARN_IF(!bFound, "sw.uno", "couldn't find first vertically merged cell" );
             }
         }
         else
commit 9177f87b69f877c88eab584cd39cb423b400c13d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 17 12:18:28 2017 +0100

    fix android build
    
    Change-Id: Ibb536240a623559f9da45b450eae1ec58e951d6e
    Reviewed-on: https://gerrit.libreoffice.org/42373
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk
index 324638479ebb..4055bde8c858 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
 endif
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
+    external/libzmf/android-workaround.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libzmf/android-workaround.patch.1 b/external/libzmf/android-workaround.patch.1
new file mode 100644
index 000000000000..a46c5e8c3972
--- /dev/null
+++ b/external/libzmf/android-workaround.patch.1
@@ -0,0 +1,14 @@
+--- libzmf.orig/src/lib/ZMFTypes.cpp	2017-09-17 12:14:41.987990622 +0100
++++ libzmf/src/lib/ZMFTypes.cpp	2017-09-17 12:16:32.636850391 +0100
+@@ -38,10 +38,9 @@
+ 
+ double Point::distance(const Point &p2) const
+ {
+-  return std::hypot(p2.x - x, p2.y - y);
++  return ::hypot(p2.x - x, p2.y - y);
+ }
+ 
+-
+ BoundingBox::BoundingBox(const std::vector<Point> &points_)
+   : m_points(points_)
+   , m_width(0.0)