[Libreoffice-commits] .: autodoc/inc autodoc/source odk/examples odk/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Dec 6 01:17:23 PST 2010
autodoc/inc/ary/idl/i_type.hxx | 2 -
autodoc/source/ary/inc/cross_refs.hxx | 2 -
autodoc/source/ary/inc/sorted_idset.hxx | 2 -
autodoc/source/parser/inc/tokens/tokproct.hxx | 2 -
autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx | 2 -
autodoc/source/parser_i/inc/tokens/tkp2.hxx | 2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt | 2 -
odk/examples/DevelopersGuide/Forms/DataAwareness.java | 2 -
odk/examples/DevelopersGuide/Forms/KeyGenerator.java | 2 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 2 -
odk/examples/java/ToDo/ToDo.java | 2 -
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 14 +++++-----
odk/source/unoapploader/unx/unoapploader.c | 4 +-
odk/source/unoapploader/win/unoapploader.c | 4 +-
14 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit f0cde80933fff1ab69e34846d81ccc1b076ac419
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Dec 4 13:23:55 2010 +0900
Replace all occured, occurance etc.
diff --git a/autodoc/inc/ary/idl/i_type.hxx b/autodoc/inc/ary/idl/i_type.hxx
index 086ac3f..be2e618 100644
--- a/autodoc/inc/ary/idl/i_type.hxx
+++ b/autodoc/inc/ary/idl/i_type.hxx
@@ -58,7 +58,7 @@ class Type_2s
/** Base of all IDL types.
- Type represents the occurence of a type as base,
+ Type represents the occurrence of a type as base,
parameter, return type or element type in UNO IDL code.
Some of them relate to a ->CodeEntity, but
the ->Type "MyInterface" is something different than
diff --git a/autodoc/source/ary/inc/cross_refs.hxx b/autodoc/source/ary/inc/cross_refs.hxx
index 53b5c2e..7e7cbe5 100644
--- a/autodoc/source/ary/inc/cross_refs.hxx
+++ b/autodoc/source/ary/inc/cross_refs.hxx
@@ -44,7 +44,7 @@ class CrossReferences
public:
typedef TYPES::element_type element;
- /// Checks for double occurences
+ /// Checks for double occurrences
void Add(
VALUE_LIST::index_type
i_nPosition
diff --git a/autodoc/source/ary/inc/sorted_idset.hxx b/autodoc/source/ary/inc/sorted_idset.hxx
index 9db3731..6373b15 100644
--- a/autodoc/source/ary/inc/sorted_idset.hxx
+++ b/autodoc/source/ary/inc/sorted_idset.hxx
@@ -44,7 +44,7 @@ template <class XY> class SortedIdSet;
class Interface_2s
{
public:
- /// Checks for double occurences
+ /// Checks for double occurrences
void Add_ExportingService(
Ce_id i_nId );
void Get_ExportingServices(
diff --git a/autodoc/source/parser/inc/tokens/tokproct.hxx b/autodoc/source/parser/inc/tokens/tokproct.hxx
index 401e3fe..19d8c77 100644
--- a/autodoc/source/parser/inc/tokens/tokproct.hxx
+++ b/autodoc/source/parser/inc/tokens/tokproct.hxx
@@ -56,7 +56,7 @@ class TokenProcessing_Types
stay, // same parse environment
push, // push sub environment
pop_success, // return to parent environment, parsing was successful
- pop_failure // return to parent environment, but an error occured.
+ pop_failure // return to parent environment, but an error occurred.
};
struct TokenProcessing_Result
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
index ccacd3e..f4567c7 100644
--- a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
@@ -64,7 +64,7 @@ class TokenProcessing_Types
push_sure, // push sub environment, which must be the correct one
push_try, // push sub environment, which is tried, if it may be the right one
pop_success, // return to parent environment, parsing was successful
- pop_failure // return to parent environment, but an error occured.
+ pop_failure // return to parent environment, but an error occurred.
};
struct TokenProcessing_Result
diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx
index f5d9839..ae65eef 100644
--- a/autodoc/source/parser_i/inc/tokens/tkp2.hxx
+++ b/autodoc/source/parser_i/inc/tokens/tkp2.hxx
@@ -65,7 +65,7 @@ class TokenParse2
source code.
@return true, if there was passed a valid token.
false, if the parsed stream is finished or
- an error occured.
+ an error occurred.
*/
bool GetNextToken();
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt
index 910137a..c2b5471 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt
@@ -1,7 +1,7 @@
How to write my own sdbc driver
Pre implementation steps
-- search all occurances of skeleton and replace them to a name which you prefer
+- search all occurrences of skeleton and replace them to a name which you prefer
1. Implement a class called driver or modify the existing skeleton -> have a look at SDriver.?xx
2. Implement a class called connection -> have a look at SConnection.?xx
diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
index bedf0b4..4395e99 100644
--- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java
+++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
@@ -219,7 +219,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan
/* ------------------------------------------------------------------ */
public void resetted( EventObject aEvent ) throws com.sun.star.uno.RuntimeException
{
- // check if this reset occured becase we're on a new record
+ // check if this reset occurred becase we're on a new record
XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source );
try
{
diff --git a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
index 324090e..87a5d11 100644
--- a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
+++ b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
@@ -249,7 +249,7 @@ class KeyGeneratorForReset extends UniqueColumnValue implements XResetListener
/* ------------------------------------------------------------------ */
public void resetted( com.sun.star.lang.EventObject aEvent ) throws com.sun.star.uno.RuntimeException
{
- // check if this reset occured becase we're on a new record
+ // check if this reset occurred becase we're on a new record
XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source );
try
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 9e04ddc..caed82f 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -410,7 +410,7 @@ public class FunctionHelper
catch(com.sun.star.uno.Exception exUno)
{
// "createInstance()" method of used service manager can throw it.
- // If it occured during creation of desktop service the frame already was created.
+ // If it occurred during creation of desktop service the frame already was created.
// Free it by decresing his refcount. Changes on the desktop tree couldn't exist.
// Without the desktop service that wasn't possible. So no further rollbacks must follow.
if(xFrame!=null)
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index df6310b..dcb7ea8 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -916,7 +916,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 ) {
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index f528532..b0903f3 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -79,7 +79,7 @@ final class InstallationFinder {
* Gets the path of a UNO installation.
*
* @return the installation path or <code>null</code>, if no installation
- * was specified or found, or if an error occured
+ * was specified or found, or if an error occurred
*/
public static String getPath() {
@@ -140,7 +140,7 @@ final class InstallationFinder {
* java -D<property name>=<installation path> -jar application.jar.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was specified in the Java system property or if an error occured
+ * was specified in the Java system property or if an error occurred
*/
private static String getPathFromProperty( String prop ) {
@@ -164,7 +164,7 @@ final class InstallationFinder {
* Java versions.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was specified in the environment variable or if an error occured
+ * was specified in the environment variable or if an error occurred
*/
private static String getPathFromEnvVar( String var ) {
@@ -188,7 +188,7 @@ final class InstallationFinder {
* <p>This method is called on the Windows platform only.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was found or if an error occured
+ * was found or if an error occurred
*/
private static String getPathFromWindowsRegistry() {
@@ -227,7 +227,7 @@ final class InstallationFinder {
* Java versions.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was found or if an error occured
+ * was found or if an error occurred
*/
private static String getPathFromPathEnvVar() {
@@ -286,7 +286,7 @@ final class InstallationFinder {
* is in one of the directories listed in the PATH environment variable.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was found or if an error occured
+ * was found or if an error occurred
*/
private static String getPathFromWhich() {
@@ -382,7 +382,7 @@ final class InstallationFinder {
* OOo 2.0.</p>
*
* @return the installation path or <code>null</code>, if no installation
- * was found or if an error occured
+ * was found or if an error occurred
*/
private static String getPathFromSVersionFile() {
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index a36f8fd..3ea8f88 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -231,7 +231,7 @@ int main( int argc, char *argv[] )
* Gets the path of a UNO installation.
*
* @return the installation path or NULL, if no installation was specified or
- * found, or if an error occured
+ * found, or if an error occurred
*/
char const* getPath()
{
@@ -255,7 +255,7 @@ char const* getPath()
*
* @param argv0 specifies the argv[0] parameter of the main function
*
- * @return the application's executable file name or NULL, if an error occured
+ * @return the application's executable file name or NULL, if an error occurred
*/
char* createCommandName( char* argv0 )
{
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index b4897df..95228a9 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -282,7 +282,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
* Gets the path of a UNO installation.
*
* @return the installation path or NULL, if no installation was specified or
- * found, or if an error occured
+ * found, or if an error occurred
*/
char const* getPath()
{
@@ -305,7 +305,7 @@ char const* getPath()
* the executable name
*
* @return the command line for the application process or NULL, if an error
- * occured
+ * occurred
*/
char* createCommandLine( char* appendix )
{
More information about the Libreoffice-commits
mailing list