From 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 14 Jul 2014 19:09:11 +0000 Subject: Resync to trunk, windows non-pro build --- odk/examples/java/DocumentHandling/DocumentLoader.java | 2 +- odk/examples/java/DocumentHandling/DocumentPrinter.java | 2 +- odk/examples/java/EmbedDocument/Container1/EmbedContApp.java | 2 +- odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java | 4 ++-- odk/examples/java/Inspector/TestInspector.java | 2 +- odk/examples/java/NotesAccess/NotesAccess.java | 2 +- odk/examples/java/Spreadsheet/ChartTypeChange.java | 4 ++-- odk/examples/java/Storage/Test01.java | 2 +- odk/examples/java/Storage/Test04.java | 2 +- odk/examples/java/Storage/Test07.java | 2 +- odk/examples/java/Storage/Test08.java | 2 +- odk/examples/java/Storage/Test09.java | 2 +- odk/examples/java/Text/GraphicsInserter.java | 2 +- odk/examples/java/ToDo/ToDo.java | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'odk/examples/java') diff --git a/odk/examples/java/DocumentHandling/DocumentLoader.java b/odk/examples/java/DocumentHandling/DocumentLoader.java index e83b8f569dac..79305da747e4 100644 --- a/odk/examples/java/DocumentHandling/DocumentLoader.java +++ b/odk/examples/java/DocumentHandling/DocumentLoader.java @@ -64,7 +64,7 @@ public class DocumentLoader { sUrl = sbTmp.toString(); } - // Load a Writer document, which will be automaticly displayed + // Load a Writer document, which will be automatically displayed com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL( sUrl, "_blank", 0, new com.sun.star.beans.PropertyValue[0]); diff --git a/odk/examples/java/DocumentHandling/DocumentPrinter.java b/odk/examples/java/DocumentHandling/DocumentPrinter.java index 7d126ce088dd..90a360fb934d 100644 --- a/odk/examples/java/DocumentHandling/DocumentPrinter.java +++ b/odk/examples/java/DocumentHandling/DocumentPrinter.java @@ -58,7 +58,7 @@ public class DocumentPrinter { StringBuffer sUrl = new StringBuffer("file:///"); sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/')); - // Load a Writer document, which will be automaticly displayed + // Load a Writer document, which will be automatically displayed com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL( sUrl.toString(), "_blank", 0, new com.sun.star.beans.PropertyValue[0] ); diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java index e2ab9b7e90a2..3bb4b2e3a79f 100644 --- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java +++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java @@ -381,7 +381,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie public void actionPerformed( ActionEvent e ) { - // if has persistance store there + // if has persistence store there // if not open SaveAs dialog and store if ( m_xStorage != null && m_xEmbedObj != null ) { diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java index db29eed00258..5ab82211121a 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java @@ -392,10 +392,10 @@ public final class OwnEmbeddedObject extends WeakBase && ( m_nObjectState == -1 || nEntryConnectionMode != com.sun.star.embed.EntryInitModes.NO_INIT ) ) { // if the object is not loaded - // it can not get persistant representation without initialization + // it can not get persistent representation without initialization // if the object is loaded - // it can switch persistant representation only without initialization + // it can switch persistent representation only without initialization throw new com.sun.star.embed.WrongStateException(); } diff --git a/odk/examples/java/Inspector/TestInspector.java b/odk/examples/java/Inspector/TestInspector.java index b3bf11d0aaf5..6eb511069799 100644 --- a/odk/examples/java/Inspector/TestInspector.java +++ b/odk/examples/java/Inspector/TestInspector.java @@ -62,7 +62,7 @@ public class TestInspector { com.sun.star.frame.XComponentLoader xCmpLoader = (com.sun.star.frame.XComponentLoader)UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext)); - // Load a new spreadsheet document, which will be automaticly + // Load a new spreadsheet document, which will be automatically // displayed and is used for inspection com.sun.star.lang.XComponent xComp = xCmpLoader.loadComponentFromURL("private:factory/scalc", "_blank", 0, new com.sun.star.beans.PropertyValue[0] ); xInstInspector.inspect(xCmpLoader, ""); diff --git a/odk/examples/java/NotesAccess/NotesAccess.java b/odk/examples/java/NotesAccess/NotesAccess.java index e2fb30bf5b18..5e4a6ab01465 100644 --- a/odk/examples/java/NotesAccess/NotesAccess.java +++ b/odk/examples/java/NotesAccess/NotesAccess.java @@ -144,7 +144,7 @@ public class NotesAccess implements Runnable { xMCF.createInstanceWithContext( "com.sun.star.frame.Desktop", xContext)); - // Load a Writer document, which will be automaticly displayed + // Load a Writer document, which will be automatically displayed XComponent xComponent = xLoader.loadComponentFromURL( "private:factory/scalc", "_blank", 0, new PropertyValue[0] ); diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java index 415ce870a129..c426eb2b1124 100644 --- a/odk/examples/java/Spreadsheet/ChartTypeChange.java +++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java @@ -176,7 +176,7 @@ public class ChartTypeChange { xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xCompContext ) ); - // Load a Writer document, which will be automaticly displayed + // Load a Writer document, which will be automatically displayed XComponent xComponent = xComponentloader.loadComponentFromURL( "file:///" + stringFileName, "_blank", 0, new PropertyValue[0] ); @@ -223,7 +223,7 @@ public class ChartTypeChange { "com.sun.star.frame.Desktop", xCompContext ) ); - // Create an empty calc document, which will be automaticly displayed + // Create an empty calc document, which will be automatically displayed XComponent xComponent = xcomponentloader.loadComponentFromURL( "private:factory/scalc", "_blank", 0, new PropertyValue[0] ); diff --git a/odk/examples/java/Storage/Test01.java b/odk/examples/java/Storage/Test01.java index 9cf22f30ddac..fc669dfcd991 100644 --- a/odk/examples/java/Storage/Test01.java +++ b/odk/examples/java/Storage/Test01.java @@ -118,7 +118,7 @@ public class Test01 implements StorageTest { } // copy xTempStorage to xTempFileStorage - // xTempFileStorage will be automatically commited + // xTempFileStorage will be automatically committed if ( !m_aTestHelper.copyStorage( xTempStorage, xTempFileStorage ) ) return false; diff --git a/odk/examples/java/Storage/Test04.java b/odk/examples/java/Storage/Test04.java index ec123295b6e5..9d0f623542de 100644 --- a/odk/examples/java/Storage/Test04.java +++ b/odk/examples/java/Storage/Test04.java @@ -142,7 +142,7 @@ public class Test04 implements StorageTest { if ( !m_aTestHelper.copyElementTo( xTempStorage, "SubStorage1", xTempFileStorage ) ) return false; - // if storage is not commited before disposing all the changes will be lost + // if storage is not committed before disposing all the changes will be lost if ( !m_aTestHelper.commitStorage( xTempSubStorage2 ) ) return false; diff --git a/odk/examples/java/Storage/Test07.java b/odk/examples/java/Storage/Test07.java index 753ad803856d..ad8b7559e697 100644 --- a/odk/examples/java/Storage/Test07.java +++ b/odk/examples/java/Storage/Test07.java @@ -96,7 +96,7 @@ public class Test07 implements StorageTest { } // copy xTempStorage to xTempFileStorage - // xTempFileStorage will be automatically commited + // xTempFileStorage will be automatically committed if ( !m_aTestHelper.copyStorage( xTempStorage, xTempFileStorage ) ) return false; diff --git a/odk/examples/java/Storage/Test08.java b/odk/examples/java/Storage/Test08.java index d8f0b52f9602..c8054fb24ed8 100644 --- a/odk/examples/java/Storage/Test08.java +++ b/odk/examples/java/Storage/Test08.java @@ -151,7 +151,7 @@ public class Test08 implements StorageTest { } // copy xTempStorage to xTempFileStorage - // xTempFileStorage will be automatically commited + // xTempFileStorage will be automatically committed if ( !m_aTestHelper.copyStorage( xTempStorage, xTempFileStorage ) ) return false; diff --git a/odk/examples/java/Storage/Test09.java b/odk/examples/java/Storage/Test09.java index e31b810ba083..0d93cdd4d142 100644 --- a/odk/examples/java/Storage/Test09.java +++ b/odk/examples/java/Storage/Test09.java @@ -93,7 +93,7 @@ public class Test09 implements StorageTest { } // copy xTempStorage to xTempFileStorage - // xTempFileStorage will be automatically commited + // xTempFileStorage will be automatically committed if ( !m_aTestHelper.copyStorage( xTempStorage, xTempFileStorage ) ) return false; diff --git a/odk/examples/java/Text/GraphicsInserter.java b/odk/examples/java/Text/GraphicsInserter.java index 7676cd16f938..3f8c5c734647 100644 --- a/odk/examples/java/Text/GraphicsInserter.java +++ b/odk/examples/java/Text/GraphicsInserter.java @@ -66,7 +66,7 @@ public class GraphicsInserter { (com.sun.star.frame.XComponentLoader)UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, xDesktop); - // Load a Writer document, which will be automaticly displayed + // Load a Writer document, which will be automatically displayed com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL( "private:factory/swriter", "_blank", 0, new com.sun.star.beans.PropertyValue[0]); diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 9a50cc0627fd..789d129aadde 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -905,7 +905,7 @@ public class ToDo { /** Writing the stack trace from an exception to a string and calling * the method showMessage() with this string. - * @param exception The occured exception. + * @param exception The occurred exception. * @see showMessage */ public void showExceptionMessage( Exception exception ) { -- cgit