diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-05-19 15:41:27 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-05-19 15:41:27 +0000 |
commit | b2a05fa2b866523cb2ba37416691a66eaa11095e (patch) | |
tree | 0755aee8936d1661ce2838163514b04910ef381e | |
parent | 7eb4b9007d3ac0ac21e940e2ed1be6600aacdc53 (diff) |
INTEGRATION: CWS qwizards1 (1.30.56); FILE MERGED
2004/02/26 15:09:10 abi 1.30.56.2: #115685# treating non-existence like directory; insert will do the rest in case of creation of file
2004/02/25 14:25:25 abi 1.30.56.1: #115685# now handling the case non-existing like directory
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 2578a1207c..774c7ff229 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bc.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2004-05-10 14:20:50 $ + * last change: $Author: kz $ $Date: 2004-05-19 16:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -766,12 +766,13 @@ BaseContent::createNewContent( 0 ); Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq ); IsDocument = xRow->getBoolean( 1 ); - + if ( xRow->wasNull() ) { - VOS_ENSURE( false, - "BaseContent::createNewContent - Property value was null!" ); - return Reference< XContent >(); + IsDocument = false; +// VOS_ENSURE( false, +// "BaseContent::createNewContent - Property value was null!" ); +// return Reference< XContent >(); } } catch ( sdbc::SQLException const & ) @@ -848,7 +849,8 @@ BaseContent::getParent( try { - return Reference< XInterface >( m_pMyShell->m_pProvider->queryContent( Identifier ) ); + Reference< XContent > content = m_pMyShell->m_pProvider->queryContent( Identifier ); + return Reference<XInterface>(content,UNO_QUERY); } catch( IllegalIdentifierException ) { |