[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/source

[Steve Fanning (via logerrit)]

 helpcontent2                              |    2 +-
 sw/source/uibase/docvw/AnnotationWin2.cxx |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8c2f1af09eff833a6c9e2a090c9d7e9c113b1803
Author:     Steve Fanning <stevemfanning at yahoo.co.uk>
AuthorDate: Sun Jan 31 17:33:30 2021 +0100
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Sun Jan 31 17:33:30 2021 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to c0f70b871b7a558f5f7de355e6e18636cd90ac93
      - The syntax given in the Help file for Calc’s LOGNORM.INV function is incorrect (see Bug 137649). Specifically, the second (“Mean”) and third (“StDev”) arguments are optional rather than required in Calc’s current implementation. If omitted the Mean argument defaults to 0.0 and the StDev argument defaults to 1.0.
    
        Note: The corresponding Excel function’s three arguments are all required (none are optional) and so one possible outcome of Bug 137649 is for Calc to be updated to match this behaviour for interoperability. However, we do not know if or when this might happen and so, in the meantime, I propose to update the Help to more accurately reflect Calc’s current behaviour.
    
        The change affects only one file, 04060183.xhp.
    
        Change-Id: I69934a8123d5de41007bc4dfca1cbc478ed963a6
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110150
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index 237f36ae2e8a..c0f70b871b7a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 237f36ae2e8aa995f12c1227114838d8dcd42f8e
+Subproject commit c0f70b871b7a558f5f7de355e6e18636cd90ac93
commit eaa632c5c80d9cb0eec2f0f7ba92f5bac72ba50d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 29 16:20:36 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jan 31 17:33:21 2021 +0100

    drop call to SetQuickHelpText() with empty string
    
    because the QuickHelp is never set to anything non-empty.
    
    Before commit
    
    commit c230e962ca2c876187a028fa14426210b5746a0f
    Date:   Tue Jan 12 10:43:45 2010 +0100
    
        sw33a11y01: #i88070# refactoring of sidebar window code used for visualization of comments/annotations
    
    SetQuickHelpText was called with a non-empty string in one branch
    so SetQuickHelpText cleared it again, but now its always empty
    
    Change-Id: If4635e899b27ce16fd0aa25254f33415142f9718
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110165
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 46376d0b2506..d093ed61508b 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -893,7 +893,6 @@ void SwAnnotationWin::DoResize()
     mpMetadataAuthor->Show();
     if(IsResolved()) { mpMetadataResolved->Show(); }
     mpMetadataDate->Show();
-    mpSidebarTextControl->SetQuickHelpText(OUString());
     unsigned int numFields = GetNumFields();
     if (aTextHeight > aHeight)
     {   // we need vertical scrollbars and have to reduce the width