tdf#89720 sw: do not create text range overlay for reply annotations

Regression from commit 0761f816 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that in case a comment had a reply, then both comments produced its
range overlay, and this repeated semi-transparent overlay resulted in
dark color.

Go back to the old behavior of just painting the overlay for the
non-reply comment; for real, partly overlapping comments showing the
exact boundaries of the overlapping overlays still makes sense.

(cherry picked from commit 780dd8c1)

Conflicts:
	sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: Ic2673a1a41146ff547262ba681b34a63f41aa8ff
Reviewed-on: https://gerrit.libreoffice.org/17669Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/qa/extras/uiwriter/uiwriter.cxx

@@ -33,6 +33,9 @@
 #include <editeng/acorrcfg.hxx>
 #include <unotools/streamwrap.hxx>
 #include <test/mtfxmldump.hxx>
+#include <postithelper.hxx>
+#include <PostItMgr.hxx>
+#include <SidebarWin.hxx>
 
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
@@ -98,6 +101,7 @@ public:
     void testTdf90883TableBoxGetCoordinates();
     void testDde();
     void testTdf89954();
+    void testTdf89720();
 
     CPPUNIT_TEST_SUITE(SwUiWriterTest);
     CPPUNIT_TEST(testReplaceForward);
@@ -137,6 +141,7 @@ public:
     CPPUNIT_TEST(testTdf90883TableBoxGetCoordinates);
     CPPUNIT_TEST(testDde);
     CPPUNIT_TEST(testTdf89954);
+    CPPUNIT_TEST(testTdf89720);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -1044,6 +1049,22 @@ void SwUiWriterTest::testTdf89954()
     CPPUNIT_ASSERT_EQUAL(aExpected, aNodeIndex.GetNode().GetTextNode()->GetText());
 }
 
+void SwUiWriterTest::testTdf89720()
+{
+#ifndef MACOSX
+    SwDoc* pDoc = createDoc("tdf89720.odt");
+    SwView* pView = pDoc->GetDocShell()->GetView();
+    SwPostItMgr* pPostItMgr = pView->GetPostItMgr();
+    for (SwSidebarItem* pItem : *pPostItMgr)
+    {
+        if (pItem->pPostIt->IsFollow())
+            // This was non-0: reply comments had a text range overlay,
+            // resulting in unexpected dark color.
+            CPPUNIT_ASSERT(!pItem->pPostIt->TextRange());
+    }
+#endif
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 

sw/source/uibase/docvw/SidebarWin.cxx

@@ -703,8 +703,9 @@ void SwSidebarWin::SetPosAndSize()
                 mpTextRangeOverlay->HideSolidBorder();
             }
         }
-        else
+        else if (!IsFollow())
         {
+            // This window is not a reply, then draw its range overlay.
             mpTextRangeOverlay =
                 sw::overlay::OverlayRanges::CreateOverlayRange(
                     DocView(),