diff options
| author | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
| commit | e96293e65a972a440aa5435bf22268a7ae4cef23 (patch) | |
| tree | db1f4e4b6ef586e00320f2d71704da7f8caa4857 /ucb | |
| parent | b9e345f57f4ecf2b27a71b0bea344ec83ecfd50a (diff) | |
| parent | a2e7c2e0d002d75a6b77a629a4e904ab54bf8375 (diff) | |
sb126: merged in DEV300_m84
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 769e58c08819..f324c93b878f 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -33,6 +33,7 @@ #endif #include "osl/diagnose.h" +#include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <osl/time.h> #include <osl/file.hxx> @@ -2054,9 +2055,14 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, rtl::OUString newDstUnqPath = dstUnqPath; rtl::OUString tit; if( aFileStatus.isValid( FileStatusMask_FileName ) ) - tit = aFileStatus.getFileName(); + tit = rtl::Uri::encode( aFileStatus.getFileName(), + rtl_UriCharClassPchar, + rtl_UriEncodeIgnoreEscapes, + RTL_TEXTENCODING_UTF8 ); + if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) newDstUnqPath += rtl::OUString::createFromAscii( "/" ); + newDstUnqPath += tit; if ( newSrcUnqPath != dstUnqPath ) |