commit 9a923e1ce53753bb8538054fd1658a67ca0ff354
author Caolán McNamara <caolanm@redhat.com> Wed Feb 06 14:27:25 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Feb 06 22:17:16 2019 +0100
tree 8032c300684de11ddfe621679a04b816fdcbb6df
parent a7521570c95cf4ecd3eb4324581ad09ff30ff70a

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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/source/fmcomp/gridctrl.cxx

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 29deb5f..e97bfb8 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -436,14 +436,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 );
@@ -819,7 +814,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());

@@ -1117,7 +1112,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