applied_patches/0515-buildfix-toolkit-workben-layout.diff

   1 From ee27cb3ed00fa379a3b9eb3b7194717c4997f977 Mon Sep 17 00:00:00 2001
   2 From: Jan Nieuwenhuizen <janneke@gnu.org>
   3 Date: Tue, 31 Mar 2009 14:13:38 +0200
   4 Subject: [PATCH] toolkit/workben/layout: build fix and oustring test.
   5
   6 ---
   7  toolkit/workben/layout/TEST       |    2 +-
   8  toolkit/workben/layout/test.cxx   |    5 +++++
   9  toolkit/workben/layout/tpsort.cxx |    2 +-
  10  3 files changed, 7 insertions(+), 2 deletions(-)
  11
  12 diff --git toolkit/workben/layout/TEST toolkit/workben/layout/TEST
  13 index 8a04a66..0eb0a94 100644
  14 --- toolkit/workben/layout/TEST
  15 +++ toolkit/workben/layout/TEST
  16 @@ -1,5 +1,5 @@
  17  #! /bin/sh
  18 -for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
  19 +for d in $(cd ../../../../.. && pwd)/ooo-git /usr/lib/ooo3/; do
  20      if test -d $d; then
  21          export OOO_INSTALL_PREFIX=$d
  22         break
  23 diff --git toolkit/workben/layout/test.cxx toolkit/workben/layout/test.cxx
  24 index 9bb9608..5d63b42 100644
  25 --- toolkit/workben/layout/test.cxx
  26 +++ toolkit/workben/layout/test.cxx
  27 @@ -204,6 +204,11 @@ void LayoutTest::ParseCommandLine()
  28          OUString aParam = OUString( GetCommandLineParam( i ) );
  29          if ( aParam.equalsAscii( "-h" ) || aParam.equalsAscii( "--help" ) )
  30              usage();
  31 +        if ( aParam.equalsAscii( "--oustring-cstr"))
  32 +            exit (printf ("%s: The strings: %s and %s.\n",
  33 +                          __PRETTY_FUNCTION__,
  34 +                          OUSTRING_CSTR (OUString::createFromAscii ("foo")),
  35 +                          OUSTRING_CSTR (OUString::createFromAscii ("bar"))));
  36          if ( aParam.equalsAscii( "--inst" ) )
  37          {
  38              if ( i >= GetCommandLineParamCount() - 1)
  39 diff --git toolkit/workben/layout/tpsort.cxx toolkit/workben/layout/tpsort.cxx
  40 index 6770232..c5534c0 100644
  41 --- toolkit/workben/layout/tpsort.cxx
  42 +++ toolkit/workben/layout/tpsort.cxx
  43 @@ -445,7 +445,7 @@ void ScTabPageSortFields::FillFieldLists()
  44                                         {
  45                                                 aFieldName      = aStrColumn;
  46                                                 aFieldName += ' ';
  47 -                                               aFieldName += ColToAlpha( col );
  48 +                                               aFieldName += ScColToAlpha( col );
  49                                         }
  50                                         nFieldArr[i] = col;
  51                                         aLbSort1.InsertEntry( aFieldName, i );
  52 --
  53 1.6.0.rc1.49.g98a8
  54