[ooo-build-commit] 5 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Aug 10 23:44:18 PDT 2009
patches/dev300/apply | 16 +++-------
patches/dev300/calc-xls-decryption-crash-fix.diff | 24 ---------------
patches/dev300/sc-paste-on-enter.diff | 13 ++------
patches/dev300/sc-simple-sort-include-format-header.diff | 13 --------
4 files changed, 10 insertions(+), 56 deletions(-)
New commits:
commit 70502ddfcfbcc2acc5a277ac895d69044a65a6cb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:42:24 2009 +0300
Adapt patches/dev300/sc-paste-on-enter.diff for dev300
* patches/dev300/sc-paste-on-enter.diff: Adapt patch to
sc/source/ui/view/gridwin.cxx for dev300-m54.
diff --git a/patches/dev300/sc-paste-on-enter.diff b/patches/dev300/sc-paste-on-enter.diff
index 70b8831..6b3bb24 100644
--- a/patches/dev300/sc-paste-on-enter.diff
+++ b/patches/dev300/sc-paste-on-enter.diff
@@ -204,21 +204,16 @@ diff -u -p -r1.65 viewdata.cxx
//UNUSED2008-05 aLogicMode = pRef->aLogicMode;
//UNUSED2008-05
//UNUSED2008-05 SetGridMode ( pRef->IsGridMode() );
-Index: sc/source/ui/view/gridwin.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
-retrieving revision 1.94
-diff -u -p -r1.94 gridwin.cxx
---- sc/source/ui/view/gridwin.cxx.old 2009-04-03 20:42:43.000000000 +0200
-+++ sc/source/ui/view/gridwin.cxx 2009-04-03 20:43:28.000000000 +0200
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
@@ -118,6 +118,7 @@
#include "userdat.hxx"
#include "drwlayer.hxx"
#include "attrib.hxx"
+#include "cellsh.hxx"
+ #include "validat.hxx"
#include "tabprotection.hxx"
-
- // #114409#
+ #include "postit.hxx"
@@ -2934,12 +2935,30 @@ void ScGridWindow::SelectForContextMenu(
}
}
commit ea55ae3e6751ffa70a26c31ec2b2c33a1971a2af
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:38:37 2009 +0300
calc-multiline-formula-ref.diff seems to be upstream
* patches/dev300/apply: Move calc-multiline-formula-ref.diff to
UnUsedButNotYetRemovedFromGit.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fee060a..e869ba7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -674,9 +674,6 @@ sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
# FIXME: 2009-08-11: doesn't apply, no obvious way to fix
# calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
-# preserve line breaks when referencing it in formula.
-calc-multiline-formula-ref.diff, i#35913, kohei
-
# always store ranges in ODF using Calc A1 formula syntax.
chart-odf-always-calc-a1.diff, n#463305, kohei
@@ -2273,6 +2270,9 @@ sc-standard-filter-options.diff, i#35579, michael
# Saves and loads the standard filters in ods
sc-standard-filter-options-ods-hack.diff, i#35579, jonp
+# preserve line breaks when referencing it in formula.
+calc-multiline-formula-ref.diff, i#35913, kohei
+
[ Store ]
SectionOwner => rodo
commit eaab7b1787941eb48ab4477039f9f95e6fcc5190
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:36:43 2009 +0300
calc-filter-by-date-strip-time.diff doesn't apply.
* patches/dev300/apply: Comment out
calc-filter-by-date-strip-time.diff with FIXME comment.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 744d7c2..fee060a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -669,8 +669,11 @@ vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
sc-drwlayer-units.diff, i#83735, jonp
# overwrite character level font attributes when changing them at cell level.
sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
+
# When filtering by date, strip off the time element from each value.
-calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
+# FIXME: 2009-08-11: doesn't apply, no obvious way to fix
+# calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
+
# preserve line breaks when referencing it in formula.
calc-multiline-formula-ref.diff, i#35913, kohei
commit 9f32c8922185211e0c97383ed47a5cca82c69a2c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:33:11 2009 +0300
calc-xls-decryption-crash-fix.diff is upstream
* patches/dev300/calc-xls-decryption-crash-fix.diff: Delete.
* patches/dev300/apply: Drop it from here, too.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 77fea7a..744d7c2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -665,9 +665,6 @@ vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
#sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
[ CalcFixes ]
-# fix a crasher when loading xls doc with unsupported encryption.
-calc-xls-decryption-crash-fix.diff, i#102906, kohei
-
# Unit conversion fixes in ScDrawLayer.
sc-drwlayer-units.diff, i#83735, jonp
# overwrite character level font attributes when changing them at cell level.
diff --git a/patches/dev300/calc-xls-decryption-crash-fix.diff b/patches/dev300/calc-xls-decryption-crash-fix.diff
deleted file mode 100644
index 934e000..0000000
--- a/patches/dev300/calc-xls-decryption-crash-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: sc/source/filter/excel/xicontent.cxx
-===================================================================
---- sc/source/filter/excel/xicontent.cxx (revision 270727)
-+++ sc/source/filter/excel/xicontent.cxx (working copy)
-@@ -1096,6 +1096,10 @@
- case EXC_BIFF8: xDecr = lclReadFilepass8( rStrm ); break;
- default: DBG_ERROR_BIFF();
- };
-+
-+ if (!xDecr.is())
-+ return EXC_ENCR_ERROR_UNSUPP_CRYPT;
-+
- // set decrypter at import stream
- rStrm.SetDecrypter( xDecr );
-
-@@ -1107,7 +1111,7 @@
- pSet->Put( SfxStringItem(SID_PASSWORD, aPass) );
- }
-
-- return xDecr.is() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
-+ return xDecr->GetError();
- }
-
- // Document protection ========================================================
commit 51a48d78403df2bbbd0f97b9dfa47bdca9bd2042
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:30:26 2009 +0300
sc-simple-sort-include-format-header.diff is upstream
* patches/dev300/sc-simple-sort-include-format-header.diff: Delete.
* patches/dev300/apply: Remove it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8c72dff..77fea7a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -641,10 +641,6 @@ sc-read-only-colrow-resize.diff, jody
# Add a 'Natural' variant of sorting, blocking on ODF extension issues
sc-natural-sort.diff, i#26565, kohei
-# 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
-
# Allow 'june-2007' to be properly parsed as June 1 2007 in en-US locales.
sc-date-fix.diff, n#358750, jonp
diff --git a/patches/dev300/sc-simple-sort-include-format-header.diff b/patches/dev300/sc-simple-sort-include-format-header.diff
deleted file mode 100644
index 1182c01..0000000
--- a/patches/dev300/sc-simple-sort-include-format-header.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-@@ -367,7 +367,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
- aSortParam.bByRow = TRUE;
- aSortParam.bCaseSens = FALSE;
- aSortParam.bNaturalSort = FALSE;
-- aSortParam.bIncludePattern = FALSE;
-+ aSortParam.bIncludePattern = TRUE;
- aSortParam.bInplace = TRUE;
- aSortParam.bDoSort[0] = TRUE;
- aSortParam.nField[0] = nCol;
More information about the ooo-build-commit
mailing list