resync to trunk (close to AOO400)

6 files changed, 10 insertions, 15 deletions

diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index a2f87ccc28e9..daa0d586e397 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -314,7 +314,7 @@ public class EventTest {
      * <CODE>m_keyReleased</CODE> are <CODE>TRUE</CODE>
      * @param xUII the XUserInputInterception
      * @param xModel the XModel of a document
-     * @see EventTest.MyKeyHander
+     * @see EventTest.MyKeyHandler
      * @see EventTest.EventTrigger
      */
     private void checkKeyListener(XUserInputInterception xUII, XModel xModel) {
@@ -620,4 +620,4 @@ public class EventTest {
 
     private static final OfficeConnection connection = new OfficeConnection();
 
-}
\ No newline at end of file
+}
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index bf4656231560..3e8361566a61 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -2,7 +2,6 @@ job1=cached.CachedContentResultSetFactory
 job2=cached.CachedContentResultSetStubFactory
 job3=cached.CachedDynamicResultSetFactory
 job4=cached.CachedDynamicResultSetStubFactory
-job5=cmdmail.SimpleCommandMail
 job6=corereflection.uno.CoreReflection
 job7=dbaccess.DBContentLoader
 job8=dbaccess.OCommandDefinition
@@ -64,7 +63,6 @@ job63=mcnttype.MimeContentTypeFactory
 job64=namingservice.uno.NamingService
 job65=nestedreg.uno.NestedRegistry
 job66=proxyfac.uno.ProxyFactory
-job67=proxyset.SOffice52ProxySettings
 job68=regtypeprov.uno.RegistryTypeDescriptionProvider
 job69=remotebridge.uno.various
 job70=sc.AccessibleEditableTextPara_HeaderFooter
diff --git a/framework/qa/complex/api_internal/worksforme.sce b/framework/qa/complex/api_internal/worksforme.sce
index 710d1f19b7aa..0d4335c694df 100644
--- a/framework/qa/complex/api_internal/worksforme.sce
+++ b/framework/qa/complex/api_internal/worksforme.sce
@@ -18,9 +18,7 @@
 #  under the License.
 #  
 # *************************************************************
-job=cmdmail.SimpleCommandMail
 job=fileacc.SimpleFileAccess
-job=proxyset.SOffice52ProxySettings
 job=sc.ScCellFieldObj
 job=sc.ScCellFieldsObj
 job=sc.XMLImporter
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 91ac0a8f33cc..271d4bdf977e 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -531,7 +531,7 @@ public class Protocol extends JComponent
      * @param   sMessage
      *              the pure message
      *
-     * @see     log(type,message)
+     * @see     #log(int, String)
      */
     public synchronized void log( /*IN*/ String sMessage )
     {
@@ -761,8 +761,8 @@ public class Protocol extends JComponent
      *
      * @return  A string, which includes the whole header.
      *
-     * @see     finish()
-     * @see     generateHTMLFooter()
+     * @see     #finish()
+     * @see     #impl_generateHTMLFooter()
      */
     private String impl_generateHTMLHeader()
     {
@@ -791,7 +791,7 @@ public class Protocol extends JComponent
      * @param   sOut
      *              used to generate the log output there.
      *
-     * @param   lProps/aProp
+     * @param   lProps
      *              represent the property(array) to be logged.
      */
     private void impl_logPropertyArray( /*OUT*/ StringBuffer                       sOut   ,
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index d5934cda3997..58c530a2d7fb 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -532,7 +532,7 @@ public class RecoveryTest extends ComplexTestCase {
 
     /**
      * This function uses accessibility to handle the dialog "Are you sure".
-     * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
+     * It click "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
      * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
      * "No".
      */
@@ -551,8 +551,8 @@ public class RecoveryTest extends ComplexTestCase {
 
     /**
      * This function uses accessibility to handle the dialog "Are you sure".
-     * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
-     * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
+     * It click "Yes" or "No", depending on the value of the parameter <CODE>Yes</CODE>
+     * @param saveDocuments If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
      * "No".
      */
     private void handleSaveDocumentsDialog(boolean saveDocuments)
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 86877ac7f1d2..1986ceb930c4 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -147,7 +147,6 @@ public class RecoveryTools {
     /**
      * remove the content of the user backup folder and removes the Recovery.xcu. This
      * was done from the Office via XSimpleFileAccess
-     * @param xMSF a <CODE>XMultiServiceFactory</CODE> to get <CODE>XSimpleFileAccess</CODE>
      * @throws com.sun.star.io.IOException the exception was thrown if something goes wrong.
      */
     public void cleanRecoveryData()
@@ -359,4 +358,4 @@ public class RecoveryTools {
    }
 
 
-}
\ No newline at end of file
+}