[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/utlui/navipi.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da525193df9dae10d322446baf3b876d364cacb6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 29 12:29:58 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 29 17:57:32 2019 +0100

    Resolves: tdf#110429 width of page number wider than traditional width
    
    since...
    
    commit c80ac2ba4a6486e6161e17f9118ba1563b7fc00e
    Date:   Fri Nov 11 18:16:52 2016 +0100
    
        Avoid -fsanitize=signed-integer-overflow
    
    Change-Id: I2ec85e854ee1547d55b43b8540c357297d3b6cce
    Reviewed-on: https://gerrit.libreoffice.org/67082
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 3bac5f0bcd99..d27bf4e1ddfa 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -649,7 +649,7 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
     tools::Rectangle aSecondRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("header"));
     Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(),
                        aFirstRect.Bottom() - aFirstRect.Top() );
-    Size aOptimalSize(m_xEdit->get_preferred_size());
+    Size aOptimalSize(m_xEdit->CalcMinimumSizeForText(m_xEdit->CreateFieldText(9999)));
     aItemWinSize.setWidth( std::max(aItemWinSize.Width(), aOptimalSize.Width()) );
     m_xEdit->SetSizePixel(aItemWinSize);
     m_aContentToolBox->InsertSeparator(4);