[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/buildfix-toolkit-workben-layout.diff |   19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

New commits:
commit 82c9a044e9e18aa2584b47d89c33f714b870fc97
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:41:03 2011 +0300

    Make buildfix-toolkit-workben-layout.diff apply again

diff --git a/patches/dev300/buildfix-toolkit-workben-layout.diff b/patches/dev300/buildfix-toolkit-workben-layout.diff
index fdf8074..bf3025e 100644
--- a/patches/dev300/buildfix-toolkit-workben-layout.diff
+++ b/patches/dev300/buildfix-toolkit-workben-layout.diff
@@ -1,11 +1,3 @@
----
- toolkit/workben/layout/TEST       |    2 +-
- toolkit/workben/layout/test.cxx   |    5 +++++
- toolkit/workben/layout/tpsort.cxx |    2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git toolkit/workben/layout/TEST toolkit/workben/layout/TEST
-index 8a04a66..0eb0a94 100755
 --- toolkit/workben/layout/TEST
 +++ toolkit/workben/layout/TEST
 @@ -1,5 +1,5 @@
@@ -15,24 +7,20 @@ index 8a04a66..0eb0a94 100755
      if test -d $d; then
          export OOO_INSTALL_PREFIX=$d
  	break
-diff --git toolkit/workben/layout/test.cxx toolkit/workben/layout/test.cxx
-index 36a18d6..f911e4a 100644
 --- toolkit/workben/layout/test.cxx
 +++ toolkit/workben/layout/test.cxx
 @@ -199,6 +199,11 @@ void LayoutTest::ParseCommandLine()
          OUString aParam = OUString( GetCommandLineParam( i ) );
-         if ( aParam.equalsAscii( "-h" ) || aParam.equalsAscii( "--help" ) )
+         if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) )
              usage();
 +        if ( aParam.equalsAscii( "--oustring-cstr"))
 +            exit (printf ("%s: The strings: %s and %s.\n",
 +                          __PRETTY_FUNCTION__,
 +                          OUSTRING_CSTR (OUString::createFromAscii ("foo")),
 +                          OUSTRING_CSTR (OUString::createFromAscii ("bar"))));
-         if ( aParam.equalsAscii( "--inst" ) )
+         if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--inst" ) ) )
          {
              if ( i >= GetCommandLineParamCount() - 1)
-diff --git toolkit/workben/layout/tpsort.cxx toolkit/workben/layout/tpsort.cxx
-index 9f0684d..884cbf1 100644
 --- toolkit/workben/layout/tpsort.cxx
 +++ toolkit/workben/layout/tpsort.cxx
 @@ -442,7 +442,7 @@ void ScTabPageSortFields::FillFieldLists()
@@ -44,6 +32,3 @@ index 9f0684d..884cbf1 100644
                      }
                      nFieldArr[i] = col;
                      aLbSort1.InsertEntry( aFieldName, i );
--- 
-1.7.0.1
-