[Libreoffice-commits] core.git: include/tools

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 4 08:43:53 UTC 2019


 include/tools/poly.hxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 9dd38caceabfcfaf428cc8490dd1ce25696ff789
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 3 16:06:58 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Jun 4 10:43:15 2019 +0200

    Remove unused, broken operator<< for PolyPolygon
    
    ...which apparently wants to internally call some operator<< for Polygon
    (rPolyPoly.GetObject(i)), but which doesn't exist (and appears to not have
    existed when this operator<< for PolyPolygon was added with
    e4be770ec8218d80dcc9f1e38fd1c69717beb4fb "add std::ostream operators for Region
    and PolyPolygon"), so uses the non-explicit PolyPolygon ctor that takes a
    Polygon, and causes infinite recursion for any non-empty PolyPolygon
    
    Change-Id: I308527dcfed18763c8c3ebbce823eea9a0340e70
    Reviewed-on: https://gerrit.libreoffice.org/73388
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 94d06856e428..b0c6190b6eb8 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -265,18 +265,6 @@ public:
 
 typedef std::vector< tools::PolyPolygon > PolyPolyVector;
 
-
-template<typename charT, typename traits>
-inline std::basic_ostream<charT, traits> & operator <<(
-    std::basic_ostream<charT, traits> & stream, const tools::PolyPolygon& rPolyPoly)
-{
-    if (!rPolyPoly.Count())
-        stream << "EMPTY";
-    for (sal_uInt16 i = 0; i < rPolyPoly.Count(); ++i)
-        stream << "[" << i << "] " << rPolyPoly.GetObject(i);
-    return stream;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list