blob: fdf807408c34b26eabc4bc0a040b412d0ff61b44 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
---
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 @@
#! /bin/sh
-for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
+for d in $(cd ../../../../.. && pwd)/ooo-git /usr/lib/ooo3/; do
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" ) )
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 ( 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()
{
aFieldName = aStrColumn;
aFieldName += ' ';
- aFieldName += ColToAlpha( col );
+ aFieldName += ScColToAlpha( col );
}
nFieldArr[i] = col;
aLbSort1.InsertEntry( aFieldName, i );
--
1.7.0.1
|
