diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:49:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:49:01 +0000 |
| commit | 3f334a2c2bd292a034d5ceb0b899c9acd2afcdde (patch) | |
| tree | 2856794cc9fa68d238353e31be5fd793d1217a28 /oox/source | |
| parent | f58f64bec6796b97c76ebdf0ac6db997ca4d1074 (diff) | |
INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED
2008/03/12 14:22:32 dr 1.2.12.2: more code finetuning
2008/02/21 12:42:08 hbrinkm 1.2.12.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/xls/worksheethelper.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx index 983e8d596fb3..7398272f949f 100644 --- a/oox/source/xls/worksheethelper.cxx +++ b/oox/source/xls/worksheethelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: worksheethelper.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -830,6 +830,10 @@ void WorksheetData::initializeWorksheetImport() PropertySet aPropSet( mxSheet ); aPropSet.setProperty( CREATE_OUSTRING( "CellStyle" ), getStyles().getDefaultStyleName() ); #endif + + /* remember current sheet index in global data, needed by some global + objects, e.g. the chart converter. */ + setCurrentSheetIndex( mnSheet ); } void WorksheetData::finalizeWorksheetImport() @@ -844,6 +848,9 @@ void WorksheetData::finalizeWorksheetImport() convertColumns(); convertRows(); finalizeDrawing(); + + // reset current sheet index in global data + setCurrentSheetIndex( -1 ); } // private -------------------------------------------------------------------- |