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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 21:45:54 2009
New Revision: 15181
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15181&view=rev

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

	* patches/dev300/calc-change-track-xls-export-fix-m39.diff:
	* patches/dev300/calc-change-track-xls-export-fix.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/calc-change-track-xls-export-fix-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/calc-change-track-xls-export-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-change-track-xls-export-fix.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 21:45:54 2009
@@ -1059,7 +1059,11 @@
 # always store ranges in ODF using Calc A1 formula syntax.
 chart-odf-always-calc-a1.diff, n#463305, kohei
 
-[ CalcFixes ]
+[ CalcFixes <= dev300-m39 ]
+# fixed change track export to xls files wrt cell change records.
+calc-change-track-xls-export-fix-m39.diff, n#416045, i#93839, kohei
+
+[ CalcFixes > dev300-m39 ]
 # fixed change track export to xls files wrt cell change records.
 calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei
 

Modified: trunk/patches/dev300/calc-change-track-xls-export-fix.diff
==============================================================================
--- trunk/patches/dev300/calc-change-track-xls-export-fix.diff	(original)
+++ trunk/patches/dev300/calc-change-track-xls-export-fix.diff	Tue Jan 27 21:45:54 2009
@@ -1,21 +1,21 @@
 diff --git sc/inc/chgtrack.hxx sc/inc/chgtrack.hxx
-index fc078cf..b607124 100644
+index 946b862..0735a8d 100644
 --- sc/inc/chgtrack.hxx
 +++ sc/inc/chgtrack.hxx
-@@ -1397,8 +1397,6 @@ public:
+@@ -1398,8 +1398,6 @@ public:
  			void				NotifyModified( ScChangeTrackMsgType eMsgType,
  									ULONG nStartAction, ULONG nEndAction );
  
--			BOOL				Load( SvStream& rStrm, USHORT nVer );
--			BOOL				Store( SvStream& rStrm );
+-	SC_DLLPUBLIC		BOOL				Load( SvStream& rStrm, USHORT nVer );
+-	SC_DLLPUBLIC		BOOL				Store( SvStream& rStrm );
  			USHORT				GetLoadedFileFormatVersion() const
  									{ return nLoadedFileFormatVersion; }
  
 diff --git sc/source/core/tool/chgtrack.cxx sc/source/core/tool/chgtrack.cxx
-index 7a62176..fc03ddd 100644
+index 86d81cc..830f397 100644
 --- sc/source/core/tool/chgtrack.cxx
 +++ sc/source/core/tool/chgtrack.cxx
-@@ -2943,262 +2943,6 @@ void lcl_EnsureSorting( StrCollection& rCollection )
+@@ -2943,262 +2943,6 @@ void lcl_EnsureSorting( ScStrCollection& rCollection )
  	}
  }
  
@@ -279,7 +279,7 @@
  {
  	ScChangeActionType eType = pAppend->GetType();
 diff --git sc/source/filter/inc/XclExpChangeTrack.hxx sc/source/filter/inc/XclExpChangeTrack.hxx
-index 9326ca9..eb980ae 100644
+index 9ec2351..75ab49d 100644
 --- sc/source/filter/inc/XclExpChangeTrack.hxx
 +++ sc/source/filter/inc/XclExpChangeTrack.hxx
 @@ -620,14 +620,13 @@ private:
@@ -299,7 +299,7 @@
  
  	sal_Bool					WriteUserNamesStream();
 diff --git sc/source/filter/xcl97/XclExpChangeTrack.cxx sc/source/filter/xcl97/XclExpChangeTrack.cxx
-index 5b90f44..ab9750d 100644
+index 4318d4f..79563aa 100644
 --- sc/source/filter/xcl97/XclExpChangeTrack.cxx
 +++ sc/source/filter/xcl97/XclExpChangeTrack.cxx
 @@ -1073,7 +1073,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :