[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - basctl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Feb 26 17:24:39 UTC 2020


 basctl/source/basicide/linenumberwindow.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c3143b5db45ca84267a4bc9c897fb4077e33d128
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 25 15:55:24 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 26 18:24:08 2020 +0100

    tdf#130925 use the maximum document line number for the width calculation
    
    not the max line number in the range currently getting rendered
    
    Change-Id: I447e4152ef6a1ec327a95a8260d1616940e5d6c4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89467
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit ca79c018f1e8bd0e1f42e3cef4b4f5893ef2e47f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89521

diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 79c124117c97..4fa6ebf8f5aa 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -73,7 +73,8 @@ void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const tools::R
 
     // reserve enough for 3 digit minimum, with a bit to spare for comfort
     m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
-    sal_uInt32 i = (nEndLine + 1) / 1000;
+    auto nMaxLineNumber = std::max(nEndLine, txtEngine->GetParagraphCount() + 1);
+    sal_uInt32 i = (nMaxLineNumber + 1) / 1000;
     while (i)
     {
         i /= 10;


More information about the Libreoffice-commits mailing list