summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
Diffstat (limited to 'ucb')
-rw-r--r--[-rwxr-xr-x]ucb/qa/complex/tdoc/interfaces/_XChild.java2
-rw-r--r--[-rwxr-xr-x]ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java4
-rw-r--r--[-rwxr-xr-x]ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java2
-rw-r--r--ucb/source/core/ucbcmds.cxx2
-rw-r--r--ucb/source/ucp/file/filglob.cxx8
-rw-r--r--ucb/source/ucp/odma/odma_content.cxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/interfaces/_XChild.java
index 1638c6aa6a..0ef43e9550 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XChild.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XChild.java
@@ -90,7 +90,7 @@ public class _XChild {
oObj.setParent(gotten);
}
catch (com.sun.star.lang.NoSupportException ex) {
- log.println("Exception occured during setParent() - " + (supported?"FAILED":"OK"));
+ log.println("Exception occurred during setParent() - " + (supported?"FAILED":"OK"));
if (supported) {
ex.printStackTrace((java.io.PrintWriter)log);
return false;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
index 2fcf59d56f..79cc1f9a75 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
@@ -50,7 +50,7 @@ public class _XServiceInfo {
/**
* Just calls the method.<p>
- * Has <b>OK</b> status if no runtime exceptions occured.
+ * Has <b>OK</b> status if no runtime exceptions occurred.
*/
public boolean _getImplementationName() {
boolean result = true;
@@ -66,7 +66,7 @@ public class _XServiceInfo {
/**
* Just calls the method.<p>
- * Has <b>OK</b> status if no runtime exceptions occured.
+ * Has <b>OK</b> status if no runtime exceptions occurred.
*/
public boolean _getSupportedServiceNames() {
boolean result = true;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
index 5f71388832..d8a787b41f 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
@@ -51,7 +51,7 @@ public class _XTypeProvider {
/**
* Just calls the method.<p>
- * Has <b>OK</b> status if no runtime exceptions occured.
+ * Has <b>OK</b> status if no runtime exceptions occurred.
*/
public boolean _getImplementationId() {
boolean result = true;
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 49c9e62236..6aad4da227 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -509,7 +509,7 @@ bool setTitle(
if ( aErrors[ 0 ].hasValue() )
{
- // error occured.
+ // error occurred.
OSL_ENSURE( sal_False, "error setting Title property!" );
return false;
}
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 6bcea45829..c5dcd4cbf2 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -389,7 +389,7 @@ namespace fileaccess {
xEnv,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "an error occured during file opening")),
+ "an error occurred during file opening")),
xComProc);
}
else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING ||
@@ -444,7 +444,7 @@ namespace fileaccess {
xEnv,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "an error occured during opening a directory")),
+ "an error occurred during opening a directory")),
xComProc);
}
else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE ||
@@ -461,7 +461,7 @@ namespace fileaccess {
xEnv,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "an error occured writing or reading from a file")),
+ "an error occurred writing or reading from a file")),
xComProc );
}
else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE )
@@ -527,7 +527,7 @@ namespace fileaccess {
xEnv,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "an error occured during opening a file")),
+ "an error occurred during opening a file")),
xComProc);
}
else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ||
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 9641b1de7a..e578ebd78f 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -394,7 +394,7 @@ uno::Any SAL_CALL Content::execute(
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception occured while creating the file content!");
+ OSL_ENSURE(0,"Exception occurred while creating the file content!");
}
xDataSink->setInputStream( xIn );
}