ooo-build r13504 - in trunk: . patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Sat Aug  9 05:42:03 2008
New Revision: 13504
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13504&view=rev

Log:
2008-08-09  Kohei Yoshida  <kyoshida novell com>

	* patches/test/calc-external-defined-names.diff: more progress.  fixed
	change track import from Excel file & other bugs.


Modified:
   trunk/ChangeLog
   trunk/patches/test/calc-external-defined-names.diff

Modified: trunk/patches/test/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/test/calc-external-defined-names.diff	(original)
+++ trunk/patches/test/calc-external-defined-names.diff	Sat Aug  9 05:42:03 2008
@@ -3835,7 +3835,7 @@
  
  
 diff --git sc/source/filter/excel/xeformula.cxx sc/source/filter/excel/xeformula.cxx
-index 3db8da7..0debb70 100644
+index 3db8da7..e13d161 100644
 --- sc/source/filter/excel/xeformula.cxx
 +++ sc/source/filter/excel/xeformula.cxx
 @@ -42,6 +42,12 @@
@@ -3905,7 +3905,7 @@
      switch( eTokType )
      {
          case svUnknown:     mbOk = false;                           break;
-@@ -1248,6 +1287,136 @@ void XclExpFmlaCompImpl::ProcessExternal( const XclExpTokenData& rTokData, sal_u
+@@ -1248,6 +1287,135 @@ void XclExpFmlaCompImpl::ProcessExternal( const XclExpTokenData& rTokData, sal_u
          ProcessFunction( rTokData, nExpClass );
  }
  
@@ -3956,7 +3956,6 @@
 +        break;
 +        case svDoubleRef:
 +        {
-+            fprintf(stdout, "XclExpFmlaCompImpl::ProcessExternalName:   *** svDoubleRef support in progress ***\n");
 +            if (!mpScBasePos)
 +            {
 +                AppendErrorToken(XclTools::GetXclErrorCode(errNoRef), rTokData.mnSpaces);
@@ -4042,7 +4041,7 @@
  void XclExpFmlaCompImpl::ProcessFunction( const XclExpTokenData& rTokData, sal_uInt8 nExpClass )
  {
      OpCode eOpCode = rTokData.GetOpCode();
-@@ -1623,32 +1792,6 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
+@@ -1623,32 +1791,6 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
      }
  }
  
@@ -4076,7 +4075,7 @@
  
  SCTAB XclExpFmlaCompImpl::GetScTab( const SingleRefData& rRefData ) const
 diff --git sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xelink.cxx
-index b1bacad..d6ef112 100644
+index b1bacad..b643eda 100644
 --- sc/source/filter/excel/xelink.cxx
 +++ sc/source/filter/excel/xelink.cxx
 @@ -38,6 +38,40 @@
@@ -4618,7 +4617,7 @@
      }
  }
  
-@@ -1352,6 +1693,135 @@ void XclExpSupbookBuffer::StoreCellRange( const ScRange& rRange )
+@@ -1352,6 +1693,134 @@ void XclExpSupbookBuffer::StoreCellRange( const ScRange& rRange )
      }
  }
  
@@ -4698,7 +4697,6 @@
 +        nSupbookId = Append(xSupbook);
 +    }
 +
-+    SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
 +    SCTAB nTabCount = rRange.aEnd.Tab() - rRange.aStart.Tab() + 1;
 +
 +    // If this is a multi-table range, get token for each table.
@@ -4721,7 +4719,7 @@
 +        }
 +    }
 +
-+    if (aMatrixList.size() != nTabCount)
++    if (aMatrixList.size() != static_cast<size_t>(nTabCount))
 +    {
 +        // matrix size mis-match !
 +        return;
@@ -4747,14 +4745,14 @@
 +        }
 +
 +        fprintf(stdout, "XclExpSupbookBuffer::StoreCellRange:   supbook sheet id = %d\n", nSheetId);
-+        xSupbook->StoreCellRange(nSheetId, aRange, *aMatrixList[nTab-nTab1]);
++        xSupbook->StoreCellRange(nSheetId, aRange, *aMatrixList[nTab]);
 +    }
 +}
 +
  bool XclExpSupbookBuffer::InsertAddIn(
          sal_uInt16& rnSupbook, sal_uInt16& rnExtName, const String& rName )
  {
-@@ -1383,6 +1853,83 @@ bool XclExpSupbookBuffer::InsertDde(
+@@ -1383,6 +1852,83 @@ bool XclExpSupbookBuffer::InsertDde(
      return rnExtName > 0;
  }
  
@@ -4838,7 +4836,7 @@
  void XclExpSupbookBuffer::Save( XclExpStream& rStrm )
  {
      maSupbookList.Save( rStrm );
-@@ -1424,27 +1971,6 @@ sal_uInt16 XclExpSupbookBuffer::Append( XclExpSupbookRef xSupbook )
+@@ -1424,27 +1970,6 @@ sal_uInt16 XclExpSupbookBuffer::Append( XclExpSupbookRef xSupbook )
      return ulimit_cast< sal_uInt16 >( maSupbookList.GetSize() - 1 );
  }
  
@@ -4866,7 +4864,7 @@
  // Export link manager ========================================================
  
  XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) :
-@@ -1485,11 +2011,29 @@ sal_uInt16 XclExpLinkManagerImpl5::FindExtSheet( sal_Unicode cCode )
+@@ -1485,11 +2010,29 @@ sal_uInt16 XclExpLinkManagerImpl5::FindExtSheet( sal_Unicode cCode )
      return nExtSheet;
  }
  
@@ -4896,7 +4894,7 @@
  bool XclExpLinkManagerImpl5::InsertAddIn(
          sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const String& rName )
  {
-@@ -1510,6 +2054,14 @@ bool XclExpLinkManagerImpl5::InsertDde(
+@@ -1510,6 +2053,14 @@ bool XclExpLinkManagerImpl5::InsertDde(
      return false;
  }
  
@@ -4911,7 +4909,7 @@
  void XclExpLinkManagerImpl5::Save( XclExpStream& rStrm )
  {
      if( sal_uInt16 nExtSheetCount = GetExtSheetCount() )
-@@ -1630,6 +2182,17 @@ sal_uInt16 XclExpLinkManagerImpl8::FindExtSheet( sal_Unicode cCode )
+@@ -1630,6 +2181,17 @@ sal_uInt16 XclExpLinkManagerImpl8::FindExtSheet( sal_Unicode cCode )
      return InsertXti( maSBBuffer.GetXti( EXC_TAB_EXTERNAL, EXC_TAB_EXTERNAL ) );
  }
  
@@ -4929,7 +4927,7 @@
  void XclExpLinkManagerImpl8::StoreCellRange( const SingleRefData& rRef1, const SingleRefData& rRef2 )
  {
      if( !rRef1.IsDeleted() && !rRef2.IsDeleted() && (rRef1.nTab >= 0) && (rRef2.nTab >= 0) )
-@@ -1652,6 +2215,19 @@ void XclExpLinkManagerImpl8::StoreCellRange( const SingleRefData& rRef1, const S
+@@ -1652,6 +2214,19 @@ void XclExpLinkManagerImpl8::StoreCellRange( const SingleRefData& rRef1, const S
      }
  }
  
@@ -4949,7 +4947,7 @@
  bool XclExpLinkManagerImpl8::InsertAddIn(
          sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const String& rName )
  {
-@@ -1677,6 +2253,18 @@ bool XclExpLinkManagerImpl8::InsertDde(
+@@ -1677,6 +2252,18 @@ bool XclExpLinkManagerImpl8::InsertDde(
      return false;
  }
  
@@ -4968,7 +4966,7 @@
  void XclExpLinkManagerImpl8::Save( XclExpStream& rStrm )
  {
      if( !maXtiVec.empty() )
-@@ -1745,6 +2333,13 @@ sal_uInt16 XclExpLinkManager::FindExtSheet( sal_Unicode cCode )
+@@ -1745,6 +2332,13 @@ sal_uInt16 XclExpLinkManager::FindExtSheet( sal_Unicode cCode )
      return mxImpl->FindExtSheet( cCode );
  }
  
@@ -4982,7 +4980,7 @@
  void XclExpLinkManager::StoreCell( const SingleRefData& rRef )
  {
      mxImpl->StoreCellRange( rRef, rRef );
-@@ -1755,6 +2350,16 @@ void XclExpLinkManager::StoreCellRange( const ComplRefData& rRef )
+@@ -1755,6 +2349,16 @@ void XclExpLinkManager::StoreCellRange( const ComplRefData& rRef )
      mxImpl->StoreCellRange( rRef.Ref1, rRef.Ref2 );
  }
  
@@ -4999,7 +4997,7 @@
  bool XclExpLinkManager::InsertAddIn(
          sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const String& rName )
  {
-@@ -1768,6 +2373,13 @@ bool XclExpLinkManager::InsertDde(
+@@ -1768,6 +2372,13 @@ bool XclExpLinkManager::InsertDde(
      return mxImpl->InsertDde( rnExtSheet, rnExtName, rApplic, rTopic, rItem );
  }