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 | |
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')
-rw-r--r-- | sc/inc/document.hxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/documen2.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/documen3.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/documen9.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 2 |
5 files changed, 5 insertions, 26 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 2b7490eb6e21..11a18e9ba24e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -394,7 +394,6 @@ private: sal_uInt8 nAsianCompression; sal_uInt8 nAsianKerning; - bool bSetDrawDefaults; bool bPastingDrawFromOtherDoc; @@ -457,8 +456,6 @@ public: SC_DLLPUBLIC void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const; void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl ); - void SetDrawDefaults(); - void SetConsolidateDlgData( const ScConsolidateParam* pData ); const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData; } @@ -2001,7 +1998,6 @@ private: // CLOOK-Impl-methods void UpdateDrawPrinter(); void UpdateDrawLanguages(); - void UpdateDrawDefaults(); SC_DLLPUBLIC void InitClipPtrs( ScDocument* pSourceDoc ); void LoadDdeLinks(SvStream& rStream); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 1d63dd93a64d..bc9a5af324d8 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -197,7 +197,6 @@ ScDocument::ScDocument( ScDocumentMode eMode, nVisSpellState( 0 ), nAsianCompression(SC_ASIANCOMPRESSION_INVALID), nAsianKerning(SC_ASIANKERNING_INVALID), - bSetDrawDefaults( false ), bPastingDrawFromOtherDoc( false ), nInDdeLinkUpdate( 0 ), bInUnoBroadcast( false ), diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 1b64286481a8..3c20d736dd7c 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1889,12 +1889,6 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool } -void ScDocument::SetDrawDefaults() -{ - bSetDrawDefaults = true; - UpdateDrawDefaults(); -} - Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, bool bHiddenAsZero ) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) 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) diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 7f5ea07aa1e0..f206a9d6dd0c 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -53,8 +53,6 @@ sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) SetVisAreaOrSize( Rectangle( Point(), aSize ), sal_True ); } - aDocument.SetDrawDefaults(); // drawing layer defaults that are set only in InitNew - // InitOptions sets the document languages, must be called before CreateStandardStyles InitOptions(false); |