commit f582670131dc211e472960ecff1826f7b133b083
author Mike Kaganski <mike.kaganski@collabora.com> Thu Jan 14 17:30:17 2021 +0100
committer Mike Kaganski <mike.kaganski@collabora.com> Fri Jan 15 07:26:48 2021 +0100
tree 014a0e74ecaace01a2d9e7efbee119781ebb0a22
parent 9598018e67dfc10c35022cbec4844363b7dd98ab

Use value comparison here

This was always comparing pointers, ever since commit
cb07ed8c74d71de9ef512c7a3568c7ee85585cef. They could only
happen to be not different if they are both nullptr. But
the uses of the function seem to expect value comparison
(see SdrObjEditView::ImpChainingEventHdl,
SdrObjEditView::SdrEndTextEdit).

Change-Id: I2265dc8f0f7e4441940f8e19ec0b016b5f78e812
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109284
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

include/svx/svdundo.hxx

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d1aac69b..e56b6d5 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -407,7 +407,7 @@ public:
    SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText );
    virtual ~SdrUndoObjSetText() override;

    bool IsDifferent() const { return pOldText!=pNewText; }
    bool IsDifferent() const;
    void AfterSetText();

    virtual void Undo() override;

svx/source/svdraw/svdundo.cxx

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 0cbb447..f27f9e0 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -991,6 +991,13 @@ SdrUndoObjSetText::~SdrUndoObjSetText()
    pNewText.reset();
}

bool SdrUndoObjSetText::IsDifferent() const
{
    if (!pOldText || !pNewText)
        return !pOldText && !pNewText;
    return !(*pOldText == *pNewText);
}

void SdrUndoObjSetText::AfterSetText()
{
    if (!bNewTextAvailable)