summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp/gridctrl.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 11:23:17 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 11:23:17 +0000
commitf698d3f793a75ece3c2bacbecbab74b78fd1e0fd (patch)
treedb497aa2bcc8c0930e85d847c3d96ad206b41710 /svx/source/fmcomp/gridctrl.cxx
parent264a66629cf9b5914e15b2a8463a30d1f3d73bad (diff)
INTEGRATION: CWS dba30d (1.83.72); FILE MERGED
2008/06/02 08:42:39 fs 1.83.72.2: during #i84924#: also propagate the font to the navbar 2008/06/02 08:29:25 fs 1.83.72.1: during #i84924#: Init/ImplInitSettings now take a Window&, not a Window*
Diffstat (limited to 'svx/source/fmcomp/gridctrl.cxx')
-rw-r--r--svx/source/fmcomp/gridctrl.cxx26
1 files changed, 21 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e9a30f0ea4..92715cfed2 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gridctrl.cxx,v $
- * $Revision: 1.83 $
+ * $Revision: 1.84 $
*
* This file is part of OpenOffice.org.
*
@@ -1009,9 +1009,6 @@ void DbGridControl::StateChanged( StateChangedType nType )
case STATE_CHANGE_ZOOM:
{
ImplInitSettings( sal_True, sal_False, sal_False );
- // forward the zoom factor to the navigation bar
- if (m_bNavigationBar)
- m_aBar.SetZoom(GetZoom());
// and give it a chance to rearrange
Point aPoint = GetControlArea().TopLeft();
@@ -1066,7 +1063,26 @@ void DbGridControl::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_
{
DbGridColumn* pCol = m_aColumns.GetObject(i);
if (pCol)
- pCol->ImplInitSettings(&GetDataWindow(), bFont, bForeground, bBackground);
+ pCol->ImplInitSettings( GetDataWindow(), bFont, bForeground, bBackground );
+ }
+
+ if ( bFont )
+ {
+ if ( m_bNavigationBar )
+ {
+ m_aBar.SetZoom( GetZoom() );
+
+ Font aFont = m_aBar.GetSettings().GetStyleSettings().GetFieldFont();
+ if ( IsControlFont() )
+ {
+ m_aBar.SetControlFont( GetControlFont() );
+ aFont.Merge( GetControlFont() );
+ }
+ else
+ m_aBar.SetControlFont();
+
+ m_aBar.SetZoomedPointFont( aFont );
+ }
}
if (bBackground)