summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/editsrc.cxx
diff options
context:
space:
mode:
authorNiklas Nebel <nn@openoffice.org>2000-11-29 19:53:10 +0000
committerNiklas Nebel <nn@openoffice.org>2000-11-29 19:53:10 +0000
commit31c2281d4463ce3557938409df6ac929cd3c907a (patch)
tree86e427b7726755bef9819d81aca6d129670ca532 /sc/source/ui/unoobj/editsrc.cxx
parent1c49f7bc7754fc2f57f19c104bd630589d138f6f (diff)
#80688# FillEditItemSet instead of GetFont for headers/footers (3 fonts)
Diffstat (limited to 'sc/source/ui/unoobj/editsrc.cxx')
-rw-r--r--sc/source/ui/unoobj/editsrc.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 88b98e517750..faadcd749454 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: editsrc.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2000-09-21 17:47:44 $
+ * last change: $Author: nn $ $Date: 2000-11-29 20:53:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,10 +129,14 @@ SvxTextForwarder* ScHeaderFooterEditSource::GetTextForwarder()
// default font must be set, independently of document
// -> use global pool from module
- Font aDefFont;
- ((const ScPatternAttr&)SC_MOD()->GetPool().GetDefaultItem(ATTR_PATTERN)).GetFont(aDefFont);
SfxItemSet aDefaults( pHdrEngine->GetEmptyItemSet() );
- EditEngine::SetFontInfoInItemSet( aDefaults, aDefFont );
+ const ScPatternAttr& rPattern = (const ScPatternAttr&)SC_MOD()->GetPool().GetDefaultItem(ATTR_PATTERN);
+ rPattern.FillEditItemSet( &aDefaults );
+ // FillEditItemSet adjusts font height to 1/100th mm,
+ // but for header/footer twips is needed, as in the PatternAttr:
+ aDefaults.Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT );
+ aDefaults.Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK );
+ aDefaults.Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL );
pHdrEngine->SetDefaults( aDefaults );
ScHeaderFieldData aData;