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

[Libreoffice Gerrit user]

 svx/source/fmcomp/gridctrl.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 106e7acab6e31e1e0cee40716335f2b758d6186b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 6 14:27:25 2019 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Feb 8 15:47:56 2019 +0100

    tdf#115941 use same font statusbar does for form navigator bar
    
    now that we have it the same height as a statusbar
    
    Change-Id: I0d5ee3f8dc57e94be5d45581bc4382e3448353c3
    Reviewed-on: https://gerrit.libreoffice.org/67462
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 9a923e1ce53753bb8538054fd1658a67ca0ff354)
    Reviewed-on: https://gerrit.libreoffice.org/67487
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 997250cf8ea9..ea37f509f0af 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -434,14 +434,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
     sal_uInt16      nX = 1;
     sal_uInt16      nY = 0;
 
-    // Is the font of this edit larger than the field?
-    if (m_aAbsolute->GetTextHeight() > nH)
     {
-        vcl::Font aApplFont (m_aAbsolute->GetFont());
-        const Size pointAbsoluteSize(m_aAbsolute->PixelToLogic( Size( 0, nH - 2 ), MapMode(MapUnit::MapPoint) ));
-        aApplFont.SetFontSize( pointAbsoluteSize );
+        vcl::Font aApplFont(GetSettings().GetStyleSettings().GetToolFont());
         m_aAbsolute->SetControlFont( aApplFont );
-
         aApplFont.SetTransparent( true );
         m_aRecordText->SetControlFont( aApplFont );
         m_aRecordOf->SetControlFont( aApplFont );
@@ -817,7 +812,7 @@ void DbGridControl::NavigationBar::StateChanged(StateChangedType nType)
             Fraction aZoom = GetZoom();
 
             // not all of these controls need to know the new zoom, but to be sure ...
-            vcl::Font aFont(GetSettings().GetStyleSettings().GetFieldFont());
+            vcl::Font aFont(GetSettings().GetStyleSettings().GetToolFont());
             if (IsControlFont())
                 aFont.Merge(GetControlFont());
 
@@ -1115,7 +1110,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat )
     {
         if ( m_bNavigationBar )
         {
-            vcl::Font aFont = m_aBar->GetSettings().GetStyleSettings().GetFieldFont();
+            vcl::Font aFont = m_aBar->GetSettings().GetStyleSettings().GetToolFont();
             if ( IsControlFont() )
                 m_aBar->SetControlFont( GetControlFont() );
             else