summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
Diffstat (limited to 'ucb')
-rw-r--r--ucb/qa/complex/tdoc/_XChild.java2
-rw-r--r--ucb/qa/complex/tdoc/_XServiceInfo.java4
-rw-r--r--ucb/qa/complex/tdoc/_XTypeProvider.java2
-rw-r--r--ucb/source/core/ucbcmds.cxx2
-rw-r--r--ucb/source/ucp/file/filglob.cxx10
-rw-r--r--ucb/source/ucp/file/shell.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpurl.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx2
-rw-r--r--ucb/source/ucp/odma/odma_content.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx2
-rw-r--r--ucb/source/ucp/tdoc/ucptdoc.xml2
-rw-r--r--ucb/source/ucp/webdav/makefile.mk2
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx19
13 files changed, 35 insertions, 18 deletions
diff --git a/ucb/qa/complex/tdoc/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java
index 427fbff8a01a..5185b19aa909 100644
--- a/ucb/qa/complex/tdoc/_XChild.java
+++ b/ucb/qa/complex/tdoc/_XChild.java
@@ -86,7 +86,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/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java
index eb6c787a606b..014c899ed895 100644
--- a/ucb/qa/complex/tdoc/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/_XServiceInfo.java
@@ -46,7 +46,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;
@@ -62,7 +62,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/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java
index c09909d19b02..b4dcc28c94c6 100644
--- a/ucb/qa/complex/tdoc/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/_XTypeProvider.java
@@ -47,7 +47,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 1c5ca5934658..fed0515b5479 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -504,7 +504,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 eee4311bf50a..32e7a9b33f11 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -386,7 +386,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 ||
@@ -441,7 +441,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 ||
@@ -458,7 +458,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 )
@@ -524,7 +524,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 ||
@@ -852,7 +852,7 @@ namespace fileaccess {
InteractiveBadTransferURLException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "bad tranfer url")),
+ "bad transfer url")),
xContext);
cancelCommandExecution( aAny,xEnv );
}
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 904bb7af71b2..7b6b65c0caa9 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2333,7 +2333,7 @@ shell::commit( const shell::ContentMap::iterator& it,
}
else
{
- // extremly ugly, but otherwise default construction
+ // extremely ugly, but otherwise default construction
// of aDirItem and aFileStatus2
// before the preciding if
isVolume = osl::FileStatus::Volume == aFileStatus.getFileType();
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index ad0746f0d02f..228cc584b384 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -126,7 +126,7 @@ namespace ftp {
throw(curl_exception);
// returns a pointer to an open tempfile,
- // seeked to the beginning of.
+ // sought to the beginning of.
oslFileHandle open() throw(curl_exception);
FTPDirentry direntry() const throw(curl_exception);
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 108e7d7b7650..e955673ed1bc 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -138,7 +138,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
throw( uno::RuntimeException )
{
//TODO
- //stick a map from each CommandId to a new GCancellable and propogate
+ //stick a map from each CommandId to a new GCancellable and propagate
//it throughout the g_file_* calls
}
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 6545c5f5a5c0..cdde9193f0df 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -393,7 +393,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 );
}
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index a3ea9dc98d58..3ba18a77e72c 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2278,7 +2278,7 @@ void Content::transfer(
// Unreachable
}
- // Announce transfered content in its new folder.
+ // Announce transferred content in its new folder.
xTarget->inserted();
/////////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/tdoc/ucptdoc.xml b/ucb/source/ucp/tdoc/ucptdoc.xml
index 33d06da7437a..96f43e886a1f 100644
--- a/ucb/source/ucp/tdoc/ucptdoc.xml
+++ b/ucb/source/ucp/tdoc/ucptdoc.xml
@@ -37,7 +37,7 @@
</name>
<description>
This component implements a Content Provider for the Universal Content Broker.
- It provides access to the hierachical structure of the documents that are active
+ It provides access to the hierarchical structure of the documents that are active
in a running OpenOffice.org process.
</description>
<loader-name>
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 964583308609..f1380e1fc2ab 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -52,7 +52,7 @@ SERFINCDIR=serf
# Extend the list of include paths depending on whether we use locally built
# or system versions of libraries apr, apr-util, serf, libxml
#
-# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everyting.)
+# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everything.)
#
.IF "$(SYSTEM_APR)" == "YES"
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index df558f0e3462..caed1051e6dd 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2892,7 +2892,7 @@ void Content::transfer(
= static_cast< Content * >(
xProvider->queryContent( xTargetId ).get() );
- // Announce transfered content in its new folder.
+ // Announce transferred content in its new folder.
xTarget->inserted();
}
catch ( ucb::IllegalIdentifierException const & )
@@ -3352,6 +3352,23 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
return aException;
}
+// #i124421# force the availability of type_info symbols for exceptions
+// that used to be passed around in uno::Any variables and thrown later
+void ucb_dummyThrower( int i) {
+ switch( i) {
+ case 10: throw ucb::InteractiveNetworkGeneralException();
+ case 11: throw ucb::InteractiveAugmentedIOException();
+ case 12: throw ucb::InteractiveNetworkGeneralException();
+ case 13: throw ucb::InteractiveNetworkWriteException();
+ case 14: throw ucb::InteractiveNetworkReadException();
+ case 15: throw ucb::InteractiveNetworkConnectException();
+ case 16: throw ucb::InteractiveLockingLockedException();
+ case 17: throw ucb::InteractiveLockingNotLockedException();
+ case 18: throw ucb::InteractiveNetworkGeneralException();
+ case 19: throw ucb::InteractiveLockingLockExpiredException();
+ }
+}
+
//=========================================================================
// static
bool Content::shouldAccessNetworkAfterException( const DAVException & e )
generated by cgit (git 2.34.1) at 2024-12-29 11:31:21 +0000