diff options
| author | Armin Le Grand <alg@apache.org> | 2012-12-10 13:34:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-06 21:04:07 +0100 |
| commit | c0eb5e7772c848806db8ab461f77f9549c1d8b2b (patch) | |
| tree | 076a49189c0a7d0abd3ff4025f1718dfba2d4ecf /sc/source/core/data/documen9.cxx | |
| parent | ed1a26565898a6461503468b1fba008328019055 (diff) | |
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
Diffstat (limited to 'sc/source/core/data/documen9.cxx')
| -rw-r--r-- | sc/source/core/data/documen9.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
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) |