diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-05-13 06:33:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-05-13 06:33:21 +0000 |
| commit | 426567732b913fca2b905eed467fb736c9f46d5e (patch) | |
| tree | 69543172a917fd69b041e03c75f436ea42faf8f3 /sc/source | |
| parent | 73a632bfe6bda6c5aaa2377d2217a2a6f1efbdae (diff) | |
INTEGRATION: CWS dr39 (1.41.30); FILE MERGED
2005/05/10 13:59:33 sab 1.41.30.1: #i48793#; set array formulas before protection
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xml/xmlsubti.cxx | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 29ecf5f5b022..c48b8dc75314 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsubti.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: vg $ $Date: 2005-03-23 13:03:25 $ + * last change: $Author: rt $ $Date: 2005-05-13 07:33:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -666,6 +666,20 @@ void ScMyTables::DeleteTable() rImport.GetStylesImportHelper()->SetStylesToRanges(); rImport.SetStylesToRangesFinished(); } + + //#i48793#; has to be set before protection + if (!aMatrixRangeList.empty()) + { + ScMyMatrixRangeList::iterator aItr = aMatrixRangeList.begin(); + ScMyMatrixRangeList::iterator aEndItr = aMatrixRangeList.end(); + while(aItr != aEndItr) + { + SetMatrix(aItr->aRange, aItr->sFormula); + ++aItr; + } + aMatrixRangeList.clear(); + } + if (rImport.GetDocument() && bProtection) { uno::Sequence<sal_Int8> aPass; @@ -703,18 +717,6 @@ void ScMyTables::DeleteTable() rImport.SetError(XMLERROR_API | XMLERROR_FLAG_ERROR, aSeq, rtl::OUString(), xLocator);*/ } } - - if (!aMatrixRangeList.empty()) - { - ScMyMatrixRangeList::iterator aItr = aMatrixRangeList.begin(); - ScMyMatrixRangeList::iterator aEndItr = aMatrixRangeList.end(); - while(aItr != aEndItr) - { - SetMatrix(aItr->aRange, aItr->sFormula); - ++aItr; - } - aMatrixRangeList.clear(); - } } table::CellAddress ScMyTables::GetRealCellPos() |