diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:00:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:00:35 +0000 |
| commit | 67658662be66ac7d95246144b80a5b1d70450376 (patch) | |
| tree | 870eeb7dab0dec10a8e0b4fab49cff8e48035fa5 /ucb | |
| parent | 6c51bb3caff9d88cd29e586ca256dbb658d6e95d (diff) | |
INTEGRATION: CWS calcshare2 (1.37.68); FILE MERGED
2008/03/14 21:32:35 mav 1.37.68.1: #i85794# new file locking prototype
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/bc.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index cf3223e07e57..648c44177de2 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bc.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.39 $ * * This file is part of OpenOffice.org. * @@ -1036,7 +1036,9 @@ BaseContent::open( } else { - if( aCommandArgument.Mode == OpenMode::DOCUMENT ) + if( aCommandArgument.Mode == OpenMode::DOCUMENT || + aCommandArgument.Mode == OpenMode::DOCUMENT_SHARE_DENY_NONE ) + { Reference< io::XOutputStream > outputStream( aCommandArgument.Sink,UNO_QUERY ); if( outputStream.is() ) @@ -1046,18 +1048,22 @@ BaseContent::open( outputStream ); } + sal_Bool bLock = ( aCommandArgument.Mode == OpenMode::DOCUMENT_SHARE_DENY_NONE ); + Reference< io::XActiveDataSink > activeDataSink( aCommandArgument.Sink,UNO_QUERY ); if( activeDataSink.is() ) { activeDataSink->setInputStream( m_pMyShell->open( nMyCommandIdentifier, - m_aUncPath ) ); + m_aUncPath, + bLock ) ); } Reference< io::XActiveDataStreamer > activeDataStreamer( aCommandArgument.Sink,UNO_QUERY ); if( activeDataStreamer.is() ) { activeDataStreamer->setStream( m_pMyShell->open_rw( nMyCommandIdentifier, - m_aUncPath ) ); + m_aUncPath, + bLock ) ); } } else if ( aCommandArgument.Mode == OpenMode::ALL || |