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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Dec 25 06:58:32 2008
New Revision: 14929
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14929&view=rev

Log:
2008-12-25  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-simple-sort-include-format-header-m37.diff:
	* patches/dev300/sc-simple-sort-include-format-header.diff:
	* patches/dev300/apply: more dev300-m38 work.



Added:
   trunk/patches/dev300/sc-simple-sort-include-format-header-m37.diff
      - copied unchanged from r14927, /trunk/patches/dev300/sc-simple-sort-include-format-header.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-simple-sort-include-format-header.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec 25 06:58:32 2008
@@ -340,7 +340,7 @@
 
 [ FixesNotForUpstream >= dev300-m38 ]
 # for masterfix properly. upstream doesn't want it.
-fixup-r265756.diff
+#fixup-r265756.diff
 
 # FIXME: disabled since we need the dep here right now
 # (until the reportbuilderext changed get transferred to DEV300).
@@ -780,10 +780,17 @@
 # Add a 'Natural' variant of sorting, blocking on ODF extension issues
 sc-natural-sort.diff, i#26565, kohei
 
+[ CalcFixes < dev300-m38 ]
+# Include cell format when sorting via sort icon & determine whether the first
+# row is the column header (depends on sc-natural-sort.diff patch).
+sc-simple-sort-include-format-header-m37.diff, i#13829, kohei
+
+[ CalcFixes >= dev300-m38]
 # Include cell format when sorting via sort icon & determine whether the first
 # row is the column header (depends on sc-natural-sort.diff patch).
 sc-simple-sort-include-format-header.diff, i#13829, kohei
 
+[ CalcFixes ]
 # Paste clipboard when ENTER is pressed, then clear clipboard.
 sc-paste-on-enter.diff, n#358545, i#28535, jonp
 

Modified: trunk/patches/dev300/sc-simple-sort-include-format-header.diff
==============================================================================
--- trunk/patches/dev300/sc-simple-sort-include-format-header.diff	(original)
+++ trunk/patches/dev300/sc-simple-sort-include-format-header.diff	Thu Dec 25 06:58:32 2008
@@ -1,14 +1,8 @@
-diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
-diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
-index e596d23..b573c15 100644
+diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
+index 8e03f93..3e17451 100644
 --- sc/source/ui/view/cellsh2.cxx
 +++ sc/source/ui/view/cellsh2.cxx
-@@ -356,11 +356,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
- 				ScDBData*	pDBData = pTabViewShell->GetDBData();
- 
- 				pDBData->GetSortParam( aSortParam );
--				aSortParam.bHasHeader		= FALSE;
-+//              aSortParam.bHasHeader       = FALSE;
+@@ -367,7 +367,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
  				aSortParam.bByRow			= TRUE;
  				aSortParam.bCaseSens		= FALSE;
  				aSortParam.bNaturalSort		= FALSE;
@@ -16,4 +10,4 @@
 +				aSortParam.bIncludePattern	= TRUE;
  				aSortParam.bInplace 		= TRUE;
  				aSortParam.bDoSort[0]		= TRUE;
- 				aSortParam.nField[0]		= aSortParam.nCol1;
+ 				aSortParam.nField[0]		= nCol;