summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 16:27:21 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 16:27:21 +0000
commit832f7b267bcc52af248a5e72e6ebda14d92a19ee (patch)
tree75b4f3b044a06b017ded9e09bab1a8cab5147e88
parent2d3af48872940fa8a2e5df59afa33c92fd737cb4 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
-rw-r--r--ucbhelper/prj/build.lst2
-rw-r--r--ucbhelper/source/client/content.cxx15
-rw-r--r--ucbhelper/workben/myucp/myucp_content.cxx8
3 files changed, 7 insertions, 18 deletions
diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst
index 1d8b771af04e..3cbbe7aa65f9 100644
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@ -1,4 +1,4 @@
-uh ucbhelper : offapi vos cppuhelper NULL
+uh ucbhelper : offuh sal vos cppu cppuhelper NULL
uh ucbhelper usr1 - all uh_mkout NULL
uh ucbhelper\unotypes nmake - all uh_unotypes NULL
uh ucbhelper\source\client nmake - all uh_client uh_unotypes NULL
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index d75c260e5f2b..40c3753d6ba4 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: content.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: kso $ $Date: 2002-09-20 12:16:00 $
+ * last change: $Author: hr $ $Date: 2003-03-27 17:24:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1248,17 +1248,6 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
if ( !rStream.is() )
return;
- try
- {
- // Note: Throws an exception in case the resource does not exist,
- // but writeStream must work for non-existing resources, too.
- if ( !isDocument() )
- return;
- }
- catch ( Exception const & )
- {
- }
-
InsertCommandArgument aArg;
aArg.Data = rStream;
aArg.ReplaceExisting = bReplaceExisting;
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index 2322dd208946..4a60f63f7f6b 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: myucp_content.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: kso $ $Date: 2002-01-10 16:00:40 $
+ * last change: $Author: hr $ $Date: 2003-03-27 17:24:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -156,7 +156,7 @@ Content::~Content()
// virtual
void SAL_CALL Content::acquire()
- throw()
+ throw( uno::RuntimeException )
{
ContentImplHelper::acquire();
}
@@ -164,7 +164,7 @@ void SAL_CALL Content::acquire()
//=========================================================================
// virtual
void SAL_CALL Content::release()
- throw()
+ throw( uno::RuntimeException )
{
ContentImplHelper::release();
}