[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                  |    3 -
 patches/dev300/oox-import-conditional-formatting.diff |   29 ------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit 098ab0954fd295fe745b4d7474cd6c323ea80f65
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:15:24 2009 +0300

    oox-import-conditional-formatting.diff is upstream
    
    * patches/dev300/oox-import-conditional-formatting.diff: Has been
      upstreamed, i#100544 is fixed and verified. Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0262856..ed6be00 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1834,9 +1834,8 @@ oox-import-chart-externalref.diff, n#480868, janneke
 # it isn't trivial to make it apply. I am unsure whether the expected
 # semantics of the function being patched has changed.  Actual
 # understanding of the code needed.
-#oox-import-table-autofilter.diff, n#479381, janneke
+# oox-import-table-autofilter.diff, n#479381, janneke
 
-oox-import-conditional-formatting.diff, n#479396, i#100544, janneke
 oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 oox-fix-ole2.diff, n#485418, rodo
 oox-custom-shape-polygons.diff, n#485418, rodo
diff --git a/patches/dev300/oox-import-conditional-formatting.diff b/patches/dev300/oox-import-conditional-formatting.diff
deleted file mode 100644
index e8421b6..0000000
--- a/patches/dev300/oox-import-conditional-formatting.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From a78961fb02542e6b8c8bb4f99f5816c82446d3ea Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke at gnu.org>
-Date: Mon, 30 Mar 2009 12:40:45 +0200
-Subject: [PATCH] sc/source/ui/unoobj/tokenuno.cxx: ConvertToTokenArray must return 0 upon fail.
-
-ScTokenConversion::ConvertTo* traditionally all return nonzero when
-successful, which is what callers expect.  This changed for
-ConvertToTokenArray when it outsourced parsing to formula/, returning
-what rTokenArray.Fill () returns -- which is 0 upon success.
----
- sc/source/ui/unoobj/tokenuno.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
-index d2ce461..0c76cdb 100644
---- sc/source/ui/unoobj/tokenuno.cxx
-+++ sc/source/ui/unoobj/tokenuno.cxx
-@@ -345,7 +345,7 @@ void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rR
- bool ScTokenConversion::ConvertToTokenArray( ScDocument& rDoc,
-         ScTokenArray& rTokenArray, const uno::Sequence<sheet::FormulaToken>& rSequence )
- {
--    return rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager());
-+    return !rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager());
- }
- 
- // static
--- 
-1.6.0.rc1.49.g98a8
-