applied_patches/0464-oox-import-conditional-formatting.diff

   1 From a78961fb02542e6b8c8bb4f99f5816c82446d3ea Mon Sep 17 00:00:00 2001
   2 From: Jan Nieuwenhuizen <janneke@gnu.org>
   3 Date: Mon, 30 Mar 2009 12:40:45 +0200
   4 Subject: [PATCH] sc/source/ui/unoobj/tokenuno.cxx: ConvertToTokenArray must return 0 upon fail.
   5
   6 ScTokenConversion::ConvertTo* traditionally all return nonzero when
   7 successful, which is what callers expect.  This changed for
   8 ConvertToTokenArray when it outsourced parsing to formula/, returning
   9 what rTokenArray.Fill () returns -- which is 0 upon success.
  10 ---
  11  sc/source/ui/unoobj/tokenuno.cxx |    2 +-
  12  1 files changed, 1 insertions(+), 1 deletions(-)
  13
  14 diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
  15 index d2ce461..0c76cdb 100644
  16 --- sc/source/ui/unoobj/tokenuno.cxx
  17 +++ sc/source/ui/unoobj/tokenuno.cxx
  18 @@ -345,7 +345,7 @@ void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rR
  19  bool ScTokenConversion::ConvertToTokenArray( ScDocument& rDoc,
  20          ScTokenArray& rTokenArray, const uno::Sequence<sheet::FormulaToken>& rSequence )
  21  {
  22 -    return rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager());
  23 +    return !rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager());
  24  }
  25
  26  // static
  27 --
  28 1.6.0.rc1.49.g98a8
  29