[Libreoffice-commits] core.git: 2 commits - bridges/test linguistic/source

[Stephan Bergmann]

 bridges/test/java_remote/Bug107753_Test.java |    2 +-
 linguistic/source/lngsvcmgr.cxx              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca5e9c628132d1b57fc705f1844ffb6aaa2b4662
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 30 17:36:57 2015 +0200

    Revert "Revert "Typo: repsent->represent""
    
    This reverts commit 09b4cbe977c755a447f97034189b85998f358d79,
    no good reason to revert the original commit in the first place.
    
    Conflicts:
    	bridges/test/java_remote/Bug107753_Test.java
    
    Change-Id: I6d3d50887460fd15080c46782c29a653c3684bec

diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index 34e5112..46ff857 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -32,7 +32,7 @@ import test.lib.TestBed;
  *
  * <p>Bug #107753# "Java UNO: Proxies should implement intuitive semantics of
  * equals and hashCode" requests that two proxies are equal iff they represent
- * the same UNO object.  This implies that if two proxies repsent the same UNO
+ * the same UNO object.  This implies that if two proxies represent the same UNO
  * object, they must have the same hash code.</p>
  */
 public final class Bug107753_Test extends ComplexTestCase {
commit bfc8185dd010fed0d149b976040be416dd7b674d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 30 17:34:08 2015 +0200

    Revert "Revert "Wrong comment with 'sal_True' instead of 'true'""
    
    This reverts commit 262dbabe8e07f60d55461ab3fb2c26d37b86a311,
    no good reason to revert the original commit in the first place.
    
    Conflicts:
    	linguistic/source/lngsvcmgr.cxx
    
    Change-Id: Ifa1896da3ec3fd291a9b30a9a6734bdcce406b99

diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index a9a74f1..81fc410 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1635,7 +1635,7 @@ uno::Sequence< lang::Locale > SAL_CALL
 static bool IsEqSvcList( const uno::Sequence< OUString > &rList1,
                         const uno::Sequence< OUString > &rList2 )
 {
-    // returns sal_True iff both sequences are equal
+    // returns true iff both sequences are equal
 
     bool bRes = false;
     sal_Int32 nLen = rList1.getLength();