GNOME.org
 

ooo-build r15164 - in trunk: . patches/dev300

Author: kyoshida
Date: Tue Jan 27 06:42:39 2009
New Revision: 15164
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15164&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-xls-builtin-name-scope-m38.diff:
	* patches/dev300/sc-xls-builtin-name-scope.diff:
	* patches/dev300/apply: adjusted for dev300-m39.



Added:
   trunk/patches/dev300/sc-xls-builtin-name-scope-m38.diff
      - copied unchanged from r15157, /trunk/patches/dev300/sc-xls-builtin-name-scope.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-xls-builtin-name-scope.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 06:42:39 2009
@@ -799,7 +799,11 @@
 # Print_Area/Print_Titles are only relevant for sheet local names, n#191005
 sc-xls-builtin-name-scope-m37.diff, n#191005, n#257422, jonp
 
-[ CalcFixes >= dev300-m38 ]
+[ CalcFixes == dev300-m38 ]
+# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
+sc-xls-builtin-name-scope-m38.diff, n#191005, n#257422, jonp
+
+[ CalcFixes > dev300-m38 ]
 # Print_Area/Print_Titles are only relevant for sheet local names, n#191005
 sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp
 

Modified: trunk/patches/dev300/sc-xls-builtin-name-scope.diff
==============================================================================
--- trunk/patches/dev300/sc-xls-builtin-name-scope.diff	(original)
+++ trunk/patches/dev300/sc-xls-builtin-name-scope.diff	Tue Jan 27 06:42:39 2009
@@ -1,5 +1,5 @@
 diff --git sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx
-index eac2890..4b35df6 100644
+index b1e05d0..f30eb80 100644
 --- sc/source/filter/excel/excform.cxx
 +++ sc/source/filter/excel/excform.cxx
 @@ -904,7 +904,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
@@ -71,10 +71,10 @@
  			}
  				break;
 diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
-index d8cdd74..2580ef8 100644
+index 1bf13ef..22da392 100644
 --- sc/source/filter/excel/excform8.cxx
 +++ sc/source/filter/excel/excform8.cxx
-@@ -871,7 +871,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
+@@ -877,7 +877,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
  
  
  // stream seeks to first byte after <nFormulaLen>
@@ -84,7 +84,7 @@
  {
  	BYTE					nOp, nLen;//, nByte;
  	BOOL					bError = FALSE;
-@@ -1002,7 +1003,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1008,7 +1009,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  
                  ExcRelToScRel8( nRow, nCol, aSRD, bRangeName );
  
@@ -93,7 +93,7 @@
  			}
  				break;
  			case 0x45:
-@@ -1030,7 +1031,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1036,7 +1037,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  				else if( IsComplRowRange( nRowFirst, nRowLast ) )
  					SetComplRow( aCRD );
  
@@ -102,7 +102,7 @@
  			}
  				break;
  			case 0x46:
-@@ -1074,7 +1075,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1080,7 +1081,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  
                  ExcRelToScRel8( nRow, nCol, aSRD, bRNorSF );
  
@@ -111,7 +111,7 @@
  			}
  				break;
  			case 0x4D:
-@@ -1100,7 +1101,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1106,7 +1107,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  				else if( IsComplRowRange( nRowFirst, nRowLast ) )
  					SetComplRow( aCRD );
  
@@ -120,7 +120,7 @@
  			}
  				break;
  			case 0x4E:
-@@ -1142,10 +1143,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1148,10 +1149,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  						aCRD.Ref2.nCol = aSRD.nCol;
  						aCRD.Ref2.nRow = aSRD.nRow;
                          aCRD.Ref2.nTab = nLastScTab;
@@ -133,7 +133,7 @@
  				}
  			}
  				break;
-@@ -1178,7 +1179,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
+@@ -1184,7 +1185,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
  					else if( IsComplRowRange( nRw1, nRw2 ) )
  						SetComplRow( aCRD );
  
@@ -143,19 +143,19 @@
  			}
  				break;
 diff --git sc/source/filter/excel/frmbase.cxx sc/source/filter/excel/frmbase.cxx
-index 9e6a671..8d77eb8 100644
+index ad4bf6b..aef072f 100644
 --- sc/source/filter/excel/frmbase.cxx
 +++ sc/source/filter/excel/frmbase.cxx
 @@ -81,7 +81,7 @@ _ScRangeListTabs::~_ScRangeListTabs()
  }
  
  
--void _ScRangeListTabs::Append( SingleRefData a, const BOOL b )
-+void _ScRangeListTabs::Append( SingleRefData a, SCsTAB nTab, const BOOL b )
+-void _ScRangeListTabs::Append( ScSingleRefData a, const BOOL b )
++void _ScRangeListTabs::Append( ScSingleRefData a, SCsTAB nTab, const BOOL b )
  {
  	if( b )
  	{
-@@ -101,19 +101,24 @@ void _ScRangeListTabs::Append( SingleRefData a, const BOOL b )
+@@ -101,19 +101,24 @@ void _ScRangeListTabs::Append( ScSingleRefData a, const BOOL b )
  
  	bHasRanges = TRUE;
  
@@ -172,19 +172,20 @@
  
          if( !p )
 -            p = ppTabLists[ a.nTab ] = new _ScRangeList;
+-
 +            p = ppTabLists[ nTab ] = new _ScRangeList;
- 
++  
          p->Append( a );
      }
  }
  
  
--void _ScRangeListTabs::Append( ComplRefData a, const BOOL b )
-+void _ScRangeListTabs::Append( ComplRefData a, SCsTAB nTab, const BOOL b )
+-void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
++void _ScRangeListTabs::Append( ScComplexRefData a, SCsTAB nTab, const BOOL b )
  {
  	if( b )
  	{
-@@ -161,12 +166,17 @@ void _ScRangeListTabs::Append( ComplRefData a, const BOOL b )
+@@ -161,12 +166,17 @@ void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
  
  	bHasRanges = TRUE;
  
@@ -231,7 +232,7 @@
              break;
          }
 diff --git sc/source/filter/inc/excform.hxx sc/source/filter/inc/excform.hxx
-index 68768a4..567a871 100644
+index c587569..a067f9d 100644
 --- sc/source/filter/inc/excform.hxx
 +++ sc/source/filter/inc/excform.hxx
 @@ -64,7 +64,7 @@ public:
@@ -253,17 +254,17 @@
      virtual ConvErr     ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
                                             const String& rUrl, const ::std::vector<String>& rTabNames );
 diff --git sc/source/filter/inc/formel.hxx sc/source/filter/inc/formel.hxx
-index e1be8da..09e2fa7 100644
+index 9b5d524..c025393 100644
 --- sc/source/filter/inc/formel.hxx
 +++ sc/source/filter/inc/formel.hxx
 @@ -154,8 +154,8 @@ public:
  								_ScRangeListTabs( void );
  	virtual						~_ScRangeListTabs();
  
--	void						Append( SingleRefData aSRD, const BOOL bLimit = TRUE );
--	void						Append( ComplRefData aCRD, const BOOL bLimit = TRUE );
-+	void						Append( SingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE );
-+	void						Append( ComplRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE );
+-	void						Append( ScSingleRefData aSRD, const BOOL bLimit = TRUE );
+-	void						Append( ScComplexRefData aCRD, const BOOL bLimit = TRUE );
++	void						Append( ScSingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE );
++	void						Append( ScComplexRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE );
  
  	inline BOOL					HasRanges( void ) const;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]