diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:43:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:43:45 +0000 |
| commit | f8e9319e43075663b6e8c73a4f66f781b757acfa (patch) | |
| tree | 00af7e43d5a5a5d6472e86cd0c3004eaa510fb32 /sc/source/core | |
| parent | 4f1ebfaa6b239b23b4bb76f895e2f775e8b8883b (diff) | |
INTEGRATION: CWS calc26 (1.36.88); FILE MERGED
2004/12/02 13:07:19 nn 1.36.88.3: RESYNC: (1.36-1.37); FILE MERGED
2004/11/25 11:12:26 nn 1.36.88.2: #b5017505# correct bug id
2004/11/25 11:07:38 nn 1.36.88.1: #b6174233# use number format exchange list also when copying styles
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/documen8.cxx | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 6f30eb4f7e7f..6e6ef0cdd253 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen8.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: obo $ $Date: 2004-11-15 16:34:02 $ + * last change: $Author: vg $ $Date: 2004-12-23 10:43:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,13 +58,13 @@ * * ************************************************************************/ - #ifdef PCH #include "core_pch.hxx" #endif #pragma hdrstop +#define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx" #include <svx/eeitem.hxx> #define ITEMID_FIELD EE_FEATURE_FIELD @@ -351,7 +351,21 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) { + // #b5017505# number format exchange list has to be handled here, too + + SvNumberFormatter* pThisFormatter = xPoolHelper->GetFormTable(); + SvNumberFormatter* pOtherFormatter = pSrcDoc->xPoolHelper->GetFormTable(); + if (pOtherFormatter && pOtherFormatter != pThisFormatter) + { + SvULONGTable* pExchangeList = + pThisFormatter->MergeFormatter(*(pOtherFormatter)); + if (pExchangeList->Count() > 0) + pFormatExchangeList = pExchangeList; + } + xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() ); + + pFormatExchangeList = NULL; } //------------------------------------------------------------------------ |