/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
 * This file is part of the LibreOffice project.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 *
 * This file incorporates work covered by the following license notice:
 *
 *   Licensed to the Apache Software Foundation (ASF) under one or more
 *   contributor license agreements. See the NOTICE file distributed
 *   with this work for additional information regarding copyright
 *   ownership. The ASF licenses this file to you under the Apache
 *   License, Version 2.0 (the "License"); you may not use this file
 *   except in compliance with the License. You may obtain a copy of
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <basegfx/polygon/b2dtrapezoid.hxx>
#include <basegfx/range/b1drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>

#include <osl/diagnose.h>

#include <list>

namespace basegfx
{
    namespace trapezoidhelper
    {

        // helper class to hold a simple edge. This is only used for horizontal edges
        // currently, thus the YPositions will be equal. I did not create a special
        // class for this since holding the pointers is more effective and also can be
        // used as baseclass for the traversing edges

        class TrDeSimpleEdge
        {
        protected:
            // pointers to start and end point
            const B2DPoint*     mpStart;
            const B2DPoint*     mpEnd;

        public:
            // constructor
            TrDeSimpleEdge(
                const B2DPoint* pStart,
                const B2DPoint* pEnd)
            :   mpStart(pStart),
                mpEnd(pEnd)
            {
            }

            // data read access
            const B2DPoint& getStart() const { return *mpStart; }
            const B2DPoint& getEnd() const { return *mpEnd; }
        };

        // define vector of simple edges

        typedef std::vector< TrDeSimpleEdge > TrDeSimpleEdges;

        // helper class for holding a traversing edge. It will always have some
        // distance in YPos. The slope (in a numerically useful form, see comments) is
        // hold and used in SortValue to allow sorting traversing edges by Y, X and slope
        // (in that order)

        class TrDeEdgeEntry : public TrDeSimpleEdge
        {
        private:
            // the slope in a numerical useful form for sorting
            sal_uInt32          mnSortValue;

        public:
            // convenience data read access
            double getDeltaX() const { return mpEnd->getX() - mpStart->getX(); }
            double getDeltaY() const { return mpEnd->getY() - mpStart->getY(); }

            // convenience data read access. SortValue is created on demand since
            // it is not always used
            sal_uInt32 getSortValue() const
            {
                if(mnSortValue != 0)
                    return mnSortValue;

                // get radiant; has to be in the range ]0.0 .. pi[, thus scale to full
                // sal_uInt32 range for maximum precision
                const double fRadiant(atan2(getDeltaY(), getDeltaX()) * (SAL_MAX_UINT32 / F_PI));

                // convert to sal_uInt32 value
                const_cast< TrDeEdgeEntry* >(this)->mnSortValue = sal_uInt32(fRadiant);

                return mnSortValue;
            }

            // constructor. SortValue can be given when known, use zero otherwise
            TrDeEdgeEntry(
                const B2DPoint* pStart,
                const B2DPoint* pEnd,
                sal_uInt32 nSortValue)
            :   TrDeSimpleEdge(pStart, pEnd),
                mnSortValue(nSortValue)
            {
                // force traversal of deltaY downward
                if(mpEnd->getY() < mpStart->getY())
                {
                    std::swap(mpStart, mpEnd);
                }

                // no horizontal edges allowed, all need to traverse vertically
                OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
            }

            // data write access to StartPoint
            void setStart( const B2DPoint* pNewStart)
            {
                OSL_ENSURE(pNewStart != nullptr, "No null pointer allowed here (!)");

                if(mpStart != pNewStart)
                {
                    mpStart = pNewStart;

                    // no horizontal edges allowed, all need to traverse vertically
                    OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
                }
            }

            // data write access to EndPoint
            void setEnd( const B2DPoint* pNewEnd)
            {
                OSL_ENSURE(pNewEnd != nullptr, "No null pointer allowed here (!)");

                if(mpEnd != pNewEnd)
                {
                    mpEnd = pNewEnd;

                    // no horizontal edges allowed, all need to traverse vertically
                    OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
                }
            }

            // operator for sort support. Sort by Y, X and slope (in that order)
            bool operator<(const TrDeEdgeEntry& rComp) const
            {
                if(fTools::equal(getStart().getY(), rComp.getStart().getY()))
                {
                    if(fTools::equal(getStart().getX(), rComp.getStart().getX()))
                    {
                        // when start points are equal, use the direction the edge is pointing
                        // to. That value is created on demand and derived from atan2 in the
                        // range ]0.0 .. pi[ (without extremas, we always have a deltaY in this
                        // class) and scaled to sal_uInt32 range for best precision. 0 means no angle,
                        // while SAL_MAX_UINT32 means pi. Thus, the higher the value, the more left
                        // the edge traverses.
                        return (getSortValue() > rComp.getSortValue());
                    }
                    else
                    {
                        return fTools::less(getStart().getX(), rComp.getStart().getX());
                    }
                }
                else
                {
                    return fTools::less(getStart().getY(), rComp.getStart().getY());
                }
            }

            // method for cut support
            B2DPoint getCutPointForGivenY(double fGivenY) const
            {
                // Calculate cut point locally (do not use interpolate) since it is numerically
                // necessary to guarantee the new, equal Y-coordinate
                const double fFactor((fGivenY - getStart().getY()) / getDeltaY());
                const double fDeltaXNew(fFactor * getDeltaX());

                return B2DPoint(getStart().getX() + fDeltaXNew, fGivenY);
            }
        };

        // define double linked list of edges (for fast random insert)

        typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries;

    } // end of anonymous namespace
} // end of namespace basegfx

namespace basegfx
{
    namespace trapezoidhelper
    {
        // FIXME: templatize this and use it for TrDeEdgeEntries too ...

        /// Class to allow efficient allocation and release of B2DPoints
        class PointBlockAllocator
        {
            static const size_t nBlockSize = 32;
            size_t nCurPoint;
            B2DPoint *mpPointBase;
            /// Special case the first allocation to avoid it.
            B2DPoint maFirstStackBlock[nBlockSize];
            std::vector< B2DPoint * > maBlocks;
        public:
            PointBlockAllocator() :
                nCurPoint( nBlockSize ),
                mpPointBase( maFirstStackBlock )
            {
            }

            ~PointBlockAllocator()
            {
                while(!maBlocks.empty())
                {
                    delete [] maBlocks.back();
                    maBlocks.pop_back();
                }
            }

            B2DPoint *allocatePoint()
            {
                if(nCurPoint >= nBlockSize)
                {
                    mpPointBase = new B2DPoint[nBlockSize];
                    maBlocks.push_back(mpPointBase);
                    nCurPoint = 0;
                }
                return mpPointBase + nCurPoint++;
            }

            B2DPoint *allocatePoint(const B2DTuple &rPoint)
            {
                B2DPoint *pPoint = allocatePoint();
                *pPoint = rPoint;
                return pPoint;
            }

            /// This is a very uncommon case but why not ...
            void freeIfLast(B2DPoint const *pPoint)
            {
                // just re-use the last point if we can.
                if ( nCurPoint > 0 && pPoint == mpPointBase + nCurPoint - 1 )
                    nCurPoint--;
            }
        };

        // helper class to handle the complete trapezoid subdivision of a PolyPolygon
        class TrapezoidSubdivider
        {
        private:
            // local data
            sal_uInt32                  mnInitialEdgeEntryCount;
            TrDeEdgeEntries             maTrDeEdgeEntries;
            std::vector< B2DPoint >   maPoints;
            /// new points allocated for cuts
            PointBlockAllocator         maNewPoints;

            void addEdgeSorted(
                TrDeEdgeEntries::iterator aCurrent,
                const TrDeEdgeEntry& rNewEdge)
            {
                // Loop while new entry is bigger, use operator<
                while(aCurrent != maTrDeEdgeEntries.end() && (*aCurrent) < rNewEdge)
                {
                    ++aCurrent;
                }

                // Insert before first which is smaller or equal or at end
                maTrDeEdgeEntries.insert(aCurrent, rNewEdge);
            }

            bool splitEdgeAtGivenPoint(
                TrDeEdgeEntries::reference aEdge,
                const B2DPoint& rCutPoint,
                const TrDeEdgeEntries::iterator& aCurrent)
            {
                // do not create edges without deltaY: do not split when start is identical
                if(aEdge.getStart().equal(rCutPoint))
                {
                    return false;
                }

                // do not create edges without deltaY: do not split when end is identical
                if(aEdge.getEnd().equal(rCutPoint))
                {
                    return false;
                }

                const double fOldDeltaYStart(rCutPoint.getY() - aEdge.getStart().getY());

                if(fTools::lessOrEqual(fOldDeltaYStart, 0.0))
                {
                    // do not split: the resulting edge would be horizontal
                    // correct it to new start point
                    aEdge.setStart(&rCutPoint);
                    return false;
                }

                const double fNewDeltaYStart(aEdge.getEnd().getY() - rCutPoint.getY());

                if(fTools::lessOrEqual(fNewDeltaYStart, 0.0))
                {
                    // do not split: the resulting edge would be horizontal
                    // correct it to new end point
                    aEdge.setEnd(&rCutPoint);
                    return false;
                }

                // Create new entry
                const TrDeEdgeEntry aNewEdge(
                    &rCutPoint,
                    &aEdge.getEnd(),
                    aEdge.getSortValue());

                // Correct old entry
                aEdge.setEnd(&rCutPoint);

                // Insert sorted (to avoid new sort)
                addEdgeSorted(aCurrent, aNewEdge);

                return true;
            }

            bool testAndCorrectEdgeIntersection(
                TrDeEdgeEntries::reference aEdgeA,
                TrDeEdgeEntries::reference aEdgeB,
                const TrDeEdgeEntries::iterator& aCurrent)
            {
                // Exclude simple cases: same start or end point
                if(aEdgeA.getStart().equal(aEdgeB.getStart()))
                {
                    return false;
                }

                if(aEdgeA.getStart().equal(aEdgeB.getEnd()))
                {
                    return false;
                }

                if(aEdgeA.getEnd().equal(aEdgeB.getStart()))
                {
                    return false;
                }

                if(aEdgeA.getEnd().equal(aEdgeB.getEnd()))
                {
                    return false;
                }

                // Exclude simple cases: one of the edges has no length anymore
                if(aEdgeA.getStart().equal(aEdgeA.getEnd()))
                {
                    return false;
                }

                if(aEdgeB.getStart().equal(aEdgeB.getEnd()))
                {
                    return false;
                }

                // check if one point is on the other edge (a touch, not a cut)
                const B2DVector aDeltaB(aEdgeB.getDeltaX(), aEdgeB.getDeltaY());

                if(utils::isPointOnEdge(aEdgeA.getStart(), aEdgeB.getStart(), aDeltaB))
                {
                    return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getStart(), aCurrent);
                }

                if(utils::isPointOnEdge(aEdgeA.getEnd(), aEdgeB.getStart(), aDeltaB))
                {
                    return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getEnd(), aCurrent);
                }

                const B2DVector aDeltaA(aEdgeA.getDeltaX(), aEdgeA.getDeltaY());

                if(utils::isPointOnEdge(aEdgeB.getStart(), aEdgeA.getStart(), aDeltaA))
                {
                    return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getStart(), aCurrent);
                }

                if(utils::isPointOnEdge(aEdgeB.getEnd(), aEdgeA.getStart(), aDeltaA))
                {
                    return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getEnd(), aCurrent);
                }

                // check for cut inside edges. Use both t-values to choose the more precise
                // one later
                double fCutA(0.0);
                double fCutB(0.0);

                if(utils::findCut(
                    aEdgeA.getStart(), aDeltaA,
                    aEdgeB.getStart(), aDeltaB,
                    CutFlagValue::LINE,
                    &fCutA,
                    &fCutB) != CutFlagValue::NONE)
                {
                    // use a simple metric (length criteria) for choosing the numerically
                    // better cut
                    const double fSimpleLengthA(aDeltaA.getX() + aDeltaA.getY());
                    const double fSimpleLengthB(aDeltaB.getX() + aDeltaB.getY());
                    const bool bAIsLonger(fSimpleLengthA > fSimpleLengthB);
                    B2DPoint* pNewPoint = bAIsLonger
                        ? maNewPoints.allocatePoint(aEdgeA.getStart() + (fCutA * aDeltaA))
                        : maNewPoints.allocatePoint(aEdgeB.getStart() + (fCutB * aDeltaB));

                    // try to split both edges
                    bool bRetval = splitEdgeAtGivenPoint(aEdgeA, *pNewPoint, aCurrent);
                    bRetval |= splitEdgeAtGivenPoint(aEdgeB, *pNewPoint, aCurrent);

                    if(!bRetval)
                        maNewPoints.freeIfLast(pNewPoint);

                    return bRetval;
                }

                return false;
            }

            void solveHorizontalEdges(TrDeSimpleEdges& rTrDeSimpleEdges)
            {
                if(!rTrDeSimpleEdges.empty() && !maTrDeEdgeEntries.empty())
                {
                    // there were horizontal edges. These can be excluded, but
                    // cuts with other edges need to be solved and added before
                    // ignoring them
                    for(TrDeSimpleEdge & rHorEdge : rTrDeSimpleEdges)
                    {
                        // get horizontal edge as candidate; prepare its range and fixed Y
                        const B1DRange aRange(rHorEdge.getStart().getX(), rHorEdge.getEnd().getX());
                        const double fFixedY(rHorEdge.getStart().getY());

                        // loop over traversing edges
                        TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());

                        do
                        {
                            // get compare edge
                            TrDeEdgeEntries::reference aCompare(*aCurrent++);

                            if(fTools::lessOrEqual(aCompare.getEnd().getY(), fFixedY))
                            {
                                // edge ends above horizontal edge, continue
                                continue;
                            }

                            if(fTools::moreOrEqual(aCompare.getStart().getY(), fFixedY))
                            {
                                // edge starts below horizontal edge, continue
                                continue;
                            }

                            // vertical overlap, get horizontal range
                            const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());

                            if(aRange.overlaps(aCompareRange))
                            {
                                // possible cut, get cut point
                                const B2DPoint aSplit(aCompare.getCutPointForGivenY(fFixedY));

                                if(fTools::more(aSplit.getX(), aRange.getMinimum())
                                    && fTools::less(aSplit.getX(), aRange.getMaximum()))
                                {
                                    // cut is in XRange of horizontal edge, potentially needed cut
                                    B2DPoint* pNewPoint = maNewPoints.allocatePoint(aSplit);

                                    if(!splitEdgeAtGivenPoint(aCompare, *pNewPoint, aCurrent))
                                    {
                                        maNewPoints.freeIfLast(pNewPoint);
                                    }
                                }
                            }
                        }
                        while(aCurrent != maTrDeEdgeEntries.end()
                            && fTools::less(aCurrent->getStart().getY(), fFixedY));
                    }
                }
            }

        public:
            explicit TrapezoidSubdivider(
                const B2DPolyPolygon& rSourcePolyPolygon)
            :   mnInitialEdgeEntryCount(0),
                maTrDeEdgeEntries(),
                maPoints(),
                maNewPoints()
            {
                B2DPolyPolygon aSource(rSourcePolyPolygon);
                TrDeSimpleEdges aTrDeSimpleEdges;
                sal_uInt32 nAllPointCount(0);

                // ensure there are no curves used
                if(aSource.areControlPointsUsed())
                {
                    aSource = aSource.getDefaultAdaptiveSubdivision();
                }

                for(const auto& aPolygonCandidate : aSource)
                {
                    // 1st run: count points
                    const sal_uInt32 nCount(aPolygonCandidate.count());

                    if(nCount > 2)
                    {
                        nAllPointCount += nCount;
                    }
                }

                if(nAllPointCount)
                {
                    // reserve needed points. CAUTION: maPoints size is NOT to be changed anymore
                    // after 2nd loop since pointers to it are used in the edges
                    maPoints.reserve(nAllPointCount);

                    for(const auto& aPolygonCandidate : aSource)
                    {
                        // 2nd run: add points
                        const sal_uInt32 nCount(aPolygonCandidate.count());

                        if(nCount > 2)
                        {
                            for(sal_uInt32 b = 0; b < nCount; b++)
                            {
                                maPoints.push_back(aPolygonCandidate.getB2DPoint(b));
                            }
                        }
                    }

                    // Moved the edge construction to a 3rd run: doing it in the 2nd run is
                    // possible(and i used it), but requires a working vector::reserve()
                    // implementation, else the vector will be reallocated and the pointers
                    // in the edges may be wrong. Security first here.
                    sal_uInt32 nStartIndex(0);

                    for(const auto& aPolygonCandidate : aSource)
                    {
                        const sal_uInt32 nCount(aPolygonCandidate.count());

                        if(nCount > 2)
                        {
                            // get the last point of the current polygon
                            B2DPoint* pPrev(&maPoints[nCount + nStartIndex - 1]);

                            for(sal_uInt32 b = 0; b < nCount; b++)
                            {
                                // get next point
                                B2DPoint* pCurr(&maPoints[nStartIndex++]);

                                if(fTools::equal(pPrev->getY(), pCurr->getY()))
                                {
                                    // horizontal edge, check for single point
                                    if(!fTools::equal(pPrev->getX(), pCurr->getX()))
                                    {
                                        // X-order not needed, just add
                                        aTrDeSimpleEdges.emplace_back(pPrev, pCurr);

                                        const double fMiddle((pPrev->getY() + pCurr->getY()) * 0.5);
                                        pPrev->setY(fMiddle);
                                        pCurr->setY(fMiddle);
                                    }
                                }
                                else
                                {
                                    // vertical edge. Positive Y-direction is guaranteed by the
                                    // TrDeEdgeEntry constructor
                                    maTrDeEdgeEntries.emplace_back(pPrev, pCurr, 0);
                                    mnInitialEdgeEntryCount++;
                                }

                                // prepare next step
                                pPrev = pCurr;
                            }
                        }
                    }
                }

                if(!maTrDeEdgeEntries.empty())
                {
                    // single and initial sort of traversing edges
                    maTrDeEdgeEntries.sort();

                    // solve horizontal edges if there are any detected
                    solveHorizontalEdges(aTrDeSimpleEdges);
                }
            }

            void Subdivide(B2DTrapezoidVector& ro_Result)
            {
                // This is the central subdivider. The strategy is to use the first two entries
                // from the traversing edges as a potential trapezoid and do the needed corrections
                // and adaptations on the way.

                // There always must be two edges with the same YStart value: When adding the polygons
                // in the constructor, there is always a topmost point from which two edges start; when
                // the topmost is an edge, there is a start and end of this edge from which two edges
                // start. All cases have two edges with same StartY (QED).

                // Based on this these edges get corrected when:
                // - one is longer than the other
                // - they intersect
                // - they intersect with other edges
                // - another edge starts inside the thought trapezoid

                // All this cases again produce a valid state so that the first two edges have a common
                // Ystart again. Some cases lead to a restart of the process, some allow consuming the
                // edges and create the intended trapezoid.

                // Be careful when doing changes here: it is essential to keep all possible paths
                // in valid states and to be numerically correct. This is especially needed e.g.
                // by using fTools::equal(..) in the more robust small-value incarnation.
                B1DRange aLeftRange;
                B1DRange aRightRange;

                if(!maTrDeEdgeEntries.empty())
                {
                    // measuring shows that the relation between edges and created trapezoids is
                    // mostly in the 1:1 range, thus reserve as much trapezoids as edges exist. Do
                    // not use maTrDeEdgeEntries.size() since that may be a non-constant time
                    // operation for Lists. Instead, use mnInitialEdgeEntryCount which will contain
                    // the roughly counted adds to the List
                    ro_Result.reserve(ro_Result.size() + mnInitialEdgeEntryCount);
                }

                while(!maTrDeEdgeEntries.empty())
                {
                    // Prepare current operator and get first edge
                    TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());
                    TrDeEdgeEntries::reference aLeft(*aCurrent++);

                    if(aCurrent == maTrDeEdgeEntries.end())
                    {
                        // Should not happen: No 2nd edge; consume the single edge
                        // to not have an endless loop and start next. During development
                        // i constantly had breakpoints here, so i am sure enough to add an
                        // assertion here
                        OSL_FAIL("Trapezoid decomposer in illegal state (!)");
                        maTrDeEdgeEntries.pop_front();
                        continue;
                    }

                    // get second edge
                    TrDeEdgeEntries::reference aRight(*aCurrent++);

                    if(!fTools::equal(aLeft.getStart().getY(), aRight.getStart().getY()))
                    {
                        // Should not happen: We have a 2nd edge, but YStart is on another
                        // line; consume the single edge to not have an endless loop and start
                        // next. During development i constantly had breakpoints here, so i am
                        // sure enough to add an assertion here
                        OSL_FAIL("Trapezoid decomposer in illegal state (!)");
                        maTrDeEdgeEntries.pop_front();
                        continue;
                    }

                    // aLeft and aRight build a thought trapezoid now. They have a common
                    // start line (same Y for start points). Potentially, one of the edges
                    // is longer than the other. It is only needed to look at the shorter
                    // length which build the potential trapezoid. To do so, get the end points
                    // locally and adapt the evtl. longer one. Use only aLeftEnd and aRightEnd
                    // from here on, not the aLeft.getEnd() or aRight.getEnd() accesses.
                    B2DPoint aLeftEnd(aLeft.getEnd());
                    B2DPoint aRightEnd(aRight.getEnd());

                    // check if end points are on the same line. If yes, no adaptation
                    // needs to be prepared. Also remember which one actually is longer.
                    const bool bEndOnSameLine(fTools::equal(aLeftEnd.getY(), aRightEnd.getY()));
                    bool bLeftIsLonger(false);

                    if(!bEndOnSameLine)
                    {
                        // check which edge is longer and correct accordingly
                        bLeftIsLonger = fTools::more(aLeftEnd.getY(), aRightEnd.getY());

                        if(bLeftIsLonger)
                        {
                            aLeftEnd = aLeft.getCutPointForGivenY(aRightEnd.getY());
                        }
                        else
                        {
                            aRightEnd = aRight.getCutPointForGivenY(aLeftEnd.getY());
                        }
                    }

                    // check for same start and end points
                    const bool bSameStartPoint(aLeft.getStart().equal(aRight.getStart()));
                    const bool bSameEndPoint(aLeftEnd.equal(aRightEnd));

                    // check the simple case that the edges form a 'blind' edge (deadend)
                    if(bSameStartPoint && bSameEndPoint)
                    {
                        // correct the longer edge if prepared
                        if(!bEndOnSameLine)
                        {
                            if(bLeftIsLonger)
                            {
                                B2DPoint* pNewPoint = maNewPoints.allocatePoint(aLeftEnd);

                                if(!splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
                                {
                                    maNewPoints.freeIfLast(pNewPoint);
                                }
                            }
                            else
                            {
                                B2DPoint* pNewPoint = maNewPoints.allocatePoint(aRightEnd);

                                if(!splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
                                {
                                    maNewPoints.freeIfLast(pNewPoint);
                                }
                            }
                        }

                        // consume both edges and start next run
                        maTrDeEdgeEntries.pop_front();
                        maTrDeEdgeEntries.pop_front();

                        continue;
                    }

                    // check if the edges self-intersect. This can only happen when
                    // start and end point are different
                    bool bRangesSet(false);

                    if(!(bSameStartPoint || bSameEndPoint))
                    {
                        // get XRanges of edges
                        aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
                        aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
                        bRangesSet = true;

                        // use fast range test first
                        if(aLeftRange.overlaps(aRightRange))
                        {
                            // real cut test and correction. If correction was needed,
                            // start new run
                            if(testAndCorrectEdgeIntersection(aLeft, aRight, aCurrent))
                            {
                                continue;
                            }
                        }
                    }

                    // now we need to check if there are intersections with other edges
                    // or if other edges start inside the candidate trapezoid
                    if(aCurrent != maTrDeEdgeEntries.end()
                        && fTools::less(aCurrent->getStart().getY(), aLeftEnd.getY()))
                    {
                        // get XRanges of edges
                        if(!bRangesSet)
                        {
                            aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
                            aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
                        }

                        // build full XRange for fast check
                        B1DRange aAllRange(aLeftRange);
                        aAllRange.expand(aRightRange);

                        // prepare loop iterator; aCurrent needs to stay unchanged for
                        // possibly sorted insertions of new EdgeNodes. Also prepare stop flag
                        TrDeEdgeEntries::iterator aLoop(aCurrent);
                        bool bDone(false);

                        do
                        {
                            // get compare edge and its XRange
                            TrDeEdgeEntries::reference aCompare(*aLoop++);

                            // avoid edges using the same start point as one of
                            // the edges. These can neither have their start point
                            // in the thought trapezoid nor cut with one of the edges
                            if(aCompare.getStart().equal(aRight.getStart()))
                            {
                                continue;
                            }

                            // get compare XRange
                            const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());

                            // use fast range test first
                            if(aAllRange.overlaps(aCompareRange))
                            {
                                // check for start point inside thought trapezoid
                                if(fTools::more(aCompare.getStart().getY(), aLeft.getStart().getY()))
                                {
                                    // calculate the two possible split points at compare's Y
                                    const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aCompare.getStart().getY()));
                                    const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aCompare.getStart().getY()));

                                    // check for start point of aCompare being inside thought
                                    // trapezoid
                                    if(aCompare.getStart().getX() >= aSplitLeft.getX() &&
                                        aCompare.getStart().getX() <= aSplitRight.getX())
                                    {
                                        // is inside, correct and restart loop
                                        B2DPoint* pNewLeft = maNewPoints.allocatePoint(aSplitLeft);

                                        if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
                                        {
                                            bDone = true;
                                        }
                                        else
                                        {
                                            maNewPoints.freeIfLast(pNewLeft);
                                        }

                                        B2DPoint* pNewRight = maNewPoints.allocatePoint(aSplitRight);

                                        if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
                                        {
                                            bDone = true;
                                        }
                                        else
                                        {
                                            maNewPoints.freeIfLast(pNewRight);
                                        }
                                    }
                                }

                                if(!bDone && aLeftRange.overlaps(aCompareRange))
                                {
                                    // test for concrete cut of compare edge with left edge
                                    bDone = testAndCorrectEdgeIntersection(aLeft, aCompare, aCurrent);
                                }

                                if(!bDone && aRightRange.overlaps(aCompareRange))
                                {
                                    // test for concrete cut of compare edge with Right edge
                                    bDone = testAndCorrectEdgeIntersection(aRight, aCompare, aCurrent);
                                }
                            }
                        }
                        while(!bDone
                            && aLoop != maTrDeEdgeEntries.end()
                            && fTools::less(aLoop->getStart().getY(), aLeftEnd.getY()));

                        if(bDone)
                        {
                            // something needed to be changed; start next loop
                            continue;
                        }
                    }

                    // when we get here, the intended trapezoid can be used. It needs to
                    // be corrected possibly (if prepared); but this is no reason not to
                    // use it in the same loop iteration
                    if(!bEndOnSameLine)
                    {
                        if(bLeftIsLonger)
                        {
                            B2DPoint* pNewPoint = maNewPoints.allocatePoint(aLeftEnd);

                            if(!splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
                            {
                                maNewPoints.freeIfLast(pNewPoint);
                            }
                        }
                        else
                        {
                            B2DPoint* pNewPoint = maNewPoints.allocatePoint(aRightEnd);

                            if(!splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
                            {
                                maNewPoints.freeIfLast(pNewPoint);
                            }
                        }
                    }

                    // the two edges start at the same Y, they use the same DeltaY, they
                    // do not cut themselves and not any other edge in range. Create a
                    // B2DTrapezoid and consume both edges
                    ro_Result.emplace_back(
                            aLeft.getStart().getX(),
                            aRight.getStart().getX(),
                            aLeft.getStart().getY(),
                            aLeftEnd.getX(),
                            aRightEnd.getX(),
                            aLeftEnd.getY());

                    maTrDeEdgeEntries.pop_front();
                    maTrDeEdgeEntries.pop_front();
                }
            }
        };
    } // end of anonymous namespace
} // end of namespace basegfx

namespace basegfx
{
    B2DTrapezoid::B2DTrapezoid(
        const double& rfTopXLeft,
        const double& rfTopXRight,
        const double& rfTopY,
        const double& rfBottomXLeft,
        const double& rfBottomXRight,
        const double& rfBottomY)
    :   mfTopXLeft(rfTopXLeft),
        mfTopXRight(rfTopXRight),
        mfTopY(rfTopY),
        mfBottomXLeft(rfBottomXLeft),
        mfBottomXRight(rfBottomXRight),
        mfBottomY(rfBottomY)
    {
        // guarantee mfTopXRight >= mfTopXLeft
        if(mfTopXLeft > mfTopXRight)
        {
            std::swap(mfTopXLeft, mfTopXRight);
        }

        // guarantee mfBottomXRight >= mfBottomXLeft
        if(mfBottomXLeft > mfBottomXRight)
        {
            std::swap(mfBottomXLeft, mfBottomXRight);
        }

        // guarantee mfBottomY >= mfTopY
        if(mfTopY > mfBottomY)
        {
            std::swap(mfTopY, mfBottomY);
            std::swap(mfTopXLeft, mfBottomXLeft);
            std::swap(mfTopXRight, mfBottomXRight);
        }
    }

    B2DPolygon B2DTrapezoid::getB2DPolygon() const
    {
        B2DPolygon aRetval;

        aRetval.append(B2DPoint(getTopXLeft(), getTopY()));
        aRetval.append(B2DPoint(getTopXRight(), getTopY()));
        aRetval.append(B2DPoint(getBottomXRight(), getBottomY()));
        aRetval.append(B2DPoint(getBottomXLeft(), getBottomY()));
        aRetval.setClosed(true);

        return aRetval;
    }
} // end of namespace basegfx

namespace basegfx
{
    namespace utils
    {
        // convert Source utils::PolyPolygon to trapezoids
        void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon)
        {
            trapezoidhelper::TrapezoidSubdivider aTrapezoidSubdivider(rSourcePolyPolygon);

            aTrapezoidSubdivider.Subdivide(ro_Result);
        }

        void createLineTrapezoidFromEdge(
            B2DTrapezoidVector& ro_Result,
            const B2DPoint& rPointA,
            const B2DPoint& rPointB,
            double fLineWidth)
        {
            if(fTools::lessOrEqual(fLineWidth, 0.0))
            {
                // no line width
                return;
            }

            if(rPointA.equal(rPointB))
            {
                // points are equal, no edge
                return;
            }

            const double fHalfLineWidth(0.5 * fLineWidth);

            if(fTools::equal(rPointA.getX(), rPointB.getX()))
            {
                // vertical line
                const double fLeftX(rPointA.getX() - fHalfLineWidth);
                const double fRightX(rPointA.getX() + fHalfLineWidth);

                ro_Result.emplace_back(
                        fLeftX,
                        fRightX,
                        std::min(rPointA.getY(), rPointB.getY()),
                        fLeftX,
                        fRightX,
                        std::max(rPointA.getY(), rPointB.getY()));
            }
            else if(fTools::equal(rPointA.getY(), rPointB.getY()))
            {
                // horizontal line
                const double fLeftX(std::min(rPointA.getX(), rPointB.getX()));
                const double fRightX(std::max(rPointA.getX(), rPointB.getX()));

                ro_Result.emplace_back(
                        fLeftX,
                        fRightX,
                        rPointA.getY() - fHalfLineWidth,
                        fLeftX,
                        fRightX,
                        rPointA.getY() + fHalfLineWidth);
            }
            else
            {
                // diagonal line
                // create perpendicular vector
                const B2DVector aDelta(rPointB - rPointA);
                B2DVector aPerpendicular(-aDelta.getY(), aDelta.getX());
                aPerpendicular.setLength(fHalfLineWidth);

                // create StartLow, StartHigh, EndLow and EndHigh
                const B2DPoint aStartLow(rPointA + aPerpendicular);
                const B2DPoint aStartHigh(rPointA - aPerpendicular);
                const B2DPoint aEndHigh(rPointB - aPerpendicular);
                const B2DPoint aEndLow(rPointB + aPerpendicular);

                // create EdgeEntries
                basegfx::trapezoidhelper::TrDeEdgeEntries aTrDeEdgeEntries;

                aTrDeEdgeEntries.emplace_back(&aStartLow, &aStartHigh, 0);
                aTrDeEdgeEntries.emplace_back(&aStartHigh, &aEndHigh, 0);
                aTrDeEdgeEntries.emplace_back(&aEndHigh, &aEndLow, 0);
                aTrDeEdgeEntries.emplace_back(&aEndLow, &aStartLow, 0);
                aTrDeEdgeEntries.sort();

                // here we know we have exactly four edges, and they do not cut, touch or
                // intersect. This makes processing much easier. Get the first two as start
                // edges for the thought trapezoid
                basegfx::trapezoidhelper::TrDeEdgeEntries::iterator aCurrent(aTrDeEdgeEntries.begin());
                basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft(*aCurrent++);
                basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight(*aCurrent++);
                const bool bEndOnSameLine(fTools::equal(aLeft.getEnd().getY(), aRight.getEnd().getY()));

                if(bEndOnSameLine)
                {
                    // create two triangle trapezoids
                    ro_Result.emplace_back(
                            aLeft.getStart().getX(),
                            aRight.getStart().getX(),
                            aLeft.getStart().getY(),
                            aLeft.getEnd().getX(),
                            aRight.getEnd().getX(),
                            aLeft.getEnd().getY());

                    basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
                    basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);

                    ro_Result.emplace_back(
                            aLeft2.getStart().getX(),
                            aRight2.getStart().getX(),
                            aLeft2.getStart().getY(),
                            aLeft2.getEnd().getX(),
                            aRight2.getEnd().getX(),
                            aLeft2.getEnd().getY());
                }
                else
                {
                    // create three trapezoids. Check which edge is longer and
                    // correct accordingly
                    const bool bLeftIsLonger(fTools::more(aLeft.getEnd().getY(), aRight.getEnd().getY()));

                    if(bLeftIsLonger)
                    {
                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
                        const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aRight.getEnd().getY()));
                        const B2DPoint aSplitRight(aRight2.getCutPointForGivenY(aLeft.getEnd().getY()));

                        ro_Result.emplace_back(
                                aLeft.getStart().getX(),
                                aRight.getStart().getX(),
                                aLeft.getStart().getY(),
                                aSplitLeft.getX(),
                                aRight.getEnd().getX(),
                                aRight.getEnd().getY());

                        ro_Result.emplace_back(
                                aSplitLeft.getX(),
                                aRight.getEnd().getX(),
                                aRight.getEnd().getY(),
                                aLeft2.getStart().getX(),
                                aSplitRight.getX(),
                                aLeft2.getStart().getY());

                        ro_Result.emplace_back(
                                aLeft2.getStart().getX(),
                                aSplitRight.getX(),
                                aLeft2.getStart().getY(),
                                aLeft2.getEnd().getX(),
                                aRight2.getEnd().getX(),
                                aLeft2.getEnd().getY());
                    }
                    else
                    {
                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
                        const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aLeft.getEnd().getY()));
                        const B2DPoint aSplitLeft(aLeft2.getCutPointForGivenY(aRight.getEnd().getY()));

                        ro_Result.emplace_back(
                                aLeft.getStart().getX(),
                                aRight.getStart().getX(),
                                aLeft.getStart().getY(),
                                aLeft.getEnd().getX(),
                                aSplitRight.getX(),
                                aLeft.getEnd().getY());

                        ro_Result.emplace_back(
                                aLeft.getEnd().getX(),
                                aSplitRight.getX(),
                                aLeft.getEnd().getY(),
                                aSplitLeft.getX(),
                                aRight.getEnd().getX(),
                                aRight2.getStart().getY());

                        ro_Result.emplace_back(
                                aSplitLeft.getX(),
                                aRight.getEnd().getX(),
                                aRight2.getStart().getY(),
                                aLeft2.getEnd().getX(),
                                aRight2.getEnd().getX(),
                                aLeft2.getEnd().getY());
                    }
                }
            }
        }

        void createLineTrapezoidFromB2DPolygon(
            B2DTrapezoidVector& ro_Result,
            const B2DPolygon& rPolygon,
            double fLineWidth)
        {
            if(fTools::lessOrEqual(fLineWidth, 0.0))
            {
                return;
            }

            // ensure there are no curves used
            B2DPolygon aSource(rPolygon);

            if(aSource.areControlPointsUsed())
            {
                const double fPrecisionFactor = 0.25;
                aSource = adaptiveSubdivideByDistance( aSource, fLineWidth * fPrecisionFactor );
            }

            const sal_uInt32 nPointCount(aSource.count());

            if(!nPointCount)
            {
                return;
            }

            const sal_uInt32 nEdgeCount(aSource.isClosed() ? nPointCount : nPointCount - 1);
            B2DPoint aCurrent(aSource.getB2DPoint(0));

            ro_Result.reserve(ro_Result.size() + (3 * nEdgeCount));

            for(sal_uInt32 a(0); a < nEdgeCount; a++)
            {
                const sal_uInt32 nNextIndex((a + 1) % nPointCount);
                const B2DPoint aNext(aSource.getB2DPoint(nNextIndex));

                createLineTrapezoidFromEdge(ro_Result, aCurrent, aNext, fLineWidth);
                aCurrent = aNext;
            }
        }


    } // end of namespace utils
} // end of namespace basegfx

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
ewer'>private/pranavk/modernize_gtktiledviewer</option>
<option value='private/quwex/gsoc-box2d-experimental'>private/quwex/gsoc-box2d-experimental</option>
<option value='private/quwex/notespane-search'>private/quwex/notespane-search</option>
<option value='private/quwex/notespaneflat'>private/quwex/notespaneflat</option>
<option value='private/quwex/notespanesquashed'>private/quwex/notespanesquashed</option>
<option value='private/quwex/tdf59323'>private/quwex/tdf59323</option>
<option value='private/s.mehrbrodt/colorpicker-backport'>private/s.mehrbrodt/colorpicker-backport</option>
<option value='private/sweetshark/swdepend'>private/sweetshark/swdepend</option>
<option value='private/tbsdy/clipping'>private/tbsdy/clipping</option>
<option value='private/tbsdy/drawserverfontlayout'>private/tbsdy/drawserverfontlayout</option>
<option value='private/tbsdy/emf'>private/tbsdy/emf</option>
<option value='private/tbsdy/osl_getAllEnvironment'>private/tbsdy/osl_getAllEnvironment</option>
<option value='private/tbsdy/outdev'>private/tbsdy/outdev</option>
<option value='private/tbsdy/printinfomgr'>private/tbsdy/printinfomgr</option>
<option value='private/tbsdy/workbench'>private/tbsdy/workbench</option>
<option value='private/thb/libo-6-1+backports'>private/thb/libo-6-1+backports</option>
<option value='private/thb/libreoffice-5-2+backports'>private/thb/libreoffice-5-2+backports</option>
<option value='private/thb/sw_redlinehide-6-1'>private/thb/sw_redlinehide-6-1</option>
<option value='private/thb/tdf149754'>private/thb/tdf149754</option>
<option value='private/thb/wasm-upstreaming'>private/thb/wasm-upstreaming</option>
<option value='private/timar/cp-6.2-centos7'>private/timar/cp-6.2-centos7</option>
<option value='private/timar/fontconfigcrash'>private/timar/fontconfigcrash</option>
<option value='private/timar/pythonupgrademsp'>private/timar/pythonupgrademsp</option>
<option value='private/tml/Use-the-iOS-French-and-Italian-dictionaries-for-othe'>private/tml/Use-the-iOS-French-and-Italian-dictionaries-for-othe</option>
<option value='private/tml/android-use-bionic-linker-copy'>private/tml/android-use-bionic-linker-copy</option>
<option value='private/tml/android-use-faulty.lib'>private/tml/android-use-faulty.lib</option>
<option value='private/tml/cp-6-4-28-1'>private/tml/cp-6-4-28-1</option>
<option value='private/tml/fixwintext'>private/tml/fixwintext</option>
<option value='private/tml/iculess'>private/tml/iculess</option>
<option value='private/tml/lov-6.1.5.2'>private/tml/lov-6.1.5.2</option>
<option value='private/tml/lov-6.2.1'>private/tml/lov-6.2.1</option>
<option value='private/tml/lov-7.0.3.3'>private/tml/lov-7.0.3.3</option>
<option value='private/tml/lov-7.0.4'>private/tml/lov-7.0.4</option>
<option value='private/tml/lov-7.1.2'>private/tml/lov-7.1.2</option>
<option value='private/tml/opencl-default-1'>private/tml/opencl-default-1</option>
<option value='private/tvajngerl/staging'>private/tvajngerl/staging</option>
<option value='ref/for/distro/collabora/cp-6.2'>ref/for/distro/collabora/cp-6.2</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>LibreOffice 核心代码仓库</td><td class='sub right'>文档基金会</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/lo/core/'>summary</a><a href='/cgit/lo/core/refs/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>refs</a><a href='/cgit/lo/core/log/'>log</a><a href='/cgit/lo/core/tree/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>tree</a><a class='active' href='/cgit/lo/core/commit/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>commit</a><a href='/cgit/lo/core/diff/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/lo/core/log/'>
<input type='hidden' name='id' value='40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Stephan Bergmann &lt;sbergman@redhat.com&gt;</td><td class='right'>2020-10-27 23:18:23 +0100</td></tr>
<tr><th>committer</th><td>Stephan Bergmann &lt;sbergman@redhat.com&gt;</td><td class='right'>2020-10-28 08:03:52 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/commit/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af</a> (<a href='/cgit/lo/core/patch/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/tree/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>26f9d288b5434f5e23980053dab9d5a57749b60e</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/commit/?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>c4967928475f2be20ac2d79e3fa84ac435a7e560</a> (<a href='/cgit/lo/core/diff/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af&amp;id2=c4967928475f2be20ac2d79e3fa84ac435a7e560'>diff</a>)</td></tr></table>
<div class='commit-subject'>Extend loplugin:elidestringvar to OString
<span class='decoration'></span></div><div class='commit-msg'>(In VisitVarDecl, filtering out AbstractConditionalOperator avoids an unhelpful

&gt; ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:63:32: error: replace single use of literal 'rtl::OString' variable with a literal [loplugin:elidestringvar]
&gt;             aXmlWriter.content(sPdfConformance);
&gt;                                ^~~~~~~~~~~~~~~
&gt; ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:52:21: note: literal 'rtl::OString' variable defined here [loplugin:elidestringvar]
&gt;             OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B";
&gt;             ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

)

Change-Id: I7d0410f04827d79b4b526752917c37d33cad2671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104911
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann &lt;sbergman@redhat.com&gt;
</div><div class='diffstat-header'><a href='/cgit/lo/core/diff/?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/chart2/qa/extras/chart2geometry.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>chart2/qa/extras/chart2geometry.cxx</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 23.1%;'/><td class='none' style='width: 59.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/comphelper/qa/string/test_string.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>comphelper/qa/string/test_string.cxx</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/compilerplugins/clang/elidestringvar.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>compilerplugins/clang/elidestringvar.cxx</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 33.3%;'/><td class='rem' style='width: 26.9%;'/><td class='none' style='width: 39.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/compilerplugins/clang/test/elidestringvar.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>compilerplugins/clang/test/elidestringvar.cxx</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/cui/source/dialogs/AdditionsDialog.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>cui/source/dialogs/AdditionsDialog.cxx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/desktop/qa/desktop_lib/test_desktop_lib.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>desktop/qa/desktop_lib/test_desktop_lib.cxx</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 21.8%;'/><td class='none' style='width: 67.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/OStringBuffer/rtl_OStringBuffer.cxx</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 26.9%;'/><td class='rem' style='width: 48.7%;'/><td class='none' style='width: 24.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sal/qa/rtl/digest/rtl_digest.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/digest/rtl_digest.cxx</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 16.7%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sal/qa/rtl/oustring/rtl_OUString2.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/oustring/rtl_OUString2.cxx</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 33.3%;'/><td class='rem' style='width: 66.7%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sal/qa/rtl/uri/rtl_Uri.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/uri/rtl_Uri.cxx</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sc/qa/unit/copy_paste_test.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sc/qa/unit/copy_paste_test.cxx</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sc/qa/unit/screenshots/screenshots.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sc/qa/unit/screenshots/screenshots.cxx</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sc/qa/unit/subsequent_export-test.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sc/qa/unit/subsequent_export-test.cxx</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sd/qa/unit/dialogs-test.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sd/qa/unit/dialogs-test.cxx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sd/qa/unit/export-tests-ooxml1.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sd/qa/unit/export-tests-ooxml1.cxx</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sd/qa/unit/export-tests-ooxml2.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sd/qa/unit/export-tests-ooxml2.cxx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sd/qa/unit/tiledrendering/tiledrendering.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sd/qa/unit/tiledrendering/tiledrendering.cxx</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sd/source/ui/remotecontrol/Communicator.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sd/source/ui/remotecontrol/Communicator.cxx</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sfx2/source/bastyp/frmhtmlw.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sfx2/source/bastyp/frmhtmlw.cxx</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sw/qa/extras/ooxmlexport/ooxmlexport14.cxx</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sw/qa/extras/uiwriter/uiwriter.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sw/qa/extras/uiwriter/uiwriter.cxx</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/sw/source/filter/html/wrthtml.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sw/source/filter/html/wrthtml.cxx</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='78%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>23 files changed, 145 insertions, 218 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx<br/>index be6d842d7780..08e909162766 100644<br/>--- a/<a href='/cgit/lo/core/tree/chart2/qa/extras/chart2geometry.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>chart2/qa/extras/chart2geometry.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/chart2/qa/extras/chart2geometry.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>chart2/qa/extras/chart2geometry.cxx</a></div><div class='hunk'>@@ -296,9 +296,9 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()</div><div class='ctx'>     // Find transparency gradient name</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc);</div><div class='del'>-    const OString sChartPath(</div><div class='add'>+    const OUString sOUChartStyleName = getXPathContent(</div><div class='add'>+        pXmlDoc,</div><div class='ctx'>         "//office:document-content/office:body/office:chart/chart:chart/@chart:style-name");</div><div class='del'>-    const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);</div><div class='ctx'>     const OString sStylePath(</div><div class='ctx'>         "//office:document-content/office:automatic-styles/style:style[@style:name='"</div><div class='ctx'>         + OU2O(sOUChartStyleName) + "']");</div><div class='hunk'>@@ -310,9 +310,8 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()</div><div class='ctx'>     // Verify the content of the opacity definition</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc2);</div><div class='del'>-    const OString sOpacityPath("//office:document-styles/office:styles/draw:opacity");</div><div class='ctx'>     const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");</div><div class='del'>-    const OString sStart(sOpacityPath + "[" + sAttribute);</div><div class='add'>+    const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + "]", 1);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']");</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:start='30%']");</div><div class='hunk'>@@ -348,9 +347,9 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()</div><div class='ctx'>     // Find transparency gradient name</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc);</div><div class='del'>-    const OString sChartPath("//office:document-content/office:body/office:chart/chart:chart/"</div><div class='del'>-                             "chart:plot-area/chart:wall/@chart:style-name");</div><div class='del'>-    const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);</div><div class='add'>+    const OUString sOUChartStyleName</div><div class='add'>+        = getXPathContent(pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/"</div><div class='add'>+                                   "chart:plot-area/chart:wall/@chart:style-name");</div><div class='ctx'>     const OString sStylePath(</div><div class='ctx'>         "//office:document-content/office:automatic-styles/style:style[@style:name='"</div><div class='ctx'>         + OU2O(sOUChartStyleName) + "']");</div><div class='hunk'>@@ -362,9 +361,8 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()</div><div class='ctx'>     // Verify content of the opacity definition</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc2);</div><div class='del'>-    const OString sOpacityPath("//office:document-styles/office:styles/draw:opacity");</div><div class='ctx'>     const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");</div><div class='del'>-    const OString sStart(sOpacityPath + "[" + sAttribute);</div><div class='add'>+    const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + "]", 1);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']");</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:start='0%']");</div><div class='hunk'>@@ -400,9 +398,9 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()</div><div class='ctx'>     // Find transparency gradient name</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc);</div><div class='del'>-    const OString sChartPath("//office:document-content/office:body/office:chart/chart:chart/"</div><div class='del'>-                             "chart:legend/@chart:style-name");</div><div class='del'>-    const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);</div><div class='add'>+    const OUString sOUChartStyleName</div><div class='add'>+        = getXPathContent(pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/"</div><div class='add'>+                                   "chart:legend/@chart:style-name");</div><div class='ctx'>     const OString sStylePath(</div><div class='ctx'>         "//office:document-content/office:automatic-styles/style:style[@style:name='"</div><div class='ctx'>         + OU2O(sOUChartStyleName) + "']");</div><div class='hunk'>@@ -414,9 +412,8 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()</div><div class='ctx'>     // Verify content of the opacity definition</div><div class='ctx'>     xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc2);</div><div class='del'>-    const OString sOpacityPath("//office:document-styles/office:styles/draw:opacity");</div><div class='ctx'>     const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");</div><div class='del'>-    const OString sStart(sOpacityPath + "[" + sAttribute);</div><div class='add'>+    const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + "]", 1);</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:style='axial']");</div><div class='ctx'>     assertXPath(pXmlDoc2, sStart + " and @draw:start='0%']");</div><div class='hunk'>@@ -517,10 +514,9 @@ void Chart2GeometryTest::testTdf135366LabelExport()</div><div class='ctx'>     CPPUNIT_ASSERT(pXmlDoc);</div><div class='ctx'> </div><div class='ctx'>     // Find label style</div><div class='del'>-    const OString sLabelPath(</div><div class='del'>-        "//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"</div><div class='del'>-        "/chart:series/chart:data-point[1]/chart:data-label/@chart:style-name");</div><div class='del'>-    const OUString sOULabelStyleName = getXPathContent(pXmlDoc, sLabelPath);</div><div class='add'>+    const OUString sOULabelStyleName = getXPathContent(</div><div class='add'>+        pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"</div><div class='add'>+                 "/chart:series/chart:data-point[1]/chart:data-label/@chart:style-name");</div><div class='ctx'> </div><div class='ctx'>     // Verify content of graphic properties of label style</div><div class='ctx'>     const OString sStylePath(</div><div class='head'>diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx<br/>index aa427bea8a65..faedac30260f 100644<br/>--- a/<a href='/cgit/lo/core/tree/comphelper/qa/string/test_string.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>comphelper/qa/string/test_string.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/comphelper/qa/string/test_string.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>comphelper/qa/string/test_string.cxx</a></div><div class='hunk'>@@ -75,14 +75,11 @@ void TestString::testDecimalStringToNumber()</div><div class='ctx'> </div><div class='ctx'> void TestString::testIsdigitAsciiString()</div><div class='ctx'> {</div><div class='del'>-    OString s1("1234");</div><div class='del'>-    CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s1));</div><div class='add'>+    CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(OString("1234")));</div><div class='ctx'> </div><div class='del'>-    OString s2("1A34");</div><div class='del'>-    CPPUNIT_ASSERT_EQUAL(false, comphelper::string::isdigitAsciiString(s2));</div><div class='add'>+    CPPUNIT_ASSERT_EQUAL(false, comphelper::string::isdigitAsciiString(OString("1A34")));</div><div class='ctx'> </div><div class='del'>-    OString s3;</div><div class='del'>-    CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s3));</div><div class='add'>+    CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(OString()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> using namespace ::com::sun::star;</div><div class='hunk'>@@ -369,8 +366,7 @@ void TestString::testTokenCount()</div><div class='ctx'> </div><div class='ctx'> void TestString::testReverseString()</div><div class='ctx'> {</div><div class='del'>-    OString aIn("ABC");</div><div class='del'>-    OString aOut = ::comphelper::string::reverseString(aIn);</div><div class='add'>+    OString aOut = ::comphelper::string::reverseString(OString("ABC"));</div><div class='ctx'> </div><div class='ctx'>     CPPUNIT_ASSERT_EQUAL(OString("CBA"), aOut);</div><div class='ctx'> }</div><div class='head'>diff --git a/compilerplugins/clang/elidestringvar.cxx b/compilerplugins/clang/elidestringvar.cxx<br/>index 27b0e5ab77bd..6fd57c44ff4f 100644<br/>--- a/<a href='/cgit/lo/core/tree/compilerplugins/clang/elidestringvar.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>compilerplugins/clang/elidestringvar.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/compilerplugins/clang/elidestringvar.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>compilerplugins/clang/elidestringvar.cxx</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include "compat.hxx"</div><div class='ctx'> #include "plugin.hxx"</div><div class='ctx'> </div><div class='del'>-// Find cases where a variable of a string type (at least for now, only OUString) is initialized</div><div class='add'>+// Find cases where a variable of a OString/OUString type is initialized</div><div class='ctx'> // with a literal value (incl. as an empty string) and used only once.  Conservatively this only</div><div class='ctx'> // covers local non-static variables that are not defined outside of the loop (if any) in which they</div><div class='ctx'> // are used, as other cases may deliberately use the variable for performance (or even correctness,</div><div class='hunk'>@@ -37,6 +37,13 @@</div><div class='ctx'> </div><div class='ctx'> namespace</div><div class='ctx'> {</div><div class='add'>+bool isStringType(QualType type)</div><div class='add'>+{</div><div class='add'>+    loplugin::TypeCheck const c(type);</div><div class='add'>+    return c.Class("OString").Namespace("rtl").GlobalNamespace()</div><div class='add'>+           || c.Class("OUString").Namespace("rtl").GlobalNamespace();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> class ElideStringVar : public loplugin::FilteringPlugin&lt;ElideStringVar&gt;</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='hunk'>@@ -67,12 +74,12 @@ public:</div><div class='ctx'>                 continue;</div><div class='ctx'>             }</div><div class='ctx'>             report(DiagnosticsEngine::Warning,</div><div class='del'>-                   "replace single use of literal OUString variable with a literal",</div><div class='add'>+                   "replace single use of literal %0 variable with a literal",</div><div class='ctx'>                    (*var.second.singleUse)-&gt;getExprLoc())</div><div class='del'>-                &lt;&lt; (*var.second.singleUse)-&gt;getSourceRange();</div><div class='del'>-            report(DiagnosticsEngine::Note, "literal OUString variable defined here",</div><div class='add'>+                &lt;&lt; var.first-&gt;getType() &lt;&lt; (*var.second.singleUse)-&gt;getSourceRange();</div><div class='add'>+            report(DiagnosticsEngine::Note, "literal %0 variable defined here",</div><div class='ctx'>                    var.first-&gt;getLocation())</div><div class='del'>-                &lt;&lt; var.first-&gt;getSourceRange();</div><div class='add'>+                &lt;&lt; var.first-&gt;getType() &lt;&lt; var.first-&gt;getSourceRange();</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -94,10 +101,7 @@ public:</div><div class='ctx'>         {</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='del'>-        if (!loplugin::TypeCheck(decl-&gt;getType())</div><div class='del'>-                 .Class("OUString")</div><div class='del'>-                 .Namespace("rtl")</div><div class='del'>-                 .GlobalNamespace())</div><div class='add'>+        if (!isStringType(decl-&gt;getType()))</div><div class='ctx'>         {</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='hunk'>@@ -110,10 +114,7 @@ public:</div><div class='ctx'>         {</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='del'>-        if (!loplugin::TypeCheck(e1-&gt;getType())</div><div class='del'>-                 .Class("OUString")</div><div class='del'>-                 .Namespace("rtl")</div><div class='del'>-                 .GlobalNamespace())</div><div class='add'>+        if (!isStringType(e1-&gt;getType()))</div><div class='ctx'>         {</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='hunk'>@@ -124,10 +125,9 @@ public:</div><div class='ctx'>             case 1:</div><div class='ctx'>             {</div><div class='ctx'>                 auto const e2 = e1-&gt;getArg(0);</div><div class='del'>-                if (loplugin::TypeCheck(e2-&gt;getType())</div><div class='del'>-                        .Class("OUStringLiteral")</div><div class='del'>-                        .Namespace("rtl")</div><div class='del'>-                        .GlobalNamespace())</div><div class='add'>+                loplugin::TypeCheck const c(e2-&gt;getType());</div><div class='add'>+                if (c.Class("OStringLiteral").Namespace("rtl").GlobalNamespace()</div><div class='add'>+                    || c.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())</div><div class='ctx'>                 {</div><div class='ctx'>                     break;</div><div class='ctx'>                 }</div><div class='hunk'>@@ -139,14 +139,19 @@ public:</div><div class='ctx'>             }</div><div class='ctx'>             case 2:</div><div class='ctx'>             {</div><div class='del'>-                auto const t = e1-&gt;getArg(0)-&gt;getType();</div><div class='add'>+                auto const e2 = e1-&gt;getArg(0);</div><div class='add'>+                auto const t = e2-&gt;getType();</div><div class='ctx'>                 if (!(t.isConstQualified() &amp;&amp; t-&gt;isConstantArrayType()))</div><div class='ctx'>                 {</div><div class='ctx'>                     return true;</div><div class='ctx'>                 }</div><div class='del'>-                auto const e2 = e1-&gt;getArg(1);</div><div class='del'>-                if (!(isa&lt;CXXDefaultArgExpr&gt;(e2)</div><div class='del'>-                      &amp;&amp; loplugin::TypeCheck(e2-&gt;getType())</div><div class='add'>+                if (isa&lt;AbstractConditionalOperator&gt;(e2-&gt;IgnoreParenImpCasts()))</div><div class='add'>+                {</div><div class='add'>+                    return true;</div><div class='add'>+                }</div><div class='add'>+                auto const e3 = e1-&gt;getArg(1);</div><div class='add'>+                if (!(isa&lt;CXXDefaultArgExpr&gt;(e3)</div><div class='add'>+                      &amp;&amp; loplugin::TypeCheck(e3-&gt;getType())</div><div class='ctx'>                              .Struct("Dummy")</div><div class='ctx'>                              .Namespace("libreoffice_internal")</div><div class='ctx'>                              .Namespace("rtl")</div><div class='head'>diff --git a/compilerplugins/clang/test/elidestringvar.cxx b/compilerplugins/clang/test/elidestringvar.cxx<br/>index 1835c183bb39..3e8e6592bbae 100644<br/>--- a/<a href='/cgit/lo/core/tree/compilerplugins/clang/test/elidestringvar.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>compilerplugins/clang/test/elidestringvar.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/compilerplugins/clang/test/elidestringvar.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>compilerplugins/clang/test/elidestringvar.cxx</a></div><div class='hunk'>@@ -14,25 +14,25 @@</div><div class='ctx'> OUString f(sal_Unicode c, int n)</div><div class='ctx'> {</div><div class='ctx'>     OUString s1(c);</div><div class='del'>-    // expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}</div><div class='add'>+    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}</div><div class='ctx'>     OUString s2('a');</div><div class='del'>-    // expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}</div><div class='add'>+    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}</div><div class='ctx'>     OUString s3(u'a');</div><div class='ctx'>     static constexpr OUStringLiteral s4lit(u"a");</div><div class='del'>-    // expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}</div><div class='add'>+    // expected-note@+1 {{literal 'rtl::OUString' variable defined here [loplugin:elidestringvar]}}</div><div class='ctx'>     OUString s4 = s4lit;</div><div class='ctx'>     switch (n)</div><div class='ctx'>     {</div><div class='ctx'>         case 1:</div><div class='ctx'>             return s1;</div><div class='ctx'>         case 2:</div><div class='del'>-            // expected-error@+1 {{replace single use of literal OUString variable with a literal [loplugin:elidestringvar]}}</div><div class='add'>+            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}</div><div class='ctx'>             return s2;</div><div class='ctx'>         case 3:</div><div class='del'>-            // expected-error@+1 {{replace single use of literal OUString variable with a literal [loplugin:elidestringvar]}}</div><div class='add'>+            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}</div><div class='ctx'>             return s3;</div><div class='ctx'>         default:</div><div class='del'>-            // expected-error@+1 {{replace single use of literal OUString variable with a literal [loplugin:elidestringvar]}}</div><div class='add'>+            // expected-error@+1 {{replace single use of literal 'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}</div><div class='ctx'>             return s4;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='head'>diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx<br/>index cf9a605d5970..dd994839681a 100644<br/>--- a/<a href='/cgit/lo/core/tree/cui/source/dialogs/AdditionsDialog.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>cui/source/dialogs/AdditionsDialog.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/cui/source/dialogs/AdditionsDialog.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>cui/source/dialogs/AdditionsDialog.cxx</a></div><div class='hunk'>@@ -511,9 +511,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString&amp; sAdditio</div><div class='ctx'>         m_sTag = "allextensions"; // Means empty parameter</div><div class='ctx'>     }</div><div class='ctx'>     //FIXME: Temporary URL</div><div class='del'>-    OString sPrefixURL = "https://yusufketen.com/api/";</div><div class='del'>-    OString sSuffixURL = ".json";</div><div class='del'>-    OString rURL = sPrefixURL + m_sTag + sSuffixURL;</div><div class='add'>+    OString rURL = "https://yusufketen.com/api/" + m_sTag + ".json";</div><div class='ctx'>     m_sURL = rURL;</div><div class='ctx'> </div><div class='ctx'>     m_xExtensionManager</div><div class='head'>diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx<br/>index 2d338d20014a..b2015dbafcf2 100644<br/>--- a/<a href='/cgit/lo/core/tree/desktop/qa/desktop_lib/test_desktop_lib.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>desktop/qa/desktop_lib/test_desktop_lib.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/desktop/qa/desktop_lib/test_desktop_lib.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>desktop/qa/desktop_lib/test_desktop_lib.cxx</a></div><div class='hunk'>@@ -1783,8 +1783,7 @@ void DesktopLOKTest::testInput()</div><div class='ctx'>     Scheduler::ProcessEventsToIdle();</div><div class='ctx'>     char* pText = pDocument-&gt;pClass-&gt;getTextSelection(pDocument, "text/plain;charset=utf-8", nullptr);</div><div class='ctx'>     CPPUNIT_ASSERT(pText != nullptr);</div><div class='del'>-    OString aLovely("far beyond lovely ");</div><div class='del'>-    CPPUNIT_ASSERT_EQUAL(aLovely, OString(pText));</div><div class='add'>+    CPPUNIT_ASSERT_EQUAL(OString("far beyond lovely "), OString(pText));</div><div class='ctx'>     free(pText);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx<br/>index 04603bc03f77..1a3e27ee3afd 100644<br/>--- a/<a href='/cgit/lo/core/tree/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx</a></div><div class='hunk'>@@ -1207,8 +1207,6 @@ void VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(</div><div class='ctx'>     // support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text primitives (but is not limited to)</div><div class='ctx'>     // thus do the MetafileAction embedding stuff but just handle recursively.</div><div class='ctx'>     const OString aCommentStringCommon("FIELD_SEQ_BEGIN");</div><div class='del'>-    const OString aCommentStringPage("FIELD_SEQ_BEGIN;PageField");</div><div class='del'>-    const OString aCommentStringEnd("FIELD_SEQ_END");</div><div class='ctx'>     OUString aURL;</div><div class='ctx'> </div><div class='ctx'>     switch (rFieldPrimitive.getType())</div><div class='hunk'>@@ -1220,7 +1218,7 @@ void VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(</div><div class='ctx'>         }</div><div class='ctx'>         case drawinglayer::primitive2d::FIELD_TYPE_PAGE:</div><div class='ctx'>         {</div><div class='del'>-            mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentStringPage));</div><div class='add'>+            mpMetaFile-&gt;AddAction(new MetaCommentAction("FIELD_SEQ_BEGIN;PageField"));</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>         case drawinglayer::primitive2d::FIELD_TYPE_URL:</div><div class='hunk'>@@ -1244,7 +1242,7 @@ void VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(</div><div class='ctx'>     process(rContent);</div><div class='ctx'> </div><div class='ctx'>     // for the end comment the type is not relevant yet, they are all the same. Just add.</div><div class='del'>-    mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentStringEnd));</div><div class='add'>+    mpMetaFile-&gt;AddAction(new MetaCommentAction("FIELD_SEQ_END"));</div><div class='ctx'> </div><div class='ctx'>     if (!(mpPDFExtOutDevData</div><div class='ctx'>           &amp;&amp; drawinglayer::primitive2d::FIELD_TYPE_URL == rFieldPrimitive.getType()))</div><div class='hunk'>@@ -1266,20 +1264,14 @@ void VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(</div><div class='ctx'> void VclMetafileProcessor2D::processTextHierarchyLinePrimitive2D(</div><div class='ctx'>     const primitive2d::TextHierarchyLinePrimitive2D&amp; rLinePrimitive)</div><div class='ctx'> {</div><div class='del'>-    const OString aCommentString("XTEXT_EOL");</div><div class='del'>-</div><div class='ctx'>     // process recursively and add MetaFile comment</div><div class='ctx'>     process(rLinePrimitive);</div><div class='del'>-    mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentString));</div><div class='add'>+    mpMetaFile-&gt;AddAction(new MetaCommentAction("XTEXT_EOL"));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void VclMetafileProcessor2D::processTextHierarchyBulletPrimitive2D(</div><div class='ctx'>     const primitive2d::TextHierarchyBulletPrimitive2D&amp; rBulletPrimitive)</div><div class='ctx'> {</div><div class='del'>-    // in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The</div><div class='del'>-    // "XTEXT_EOC" is used, use here, too.</div><div class='del'>-    const OString aCommentString("XTEXT_EOC");</div><div class='del'>-</div><div class='ctx'>     // this is a part of list item, start LILabel ( = bullet)</div><div class='ctx'>     if (mbInListItem)</div><div class='ctx'>     {</div><div class='hunk'>@@ -1289,7 +1281,9 @@ void VclMetafileProcessor2D::processTextHierarchyBulletPrimitive2D(</div><div class='ctx'> </div><div class='ctx'>     // process recursively and add MetaFile comment</div><div class='ctx'>     process(rBulletPrimitive);</div><div class='del'>-    mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentString));</div><div class='add'>+    // in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The</div><div class='add'>+    // "XTEXT_EOC" is used, use here, too.</div><div class='add'>+    mpMetaFile-&gt;AddAction(new MetaCommentAction("XTEXT_EOC"));</div><div class='ctx'> </div><div class='ctx'>     if (mbInListItem)</div><div class='ctx'>     {</div><div class='hunk'>@@ -1400,11 +1394,8 @@ void VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D(</div><div class='ctx'> void VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(</div><div class='ctx'>     const primitive2d::TextHierarchyBlockPrimitive2D&amp; rBlockPrimitive)</div><div class='ctx'> {</div><div class='del'>-    const OString aCommentStringA("XTEXT_PAINTSHAPE_BEGIN");</div><div class='del'>-    const OString aCommentStringB("XTEXT_PAINTSHAPE_END");</div><div class='del'>-</div><div class='ctx'>     // add MetaFile comment, process recursively and add MetaFile comment</div><div class='del'>-    mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentStringA));</div><div class='add'>+    mpMetaFile-&gt;AddAction(new MetaCommentAction("XTEXT_PAINTSHAPE_BEGIN"));</div><div class='ctx'>     process(rBlockPrimitive);</div><div class='ctx'> </div><div class='ctx'>     if (mnCurrentOutlineLevel &gt;= 0)</div><div class='hunk'>@@ -1416,7 +1407,7 @@ void VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    mpMetaFile-&gt;AddAction(new MetaCommentAction(aCommentStringB));</div><div class='add'>+    mpMetaFile-&gt;AddAction(new MetaCommentAction("XTEXT_PAINTSHAPE_END"));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void VclMetafileProcessor2D::processTextSimplePortionPrimitive2D(</div><div class='head'>diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx<br/>index c8a7ccce2a89..cfc73ca42dfb 100644<br/>--- a/<a href='/cgit/lo/core/tree/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>sal/qa/OStringBuffer/rtl_OStringBuffer.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/OStringBuffer/rtl_OStringBuffer.cxx</a></div><div class='hunk'>@@ -211,9 +211,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         void makeStringAndClear_001()</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf1;</div><div class='del'>-            OString         aStr1;</div><div class='ctx'> </div><div class='del'>-            bool lastRes = (aStrBuf1.makeStringAndClear() ==  aStr1 );</div><div class='add'>+            bool lastRes = aStrBuf1.makeStringAndClear().isEmpty();</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -236,9 +235,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         void makeStringAndClear_002()</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf2(26);</div><div class='del'>-            OString         aStr2;</div><div class='ctx'> </div><div class='del'>-            bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 );</div><div class='add'>+            bool lastRes = aStrBuf2.makeStringAndClear().isEmpty();</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -975,7 +973,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[0] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 32;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -984,7 +981,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength equal to 0",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1035,7 +1032,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[1] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 17;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1044,7 +1040,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength less than the length of OUStringBuffer(1)",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1055,7 +1051,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[2] );</div><div class='ctx'>             sal_Int32              expVal1 = 20;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 20;</div><div class='ctx'>             sal_Int32              input   = 20;</div><div class='ctx'> </div><div class='hunk'>@@ -1064,7 +1059,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the capacity of OStringBuffer()",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1075,7 +1070,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[2] );</div><div class='ctx'>             sal_Int32              expVal1 = 3;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 16;</div><div class='ctx'>             sal_Int32              input   = 3;</div><div class='ctx'> </div><div class='hunk'>@@ -1084,7 +1078,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the length of OStringBuffer()",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1095,7 +1089,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[2] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 16;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1104,7 +1097,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the length of OStringBuffer()",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1115,7 +1108,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[3] );</div><div class='ctx'>             sal_Int32              expVal1 = 20;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 20;</div><div class='ctx'>             sal_Int32              input   = 20;</div><div class='ctx'> </div><div class='hunk'>@@ -1124,7 +1116,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the capacity of OStringBuffer("")",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1135,7 +1127,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[3] );</div><div class='ctx'>             sal_Int32              expVal1 = 5;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 16;</div><div class='ctx'>             sal_Int32              input   = 5;</div><div class='ctx'> </div><div class='hunk'>@@ -1144,7 +1135,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the length of OStringBuffer("")",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1155,7 +1146,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[3] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 16;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1164,7 +1154,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength less than the length of OStringBuffer("")",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1175,7 +1165,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[4] );</div><div class='ctx'>             sal_Int32              expVal1 = 20;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 20;</div><div class='ctx'>             sal_Int32              input   = 20;</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1173,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the length of OStringBuffer(\0)",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1195,7 +1184,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[4] );</div><div class='ctx'>             sal_Int32              expVal1 = 5;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 17;</div><div class='ctx'>             sal_Int32              input   = 5;</div><div class='ctx'> </div><div class='hunk'>@@ -1204,7 +1192,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength more than the length of OStringBuffer(\0)",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1215,7 +1203,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[4] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 17;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1224,7 +1211,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength less than the length of OStringBuffer(\0)",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1315,7 +1302,6 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[5] );</div><div class='ctx'>             sal_Int32              expVal1 = 0;</div><div class='del'>-            OString         expVal2;</div><div class='ctx'>             sal_Int32              expVal3 = 48;</div><div class='ctx'>             sal_Int32              input   = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1324,7 +1310,7 @@ namespace rtl_OStringBuffer</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='ctx'>                 "newLength equal to 0",</div><div class='del'>-                aStrBuf.getStr() == expVal2 &amp;&amp;</div><div class='add'>+                aStrBuf.getStr()[0] == '\0' &amp;&amp;</div><div class='ctx'>                     aStrBuf.getLength() == expVal1 &amp;&amp;</div><div class='ctx'>                     aStrBuf.getCapacity() == expVal3</div><div class='ctx'>             );</div><div class='hunk'>@@ -1443,6 +1429,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>     {</div><div class='ctx'>         OString arrOUS[5];</div><div class='ctx'> </div><div class='add'>+        OString empty; // silence loplugin</div><div class='add'>+</div><div class='ctx'>     public:</div><div class='ctx'>         void setUp() override</div><div class='ctx'>         {</div><div class='hunk'>@@ -1508,9 +1496,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OString                expVal( kTestStr7 );</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[0] );</div><div class='del'>-            OString                input2;</div><div class='ctx'> </div><div class='del'>-            aStrBuf.append( input2 );</div><div class='add'>+            aStrBuf.append( empty );</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -1576,9 +1563,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OString                expVal;</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[1] );</div><div class='del'>-            OString                input2;</div><div class='ctx'> </div><div class='del'>-            aStrBuf.append( input2 );</div><div class='add'>+            aStrBuf.append( empty );</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -1644,9 +1630,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OString                expVal;</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[2] );</div><div class='del'>-            OString                input2;</div><div class='ctx'> </div><div class='del'>-            aStrBuf.append( input2 );</div><div class='add'>+            aStrBuf.append( empty );</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -1712,9 +1697,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OString                expVal;</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[3] );</div><div class='del'>-            OString                input2;</div><div class='ctx'> </div><div class='del'>-            aStrBuf.append( input2 );</div><div class='add'>+            aStrBuf.append( empty );</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='hunk'>@@ -1780,9 +1764,8 @@ namespace rtl_OStringBuffer</div><div class='ctx'>         {</div><div class='ctx'>             OString                expVal( kTestStr28 );</div><div class='ctx'>             OStringBuffer   aStrBuf( arrOUS[4] );</div><div class='del'>-            OString                input2;</div><div class='ctx'> </div><div class='del'>-            aStrBuf.append( input2 );</div><div class='add'>+            aStrBuf.append( empty );</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE</div><div class='ctx'>             (</div><div class='head'>diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx<br/>index d890f924ddb1..3d27ba52c9c7 100644<br/>--- a/<a href='/cgit/lo/core/tree/sal/qa/rtl/digest/rtl_digest.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>sal/qa/rtl/digest/rtl_digest.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/sal/qa/rtl/digest/rtl_digest.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/digest/rtl_digest.cxx</a></div><div class='hunk'>@@ -194,22 +194,16 @@ public:</div><div class='ctx'>     void testEqual()</div><div class='ctx'>     {</div><div class='ctx'>         {</div><div class='del'>-            OString aMsg1 = sSampleString;</div><div class='del'>-            OString aMsg2 = sSampleString;</div><div class='del'>-</div><div class='del'>-            OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);</div><div class='del'>-            OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);</div><div class='add'>+            OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);</div><div class='add'>+            OString aSum2 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 &amp;&amp; aSum2.getLength() == 32 );</div><div class='ctx'>             CPPUNIT_ASSERT_EQUAL_MESSAGE("source is the same, dest must be also the same", aSum1, aSum2);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         {</div><div class='del'>-            OString aMsg1 = sSampleString;</div><div class='del'>-            OString aMsg2 = sSampleString_only_one_diff;</div><div class='del'>-</div><div class='del'>-            OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);</div><div class='del'>-            OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);</div><div class='add'>+            OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);</div><div class='add'>+            OString aSum2 = getDigest(sSampleString_only_one_diff, rtl_Digest_AlgorithmMD5);</div><div class='ctx'> </div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 &amp;&amp; aSum2.getLength() == 32 );</div><div class='ctx'>             CPPUNIT_ASSERT_MESSAGE("differ only in one char", aSum1 != aSum2);</div><div class='hunk'>@@ -380,13 +374,11 @@ public:</div><div class='ctx'> </div><div class='ctx'>             std::unique_ptr&lt;sal_uInt8[]&gt; pResult(new sal_uInt8[RTL_DIGEST_LENGTH_SHA1]);</div><div class='ctx'> </div><div class='del'>-            OString sExpected = "06f460d693aecdd3b5cbe8365408eccfc570f32a";</div><div class='del'>-</div><div class='ctx'>             rtl_digest_SHA1(aData, sizeof(aData), pResult.get(), RTL_DIGEST_LENGTH_SHA1);</div><div class='ctx'> </div><div class='ctx'>             OString sKey = createHex(pResult.get(), RTL_DIGEST_LENGTH_SHA1);</div><div class='ctx'> </div><div class='del'>-            CPPUNIT_ASSERT_EQUAL(sExpected, sKey);</div><div class='add'>+            CPPUNIT_ASSERT_EQUAL(OString("06f460d693aecdd3b5cbe8365408eccfc570f32a"), sKey);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // tdf#114939, verify that rtl_digest_SHA1 computes broken results for certain input (which</div><div class='head'>diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx<br/>index cbfdd800f1c3..516378dc14a7 100644<br/>--- a/<a href='/cgit/lo/core/tree/sal/qa/rtl/oustring/rtl_OUString2.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>sal/qa/rtl/oustring/rtl_OUString2.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/sal/qa/rtl/oustring/rtl_OUString2.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/oustring/rtl_OUString2.cxx</a></div><div class='hunk'>@@ -296,65 +296,53 @@ public:</div><div class='ctx'> </div><div class='ctx'>         void toDouble_test_3()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("3");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_3_5()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3.5");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("3.5");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_3_0625()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3.0625");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("3.0625");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_pi()</div><div class='ctx'>             {</div><div class='ctx'>                 // value from http://www.angio.net/pi/digits/50.txt</div><div class='del'>-                OString sValue("3.141592653589793238462643383279502884197169399375");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("3.141592653589793238462643383279502884197169399375");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>         void toDouble_test_1()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("1");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_10()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("10");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("10");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_100()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("100");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("100");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_1000()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1000");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("1000");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_10000()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("10000");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("10000");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_1e99()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e99");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("1e99");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_1e_n99()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e-99");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("1e-99");</div><div class='ctx'>             }</div><div class='ctx'>         void toDouble_test_1e308()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e308");</div><div class='del'>-                toDouble_test(sValue);</div><div class='add'>+                toDouble_test("1e308");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>         // Change the following lines only, if you add, remove or rename</div><div class='hunk'>@@ -424,75 +412,61 @@ public:</div><div class='ctx'> </div><div class='ctx'>         void toFloat_test_3()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("3");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_3_5()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3.5");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("3.5");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_3_0625()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3.0625");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("3.0625");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_3_0625_e()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("3.0625e-4");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("3.0625e-4");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_pi()</div><div class='ctx'>             {</div><div class='ctx'>                 // value from http://www.angio.net/pi/digits/50.txt</div><div class='del'>-                OString sValue("3.141592653589793238462643383279502884197169399375");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("3.141592653589793238462643383279502884197169399375");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>         void toFloat_test_1()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("1");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_10()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("10");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("10");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_100()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("100");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("100");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_1000()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1000");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("1000");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_10000()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("10000");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("10000");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_mix()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("456789321455.123456789012");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("456789321455.123456789012");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_1e99()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e99");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("1e99");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_1e_n99()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e-9");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("1e-9");</div><div class='ctx'>             }</div><div class='ctx'>         void toFloat_test_1e308()</div><div class='ctx'>             {</div><div class='del'>-                OString sValue("1e308");</div><div class='del'>-                toFloat_test(sValue);</div><div class='add'>+                toFloat_test("1e308");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>         // Change the following lines only, if you add, remove or rename</div><div class='head'>diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx<br/>index 81ec983450f5..1084926c65bb 100644<br/>--- a/<a href='/cgit/lo/core/tree/sal/qa/rtl/uri/rtl_Uri.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>sal/qa/rtl/uri/rtl_Uri.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/sal/qa/rtl/uri/rtl_Uri.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sal/qa/rtl/uri/rtl_Uri.cxx</a></div><div class='hunk'>@@ -47,8 +47,7 @@ namespace Stringtest</div><div class='ctx'>         void test_FromUTF8_001()</div><div class='ctx'>             {</div><div class='ctx'>                 // string --&gt; ustring</div><div class='del'>-                OString sStrUTF8("h%C3%A4llo");</div><div class='del'>-                OUString suStrUTF8 = OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);</div><div class='add'>+                OUString suStrUTF8 = OStringToOUString("h%C3%A4llo", RTL_TEXTENCODING_ASCII_US);</div><div class='ctx'> </div><div class='ctx'>                 // UTF8 --&gt; real ustring</div><div class='ctx'>                 OUString suStr_UriDecodeToIuri      = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);</div><div class='head'>diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx<br/>index 54202137d0de..527afccaafe6 100644<br/>--- a/<a href='/cgit/lo/core/tree/sc/qa/unit/copy_paste_test.cxx?id=c4967928475f2be20ac2d79e3fa84ac435a7e560'>sc/qa/unit/copy_paste_test.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/sc/qa/unit/copy_paste_test.cxx?id=40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af'>sc/qa/unit/copy_paste_test.cxx</a></div><div class='hunk'>@@ -407,9 +407,8 @@ void ScCopyPasteTest::testTdf107394()</div><div class='ctx'>     ScImportExport aObj(rDoc, ScAddress(0,0,0));</div><div class='ctx'>     aObj.SetImportBroadcast(true);</div><div class='ctx'> </div><div class='del'>-    OString aHTML("&lt;pre&gt;First\nVery long sentence.&lt;/pre&gt;");</div><div class='ctx'>     SvMemoryStream aStream;</div><div class='del'>-    aStream.WriteOString(aHTML);</div><div class='add'>+    aStream.WriteOString("&lt;pre&gt;First\nVery long sentence.&lt;/pre&gt;");</div><div class='ctx'>     aStream.Seek(0);</div><div class='ctx'>     CPPUNIT_ASSERT(aObj.ImportStream(aStream, OUString(), SotClipboardFormatId::HTML));</div><div class='ctx'> </div><div class='head'>diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx