diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:43:13 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:43:13 +0000 |
| commit | 36be49bb83e9d89e5e5a6f555a5b2d462739561b (patch) | |
| tree | d7a82f9cbad5befaf7815e30e315d0a611212006 | |
| parent | c7b96ad5b2bf51763ce4e23182e6229edc9e2d5b (diff) | |
INTEGRATION: CWS geordi2q01 (1.14.236); FILE MERGED
2003/08/18 14:03:11 hr 1.14.236.1: #111861#: join changes from CWS sab007
| -rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 2ef7f5a552bd..1406afdb6f26 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesImportHelper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: sab $ $Date: 2002-04-12 08:16:27 $ + * last change: $Author: hjs $ $Date: 2003-08-18 14:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -357,8 +357,6 @@ void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLIm ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) : - aCellStyles(), - aColDefaultStyles(), bPrevRangeAdded(sal_True), rImport(rTempImport), nMaxRanges(0), @@ -499,6 +497,7 @@ void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, con DBG_ASSERT(static_cast<sal_uInt32>(nColumn) == aColDefaultStyles.size(), "some columns are absent"); ScMyStylesSet::iterator aItr = GetIterator(&sStyleName); DBG_ASSERT(aItr != aCellStyles.end(), "no column default style") + aColDefaultStyles.reserve(aColDefaultStyles.size() + nRepeat); for (sal_Int32 i = 0; i < nRepeat; i++) aColDefaultStyles.push_back(aItr); } @@ -629,8 +628,8 @@ void ScMyStylesImportHelper::SetStylesToRanges() aItr->xRanges->SetStylesToRanges(&aItr->sStyleName, rImport); aItr++; } - aCellStyles.clear(); aColDefaultStyles.clear(); + aCellStyles.clear(); nMaxRanges = 0; } |