10 files changed, 18 insertions, 22 deletions
diff --git a/codemaker/source/bonobowrappermaker/corbaoptions.cxx b/codemaker/source/bonobowrappermaker/corbaoptions.cxx
index 3c644b6ff4dd..1bb75810031a 100644
--- a/codemaker/source/bonobowrappermaker/corbaoptions.cxx
+++ b/codemaker/source/bonobowrappermaker/corbaoptions.cxx
@@ -247,9 +247,8 @@ OString CorbaOptions::prepareHelp()
 
 OString CorbaOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
+    OString version(m_program);
     version += m_program + " Version 2.0\n\n";
-
     return version;
 }
 
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 1bc398391c9d..20ed3683a8bc 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -346,9 +346,8 @@ OString CppuOptions::prepareHelp()
 
 OString CppuOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/cunomaker/cunooptions.cxx b/codemaker/source/cunomaker/cunooptions.cxx
index 50a1223d004f..909ab3edc8dd 100644
--- a/codemaker/source/cunomaker/cunooptions.cxx
+++ b/codemaker/source/cunomaker/cunooptions.cxx
@@ -321,9 +321,8 @@ OString CunoOptions::prepareHelp()
 
 OString CunoOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 1.0\n\n";
-
+    OString version(m_program);
+    version += " Version 1.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/idlmaker/idloptions.cxx b/codemaker/source/idlmaker/idloptions.cxx
index 306e43293223..e495f555e5cb 100644
--- a/codemaker/source/idlmaker/idloptions.cxx
+++ b/codemaker/source/idlmaker/idloptions.cxx
@@ -242,9 +242,8 @@ OString IdlOptions::prepareHelp()
 
 OString IdlOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 24b9b1509cfc..5daedef06089 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -290,9 +290,8 @@ OString JavaOptions::prepareHelp()
 
 OString JavaOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }
 
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
index 13c09c8d1c94..76a833b6dd58 100755
--- a/cpputools/source/regcomplazy/regcomplazy.cxx
+++ b/cpputools/source/regcomplazy/regcomplazy.cxx
@@ -277,6 +277,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     serviceKey.closeKey();
     rootKey.closeKey();
     pReg->close();
+    delete pReg;
 
     return 0;
 }
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index c487d95c59a5..f13fae54c508 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -575,7 +575,7 @@ void DoIt::operator() (const OUString & url) throw()
 
             if ( ! _bSilent )
             {
-                fprintf(stderr, "register component '%s' in registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+                fprintf(stderr, "register component '%s' in registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
             }
 
         }
@@ -604,7 +604,7 @@ void DoIt::operator() (const OUString & url) throw()
             if (bRet)
             {
                 if ( ! _bSilent )
-                    fprintf(stderr, "revoke component '%s' from registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+                    fprintf(stderr, "revoke component '%s' from registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
             }
             else
             {
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index c90bce43b3bc..a115a2262fe1 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -343,8 +343,8 @@ OString Options::prepareHelp()
 
 OString Options::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 1.1\n\n";
+    OString version(m_program);
+    version += " Version 1.1\n\n";
     return version;
 }
 
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 4353721ad0b0..75ea3ec7958a 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -311,8 +311,8 @@ OString Options::prepareHelp()
 
 OString Options::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 1.0\n\n";
+    OString version(m_program);
+    version += " Version 1.0\n\n";
     return version;
 }
 
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 4e95d884de30..d4bbe8c21ee2 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -405,8 +405,8 @@ OString Options::prepareHelp()
 
 OString Options::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 1.0\n\n";
+    OString version(m_program);
+    version += " Version 1.0\n\n";
     return version;
 }