From c0eb5e7772c848806db8ab461f77f9549c1d8b2b Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 10 Dec 2012 13:34:26 +0000 Subject: Resolves: #i121448# Aligned default fill color/line style for all apps (cherry picked from commit 81664c037c8d6094b66c1660b6eee9693eadf401) Conflicts: sc/inc/document.hxx sc/source/core/data/documen2.cxx sc/source/core/data/documen3.cxx sc/source/core/data/documen9.cxx svx/inc/svx/svdmodel.hxx svx/source/svdraw/svdmodel.cxx sw/inc/doc.hxx sw/source/core/doc/docdraw.cxx sw/source/core/doc/docnew.cxx sw/source/ui/app/docshini.cxx Change-Id: Id0f62f0cd5b83794e2dbaee4e8b6afa704a0c23a --- sc/source/core/data/documen9.cxx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'sc/source/core/data/documen9.cxx') diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 50195aee77f4..d0813798ca03 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -157,7 +157,11 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) pDrawLayer->SetDefaultTabulator( GetDocOptions().GetTabDistance() ); UpdateDrawPrinter(); - UpdateDrawDefaults(); + + // set draw defaults directly + SfxItemPool& rDrawPool = pDrawLayer->GetItemPool(); + rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); + UpdateDrawLanguages(); if (bImportingXML) pDrawLayer->EnableAdjust(false); @@ -179,18 +183,6 @@ void ScDocument::UpdateDrawLanguages() } } -void ScDocument::UpdateDrawDefaults() -{ - // drawing layer defaults that are set for new documents (if InitNew was called) - - if ( pDrawLayer && bSetDrawDefaults ) - { - SfxItemPool& rDrawPool = pDrawLayer->GetItemPool(); - rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) ); - pDrawLayer->SetDrawingLayerPoolDefaults(); - } -} - void ScDocument::UpdateDrawPrinter() { if (pDrawLayer) -- cgit v1.2.3