diff options
| author | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
|---|---|---|
| committer | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
| commit | d730f4672b31768f62d52ef7e673aec59d3a6a49 (patch) | |
| tree | 368ce5a8407eb6b68b32beda89138e012604fd72 /automation | |
| parent | 6c8cae77f8937bd4a717f1d099a44cba6173923f (diff) | |
| parent | d3af929cd34466863ef2699e3398b1fd0ffae337 (diff) | |
merge to m66
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 2 | ||||
| -rw-r--r-- | automation/source/testtool/objtest.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 2816d18285d3..1477220d5953 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -4288,7 +4288,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) Edit *pMyEd = new Edit(pDlg,WB_CENTER | WB_BORDER ); pMyEd->SetSizePixel(Size(100,30)); - pDlg->SetText(CUniString("Schlieen")); + pDlg->SetText(UniString("Schlieen", RTL_TEXTENCODING_ISO_8859_1)); pDlg->Show(); pMyEd->Show(); ULONG nTime = Time().GetTime(); diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 1e2ae5a63f1e..76e297c3de8a 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -521,6 +521,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d abGP.Append( "20" ); // Linux ia64 #elif defined LINUX && defined S390 abGP.Append( "21" ); // Linux S390 +#elif defined LINUX && defined HPPA + abGP.Append( "22" ); // Linux PA-RISC #else #error ("unknown platform. please request an ID for your platform on qa/dev") #endif |