summaryrefslogtreecommitdiff
path: root/sc/source/core
diff options
context:
space:
mode:
authorSven Jacobi <sj@openoffice.org>2001-11-27 09:12:49 +0000
committerSven Jacobi <sj@openoffice.org>2001-11-27 09:12:49 +0000
commitb2d88de83ad94a552016a4303954260765cb5278 (patch)
tree71e8da5e8130db1b97df60d0fca3079e2d300179 /sc/source/core
parent2909409846ad87de0f5d97d01b80b057c3e69455 (diff)
#95129# set FontHeight pool default without changing static SdrEngineDefault
Diffstat (limited to 'sc/source/core')
-rw-r--r--sc/source/core/data/documen9.cxx5
-rw-r--r--sc/source/core/data/drwlayer.cxx18
2 files changed, 18 insertions, 5 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 690862265b8e..c9ca8089192f 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: documen9.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: nn $ $Date: 2001-10-19 15:57:42 $
+ * last change: $Author: sj $ $Date: 2001-11-27 10:12:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -254,7 +254,6 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
if (!pDrawLayer)
{
- SdrEngineDefaults::SetFontHeight(423); // 12pt
String aName;
if ( pShell && !pShell->IsLoading() ) // #88438# don't call GetTitle while loading
aName = pShell->GetTitle();
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 7b69bea3c6f0..ee19126a0e2c 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: drwlayer.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: nn $ $Date: 2001-10-05 14:16:13 $
+ * last change: $Author: sj $ $Date: 2001-11-27 10:11:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,12 @@
#include <svx/svdundo.hxx>
#include <svx/unolingu.hxx>
#include <svx/drawitem.hxx>
+#ifndef _SVX_FHGTITEM_HXX
+#include <svx/fhgtitem.hxx>
+#endif
+#ifndef _EEITEM_HXX
+#include <svx/eeitem.hxx>
+#endif
#include <sfx2/viewsh.hxx>
#include <sfx2/docinf.hxx>
#include <sfx2/docfile.hxx>
@@ -294,6 +300,14 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
Outliner& rHitOutliner = GetHitTestOutliner();
rHitOutliner.SetCalcFieldValueHdl( LINK( pScMod, ScModule, CalcFieldValueHdl ) );
+ // #95129# SJ: set FontHeight pool defaults without changing static SdrEngineDefaults
+ SfxItemPool* pOutlinerPool = rOutliner.GetEditTextObjectPool();
+ if ( pOutlinerPool )
+ pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
+ SfxItemPool* pHitOutlinerPool = rHitOutliner.GetEditTextObjectPool();
+ if ( pHitOutlinerPool )
+ pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
+
// URL-Buttons haben keinen Handler mehr, machen alles selber
if( !nInst++ )