diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 12:29:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 12:29:11 +0000 |
| commit | 0f32a2810cd7a64b977d080fdfd283d328be7464 (patch) | |
| tree | fb4264488a0f7c2e181b2da2c465cda798bfe896 /ucb | |
| parent | 1d0ea9c7f8e2955294c451c67f65edc6c1b9a590 (diff) | |
INTEGRATION: CWS tkr12 (1.95.4); FILE MERGED
2008/04/23 10:04:07 tkr 1.95.4.1: #i88446# file rename crashes
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/shell.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index adb6153f5ad5..501121501c06 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shell.cxx,v $ - * $Revision: 1.95 $ + * $Revision: 1.96 $ * * This file is part of OpenOffice.org. * @@ -1126,6 +1126,12 @@ shell::move( sal_Int32 CommandId, const sal_Int32 NameClash ) throw() { + // --> #i88446# Method notifyContentExchanged( getContentExchangedEventListeners( srcUnqPath,dstUnqPath,!isDocument ) ); crashes if + // srcUnqPath and dstUnqPathIn are equal + if( srcUnqPath == dstUnqPathIn ) + return; + // <-- + osl::FileBase::RC nError; rtl::OUString dstUnqPath( dstUnqPathIn ); |