[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx    |   19 +++++++++++++++++++
 sw/source/core/fields/postithelper.cxx |   17 ++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 555bf69bbe4688db160c8d409153ff85bb6e2434
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jul 16 12:17:01 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jul 17 13:06:30 2019 +0200

    sw comments on frames: avoid overlay that covers only an as-char image
    
    As-char images had their comment arrow on the bottom left corner,
    as-char ones had it at the bottom right one.
    
    Standardize on bottom left and avoid the content overlay in case only
    the frame itself is selected.
    
    See commit cf5a3cb687a502e7f71cefb5f7001a73925bee56 (Adapt new test to
    actual values observed on macOS, 2019-06-24) on why the test is not for
    macOS, till somebody can check if this is working there properly.
    
    (cherry picked from commit 3fb7ffeb85d87551ffcddd63b7c90c6b0e573e5f)
    
    Conflicts:
            sw/qa/extras/uiwriter/uiwriter2.cxx
    
    Change-Id: I83516ea558182ecc7362f8383894ed07a16d3ad2
    Reviewed-on: https://gerrit.libreoffice.org/75765
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 7bff975e94c2..1365b752e8a4 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -32,6 +32,9 @@
 #include <cmdid.h>
 #include <fmtanchr.hxx>
 #include <txtfrm.hxx>
+#include <AnnotationWin.hxx>
+#include <PostItMgr.hxx>
+#include <postithelper.hxx>
 
 namespace
 {
@@ -537,6 +540,22 @@ void SwUiWriterTest2::testImageComment()
     pView->GetViewFrame()->GetDispatcher()->ExecuteList(FN_INSERT_STRING, SfxCallMode::SYNCHRON,
                                                         { &aItem });
     pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, SfxCallMode::SYNCHRON);
+
+#if !defined(MACOSX)
+    // Make sure that the anchor points to the bottom left corner of the image.
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected less or equal than: 1418
+    // - Actual: 2442
+    // The anchor pointed to the bottom right corner, so as-char and at-char was inconsistent.
+    Scheduler::ProcessEventsToIdle();
+    SwPostItMgr* pPostItMgr = pView->GetPostItMgr();
+    for (const auto& pItem : *pPostItMgr)
+    {
+        const SwRect& rAnchor = pItem->pPostIt->GetAnchorRect();
+        CPPUNIT_ASSERT_LESSEQUAL(static_cast<long>(1418), rAnchor.Left());
+    }
+#endif
+
     // Now delete the image.
     pView->GetViewFrame()->GetDispatcher()->Execute(SID_DELETE, SfxCallMode::SYNCHRON);
     // Without the accompanying fix in place, this test would have failed with 'Expected: 0; Actual:
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 82e8531d4ad7..21041a6de01e 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -58,7 +58,22 @@ bool AnnotationMarkCoversCommentAnchor(const sw::mark::IMark* pAnnotationMark,
 
     if (rMarkStart != rAnchorPos)
     {
-        return false;
+        // This can be the as-char case: the comment placeholder character is exactly between the
+        // annotation mark start and end.
+        SwPosition aPosition(rMarkStart);
+        ++aPosition.nContent;
+        if (aPosition != rAnchorPos)
+        {
+            return false;
+        }
+
+        ++aPosition.nContent;
+        if (aPosition != rMarkEnd)
+        {
+            return false;
+        }
+
+        return true;
     }
 
     if (rMarkStart.nNode != rMarkEnd.nNode)