7 files changed, 10 insertions, 14 deletions
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index fec900c8578e..6675753a67f9 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -270,7 +270,7 @@ Reference< XContentProviderManager > InitializeUCB( void )
     return xUcb;
 }
 
-void MyApp::Main()
+int MyApp::Main()
 {
     Reference< XContentProviderManager > xUcb = InitializeUCB();
     LanguageType aRequestedLanguage;
@@ -299,6 +299,7 @@ void MyApp::Main()
     RemoteControl aRC;
 
     Execute();
+    return EXIT_SUCCESS;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index bc06f0bd9dce..498ee04af136 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -92,7 +92,7 @@ class MyApp : public Application
 
 public:
     MyApp();
-    void Main();
+    int Main();
 
     virtual void                Property( ApplicationProperty& );
     virtual PlugInDispatcher*   GetDispatcher();
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index fe9afc3deb3c..23eb3bc7e1bb 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -39,7 +39,7 @@
 #include "svcommstream.hxx"
 #include <basic/testtool.hrc>
 
-ControlDefLoad __READONLY_DATA CmdStream::arKeyCodes [] =
+ControlDefLoad const CmdStream::arKeyCodes [] =
 #include <keycodes.hxx>
 CNames *CmdStream::pKeyCodes = NULL;
 
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index fb8b49f6106e..547f80bcc26e 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -60,7 +60,7 @@ public:
     SvMemoryStream* GetStream();
 
     static CNames *pKeyCodes;           // Namen der Sondertasten  MOD1, F1, LEFT ...
-    static ControlDefLoad __READONLY_DATA arKeyCodes [];
+    static ControlDefLoad const arKeyCodes [];
 
 private:
     String WandleKeyEventString( String aKeys );    // Nutzt pKeyCodes.  <RETURN> <SHIFT LEFT LEFT>
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 5c954dd70996..c1c0d5c54b6f 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -105,11 +105,11 @@ static CommunicationFactory aComManFac;
 #define KEEP_SEQUENCES      100         // Keep Names of last 100 Calls
 
 
-ControlDefLoad __READONLY_DATA Controls::arClasses [] =
+ControlDefLoad const Controls::arClasses [] =
 #include "classes.hxx"
 CNames *Controls::pClasses = NULL;
 
-ControlDefLoad __READONLY_DATA TestToolObj::arR_Cmds [] =
+ControlDefLoad const TestToolObj::arR_Cmds [] =
 #include "r_cmds.hxx"
 CNames *TestToolObj::pRCommands = NULL;
 CErrors *TestToolObj::pFehlerListe = NULL;      // Hier werden die Fehler des Testtools gespeichert
@@ -3862,7 +3862,7 @@ String TestToolObj::GetKeyName( USHORT nKeyCode )
 
 void TestToolObj::ReplaceNumbers(String &aText)
 {
-static ControlDefLoad __READONLY_DATA arRes_Type [] =
+static ControlDefLoad const arRes_Type [] =
 #include "res_type.hxx"
 
     static CNames *pRTypes = NULL;
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index f60732b5d3fa..f70270a77a6d 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -236,7 +236,7 @@ public:
     virtual SbxVariable* Find( const String&, SbxClassType );
     SbxTransportMethodRef pMethodVar;     // zum Transport von Find nach Notify
     static CNames  *pClasses;
-    static ControlDefLoad __READONLY_DATA arClasses [];
+    static ControlDefLoad const arClasses [];
 };
 SV_DECL_IMPL_REF(Controls);
 
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index e92a93eb36a5..575f79c549fb 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -31,11 +31,6 @@
 #include <svl/svarray.hxx>
 
 #include <osl/thread.hxx>
-
-#ifndef _STRING_LIST
-DECLARE_LIST( StringList, String * )
-#define _STRING_LIST
-#endif
 #include <basic/process.hxx>
 
 class Process;