CWS-TOOLING: integrate CWS dr69

2009-09-09 11:45:28 +0200 dr  r275979 : suncc failure
2009-09-09 11:33:34 +0200 dr  r275977 : gcc warning
2009-09-09 11:09:02 +0200 er  r275976 : #i87171# reworked name check for creating defined names
2009-09-09 10:38:02 +0200 dr  r275973 : adapt changes in oox base class
2009-09-09 10:21:03 +0200 dr  r275969 : remove faulty pagesize stuff
2009-09-09 10:20:13 +0200 dr  r275968 : remove faulty pagesize stuff
2009-09-08 20:24:39 +0200 nn  r275958 : #i104899# interpret cells when creating chart listener after loading
2009-09-08 16:05:37 +0200 er  r275937 : ScXMLDDELinkContext::EndElement: Excel writes bad ODF <table:dde-link> <table:table> without <table:table-column>'s table:number-columns-repeated attribute; be lenient ...
2009-09-08 13:14:54 +0200 er  r275925 : #i103315# handle external references in Excel's ODF msoxl namespace
2009-09-07 17:37:18 +0200 dr  r275907 : #i104753# crash when deleting cell with note
2009-09-07 14:02:29 +0200 dr  r275896 : #i103520# reworked sheet name buffer to resolve internal hyperlinks, fix almost all remaining problems with external links in BIFF, fix auto color import for BIFF
2009-09-06 20:01:05 +0200 er  r275862 : #i35913# fix regression introduced by integration of CWS fhawfixes1; patch from <wsfulton>
2009-09-05 18:32:00 +0200 er  r275847 : #i104156# merge #i103918# from uncloned dr68ooo311
2009-09-05 18:19:23 +0200 er  r275846 : #i104156# merge #i103317# from uncloned dr68ooo311
2009-09-05 17:32:12 +0200 er  r275844 : #i104484# glueState: correct casts in range bounds; patch from <cmc> slightly modified
2009-09-03 17:26:38 +0200 dr  r275764 : #i103520# handle apostrophs in sheet names in internal URLs
2009-09-03 17:21:26 +0200 dr  r275763 : #i95271# show text formatting in temp notes
2009-09-03 12:24:52 +0200 dr  r275747 : unused declaration
2009-09-02 21:33:03 +0200 dr  r275727 : #i96438# cleanup color handling in xls filter, extend VML color parser
2009-09-02 15:39:57 +0200 dr  r275715 : #158571# #i96438# accept also VML colors in the form '#RRGGBB [xyz]'
2009-09-02 15:16:36 +0200 dr  r275714 : #158571# #i96438# set note text
2009-09-02 14:59:33 +0200 dr  r275713 : #158571# #i96438# load custom line dashes from DrawingML and VML
2009-09-02 11:53:35 +0200 dr  r275702 : #158571# #i96438# import VML fill gradients
2009-08-31 19:28:10 +0200 dr  r275632 : #158571# #i96438# more vml formatting
2009-08-31 14:29:30 +0200 dr  r275606 : #158571# #i96438# changed handling of xml token ids/names
2009-08-28 18:25:26 +0200 dr  r275545 : #158571# #i96438# preparations for and basic support of VML shape formatting, load spreadsheet cell notes position, formatting, and visibility
2009-08-25 19:08:31 +0200 dr  r275378 : #i103390# dump BIFF STYLEEXT
2009-08-25 18:28:50 +0200 dr  r275377 : #i103390# improve built-in style handling
2009-08-25 18:27:38 +0200 dr  r275376 : #i103390# improve built-in style handling
2009-08-04 18:49:40 +0200 dr  r274629 : CWS-TOOLING: rebase CWS dr69 to trunk@274622 (milestone: DEV300:m54)

1 files changed, 35 insertions, 34 deletions

diff --git a/oox/source/xls/workbookfragment.cxx b/oox/source/xls/workbookfragment.cxx
index 1779cb4a7691..6a78c838838e 100644
--- a/oox/source/xls/workbookfragment.cxx
+++ b/oox/source/xls/workbookfragment.cxx
@@ -233,13 +233,15 @@ void OoxWorkbookFragment::finalizeImport()
         some preprocessing in the fragment constructors, e.g. loading the table
         fragments for all sheets that are needed before the cell formulas are
         loaded. */
-    typedef ::std::map< sal_Int32, FragmentHandlerRef > SheetFragmentMap;
-    SheetFragmentMap aSheetFragments;
+    typedef ::std::vector< FragmentHandlerRef > SheetFragmentVector;
+    SheetFragmentVector aSheetFragments;
     WorksheetBuffer& rWorksheets = getWorksheets();
-    sal_Int32 nSheetCount = rWorksheets.getSheetCount();
-    for( sal_Int32 nSheet = 0; nSheet < nSheetCount; ++nSheet )
+    sal_Int32 nWorksheetCount = rWorksheets.getWorksheetCount();
+    for( sal_Int32 nWorksheet = 0; nWorksheet < nWorksheetCount; ++nWorksheet )
     {
-        if( const Relation* pRelation = getRelations().getRelationFromRelId( rWorksheets.getSheetRelId( nSheet ) ) )
+        sal_Int16 nCalcSheet = rWorksheets.getCalcSheetIndex( nWorksheet );
+        const Relation* pRelation = getRelations().getRelationFromRelId( rWorksheets.getWorksheetRelId( nWorksheet ) );
+        if( (nCalcSheet >= 0) && pRelation )
         {
             // get fragment path of the sheet
             OUString aFragmentPath = getFragmentPathFromRelation( *pRelation );
@@ -247,33 +249,33 @@ void OoxWorkbookFragment::finalizeImport()
             if( aFragmentPath.getLength() > 0 )
             {
                 ::rtl::Reference< OoxWorksheetFragmentBase > xFragment;
-                double fSegmentLength = getProgressBar().getFreeLength() / (nSheetCount - nSheet);
+                double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
                 ISegmentProgressBarRef xSheetSegment = getProgressBar().createSegment( fSegmentLength );
 
                 // create the fragment according to the sheet type
                 if( pRelation->maType == CREATE_OFFICEDOC_RELATIONSTYPE( "worksheet" ) )
                 {
-                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_WORKSHEET, nSheet ) );
+                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_WORKSHEET, nCalcSheet ) );
                 }
                 else if( pRelation->maType == CREATE_OFFICEDOC_RELATIONSTYPE( "chartsheet" ) )
                 {
-                    xFragment.set( new OoxChartsheetFragment( *this, aFragmentPath, xSheetSegment, nSheet ) );
+                    xFragment.set( new OoxChartsheetFragment( *this, aFragmentPath, xSheetSegment, nCalcSheet ) );
                 }
                 else if( (pRelation->maType == CREATE_MSOFFICE_RELATIONSTYPE( "xlMacrosheet" )) ||
                          (pRelation->maType == CREATE_MSOFFICE_RELATIONSTYPE( "xlIntlMacrosheet" )) )
                 {
-                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_MACROSHEET, nSheet ) );
+                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_MACROSHEET, nCalcSheet ) );
                 }
                 else if( pRelation->maType == CREATE_OFFICEDOC_RELATIONSTYPE( "dialogsheet" ) )
                 {
-                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_DIALOGSHEET, nSheet ) );
+                    xFragment.set( new OoxWorksheetFragment( *this, aFragmentPath, xSheetSegment, SHEETTYPE_DIALOGSHEET, nCalcSheet ) );
                 }
 
                 // insert the fragment into the map
                 OSL_ENSURE( xFragment.is(), "OoxWorkbookFragment::finalizeImport - unknown sheet type" );
                 OSL_ENSURE( !xFragment.is() || xFragment->isValidSheet(), "OoxWorkbookFragment::finalizeImport - missing sheet in document" );
                 if( xFragment.is() && xFragment->isValidSheet() )
-                    aSheetFragments[ nSheet ].set( xFragment.get() );
+                    aSheetFragments.push_back( xFragment.get() );
             }
         }
     }
@@ -283,17 +285,13 @@ void OoxWorkbookFragment::finalizeImport()
     getTables().finalizeImport();
 
     // load all worksheets
-    for( sal_Int32 nSheet = 0; nSheet < nSheetCount; ++nSheet )
+    for( SheetFragmentVector::iterator aIt = aSheetFragments.begin(), aEnd = aSheetFragments.end(); aIt != aEnd; ++aIt )
     {
-        SheetFragmentMap::iterator aIt = aSheetFragments.find( nSheet );
-        if( aIt != aSheetFragments.end() )
-        {
-            OOX_LOADSAVE_TIMER( IMPORTSHEETFRAGMENT );
-            // import the sheet fragment
-            importOoxFragment( aIt->second );
-            // delete fragment object, will free all allocated sheet buffers
-            aSheetFragments.erase( aIt );
-        }
+        OOX_LOADSAVE_TIMER( IMPORTSHEETFRAGMENT );
+        // import the sheet fragment
+        importOoxFragment( *aIt );
+        // delete fragment object, will free all allocated sheet buffers
+        aIt->clear();
     }
 
     // final conversions, e.g. calculation settings and view settings
@@ -368,13 +366,14 @@ bool BiffWorkbookFragment::importFragment()
             // load sheet fragments (do not return false in bRet on missing/broken sheets)
             WorksheetBuffer& rWorksheets = getWorksheets();
             bool bNextSheet = bRet;
-            for( sal_Int32 nSheet = 0, nSheetCount = rWorksheets.getSheetCount(); bNextSheet && (nSheet < nSheetCount); ++nSheet )
+            for( sal_Int32 nWorksheet = 0, nWorksheetCount = rWorksheets.getWorksheetCount(); bNextSheet && (nWorksheet < nWorksheetCount); ++nWorksheet )
             {
                 // try to start a new sheet fragment
-                double fSegmentLength = getProgressBar().getFreeLength() / (nSheetCount - nSheet);
+                double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
                 ISegmentProgressBarRef xSheetProgress = getProgressBar().createSegment( fSegmentLength );
                 BiffFragmentType eSheetFragment = startFragment( getBiff() );
-                bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nSheet );
+                sal_Int16 nCalcSheet = rWorksheets.getCalcSheetIndex( nWorksheet );
+                bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nCalcSheet );
             }
         }
         break;
@@ -435,19 +434,19 @@ bool BiffWorkbookFragment::importWorkspaceFragment()
 
     // load sheet fragments (do not return false in bRet on missing/broken sheets)
     bool bNextSheet = bRet;
-    for( sal_Int32 nSheet = 0, nSheetCount = rWorksheets.getSheetCount(); bNextSheet && (nSheet < nSheetCount); ++nSheet )
+    for( sal_Int32 nWorksheet = 0, nWorksheetCount = rWorksheets.getWorksheetCount(); bNextSheet && (nWorksheet < nWorksheetCount); ++nWorksheet )
     {
         // try to start a new sheet fragment (with leading SHEETHEADER record)
         bNextSheet = mrStrm.startNextRecord() && (mrStrm.getRecId() == BIFF_ID_SHEETHEADER);
         if( bNextSheet )
         {
-            double fSegmentLength = getProgressBar().getFreeLength() / (nSheetCount - nSheet);
+            double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
             ISegmentProgressBarRef xSheetProgress = getProgressBar().createSegment( fSegmentLength );
             /*  Read current sheet name (sheet substreams may not be in the
                 same order as SHEET records are). */
             mrStrm.skip( 4 );
             OUString aSheetName = mrStrm.readByteStringUC( false, getTextEncoding() );
-            sal_Int32 nCurrSheet = rWorksheets.getCalcSheetIndex( aSheetName );
+            sal_Int16 nCurrSheet = rWorksheets.getCalcSheetIndex( aSheetName );
             // load the sheet fragment records
             BiffFragmentType eSheetFragment = startFragment( getBiff() );
             bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nCurrSheet );
@@ -630,8 +629,12 @@ bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgress
     return bRet;
 }
 
-bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBar, BiffFragmentType eFragment, sal_Int32 nSheet )
+bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBar, BiffFragmentType eFragment, sal_Int16 nCalcSheet )
 {
+    // no Calc sheet - skip the fragment
+    if( nCalcSheet < 0 )
+        return skipFragment();
+
     // find the sheet type for this fragment
     WorksheetType eSheetType = SHEETTYPE_EMPTYSHEET;
     switch( eFragment )
@@ -646,7 +649,7 @@ bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBa
 
     /*  #i11183# Clear buffers that are used per-sheet, e.g. external links in
         BIFF4W and BIFF5 files, or defined names in BIFF4W files. */
-    createBuffersPerSheet();
+    createBuffersPerSheet( nCalcSheet );
 
     // preprocess some records
     switch( getBiff() )
@@ -656,8 +659,6 @@ bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBa
         case BIFF3:
         case BIFF4:
         {
-            // set sheet index in defined names buffer to handle built-in names correctly
-            getDefinedNames().setLocalSheetIndex( nSheet );
             // remember current record to seek back below
             sal_Int64 nRecHandle = mrStrm.getRecHandle();
             // import the global records
@@ -695,14 +696,14 @@ bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBa
         case SHEETTYPE_WORKSHEET:
         case SHEETTYPE_MACROSHEET:
         case SHEETTYPE_DIALOGSHEET:
-            xFragment.reset( new BiffWorksheetFragment( *this, xSheetProgress, eSheetType, nSheet ) );
+            xFragment.reset( new BiffWorksheetFragment( *this, xSheetProgress, eSheetType, nCalcSheet ) );
         break;
         case SHEETTYPE_CHARTSHEET:
-            xFragment.reset( new BiffChartsheetFragment( *this, xSheetProgress, nSheet ) );
+            xFragment.reset( new BiffChartsheetFragment( *this, xSheetProgress, nCalcSheet ) );
         break;
         case SHEETTYPE_MODULESHEET:
         case SHEETTYPE_EMPTYSHEET:
-            xFragment.reset( new BiffSkipWorksheetFragment( *this, xSheetProgress, nSheet ) );
+            xFragment.reset( new BiffSkipWorksheetFragment( *this, xSheetProgress, nCalcSheet ) );
         break;
     }
     // load the sheet fragment records