diff options
| author | sb <sb@openoffice.org> | 2009-12-07 09:34:25 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-12-07 09:34:25 +0100 |
| commit | 314047c8e70e3bf421e5fd72bfef4bbcc74aec0c (patch) | |
| tree | ec72db97e56686a48bb3e6679e03da6051a91068 /automation | |
| parent | 1b430ca5302c73fdf5f98b56d2c61bc11085491c (diff) | |
| parent | d3af929cd34466863ef2699e3398b1fd0ffae337 (diff) | |
merged in DEV300_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 4219d1d5b099..65be45907b90 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("Schließen")); + pDlg->SetText(UniString("Schließen", 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 5f1e20749a52..4f128ccd8735 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -519,6 +519,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 |