#121448# Aligned default fill color/ line style for all apps

3 files changed, 5 insertions, 20 deletions

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d51421612508..cd479332264c 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -204,7 +204,6 @@ ScDocument::ScDocument( ScDocumentMode  eMode,
         nVisSpellState( 0 ),
         nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
         nAsianKerning(SC_ASIANKERNING_INVALID),
-        bSetDrawDefaults( sal_False ),
         bPastingDrawFromOtherDoc( sal_False ),
         nInDdeLinkUpdate( 0 ),
         bInUnoBroadcast( sal_False ),
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 7e19b6734e2c..6cacf90436ca 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1914,12 +1914,6 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy
     UpdateDrawLanguages();      // set edit engine defaults in drawing layer pool
 }
 
-void ScDocument::SetDrawDefaults()
-{
-    bSetDrawDefaults = sal_True;
-    UpdateDrawDefaults();
-}
-
 Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
 {
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 7bfc6e3a349f..353816dbb400 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -192,7 +192,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(sal_False);
@@ -217,18 +221,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( sal_True, EE_CHAR_PAIRKERNING ) );
-        pDrawLayer->SetDrawingLayerPoolDefaults();
-    }
-}
-
 void ScDocument::UpdateDrawPrinter()
 {
     if (pDrawLayer)