[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - bean/java officecfg/registry

[Libreoffice Gerrit user]

 bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java    |   15 +++------
 bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java   |    2 -
 bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java |    1 
 officecfg/registry/data/org/openoffice/Office/UI/makefile.mk                       |   16 +++++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

New commits:
commit af053aa10a25381ca98b79134e98047e0bb36ed6
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue Feb 12 10:40:56 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Tue Feb 12 10:40:56 2019 +0000

    Removed whitespace, added vim modeline

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index f1b446db9b43..d7c5fd604a87 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 
@@ -26,12 +26,11 @@ PRJNAME=officecfg
 TARGET=data_ooOUI
 PACKAGE=org.openoffice.Office.UI
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 # --- Targets ------------------------------------------------------
 
-
 LOCALIZEDFILES= \
     BasicIDECommands.xcu \
     BibliographyCommands.xcu \
@@ -72,5 +71,6 @@ XCUFILES= \
     Factories.xcu \
     GlobalSettings.xcu
 
-.INCLUDE :  target.mk
+.INCLUDE : target.mk
 
+# vim: set noet ts=4 sw=4:
commit 0feda93d32f102aa538b4ff0cb6889c73e494d1b
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue Feb 12 10:34:11 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Tue Feb 12 10:34:11 2019 +0000

    Removed whitespace, fixed typos

diff --git a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
index f6b198c8e8c2..89e5abc242ed 100644
--- a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
@@ -23,14 +23,13 @@
 
 package com.sun.star.comp.beans;
 
-
 //---------------------------------------------------------------------------
-/** Helper class to watch calls into OOo with a timeout.
+/** Helper class to watch calls into AOO with a timeout.
  */
-//Do not add the thread instances to a threadgroup. When testing the bean in
-//an applet it turned out the the ThreadGroup was in an inconsistent state
-//after navigating off the site that contains the applet and back to it.
-//That was tested with a Sun JRE 1.4.2_06
+// Do not add the thread instances to a threadgroup. When testing the bean in
+// an applet it turned out the the ThreadGroup was in an inconsistent state
+// after navigating off the site that contains the applet and back to it.
+// That was tested with a Sun JRE 1.4.2_06
 public class CallWatchThread extends Thread
 {
     private static boolean DEBUG = false;
@@ -118,7 +117,3 @@ public class CallWatchThread extends Thread
             System.err.println( "OOoBean: " + aMessage );
     }
 }
-
-
-
-
diff --git a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
index ba8ab5b7fac3..f546739969c1 100644
--- a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
@@ -26,7 +26,7 @@ package com.sun.star.comp.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface represents an AWT container factory.
  *
  * @deprecated
  *
diff --git a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 8dbcf90b420d..f43bb2741ec2 100644
--- a/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -115,4 +115,3 @@ import com.sun.star.awt.*;
     {
     }
 }
-