diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 13:34:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 13:34:05 +0000 |
| commit | 1cb73f343e79da987db5ab8b4b8c819c7cc3ab8a (patch) | |
| tree | c9f9795ec85e85813645e31f06379c99462a1219 /desktop/source/deployment/misc/dp_ucb.cxx | |
| parent | d48d54dcab9575bf9d1f40b2ed86e059dfadbd61 (diff) | |
INTEGRATION: CWS ucbfixes04 (1.11.138); FILE MERGED
2007/12/06 15:33:29 kso 1.11.138.1: #81459# - Removed useless openStream() call from create_ucb_content().
Issue number:
Submitted by:
Reviewed by:
Diffstat (limited to 'desktop/source/deployment/misc/dp_ucb.cxx')
| -rw-r--r-- | desktop/source/deployment/misc/dp_ucb.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 9c046c4869e1..82ba19bd3401 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_ucb.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 15:05:48 $ + * last change: $Author: obo $ $Date: 2008-01-04 14:34:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,15 +70,23 @@ bool create_ucb_content( bool throw_exc ) { try { + // Existense check... + // content ctor/isFolder() will throw exception in case the resource + // does not exist. + // dilemma: no chance to use the given iahandler here, because it would // raise no such file dialogs, else no interaction for // passwords, ...? xxx todo ::ucbhelper::Content ucbContent( url, Reference<XCommandEnvironment>() ); - if (! ucbContent.isFolder()) - ucbContent.openStream()->closeInput(); + + ucbContent.isFolder(); + if (ret_ucbContent != 0) - *ret_ucbContent = ::ucbhelper::Content( url, xCmdEnv ); + { + ucbContent.setCommandEnvironment( xCmdEnv ); + *ret_ucbContent = ucbContent; + } return true; } catch (RuntimeException &) { |