summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-12 14:03:59 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-12 14:03:59 +0000
commita6bd752f479852931e3934546de2683a1e5d694c (patch)
tree2f799803d6877f75bc8ea4b244ef619ecb369347 /tools
parentc756984e2a1ef3ae76112c0027acf1db765eab02 (diff)
CWS-TOOLING: integrate CWS fwk99
2009-01-20 17:39:31 +0100 pb r266605 : fix: #i98280# new 'More templates'-URL 2009-01-15 20:17:58 +0100 mst r266391 : #i95702# convert wizards to DocumentProperties (partially based on patch by cmc) 2009-01-12 07:35:44 +0100 pb r266131 : fix: #i96851# HID_PASTE_DLG and HID_LINKDLG_TABLB added 2009-01-09 10:40:48 +0100 pb r266061 : fix: #i97386# Execute_Impl() while sub-dialog is open this could be deleted; #i68415# patch from cmc 2009-01-09 10:35:24 +0100 pb r266059 : fix: #i97386# struct Deleted added 2009-01-09 10:05:17 +0100 pb r266057 : fix: #i97365# ModalDialog RID_SVXPAGE_IMPROVEMENT removed 2009-01-09 10:02:39 +0100 pb r266056 : fix: #i97841# new: set InfoURL and HandleHyperLink() 2009-01-09 09:59:13 +0100 pb r266053 : fix: #i97391# MinWidth re-calculated; #i97365# SvxImprovementDialog2 removed 2009-01-09 09:55:00 +0100 pb r266051 : fix: #i97841# new: HandleHyperLink(); #i97365# SvxImprovementDialog2 removed 2009-01-06 14:24:24 +0100 cd r265921 : #i96831# Fix build problem with gcc 4.3.2 using the return value of link correctly. 2009-01-06 12:18:41 +0100 cd r265907 : #i96831# Fix build problem with gcc 4.3.2 2009-01-06 12:02:59 +0100 mst r265905 : fix #i97775# - xmloff/source/core/nmspmap.cxx: + SvXMLNamespaceMap::GetQNameByKey does not handle default namespace correctly
Diffstat (limited to 'tools')
-rw-r--r--tools/source/fsys/dirent.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index cb08d2df6c1e..3a87ecc35250 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2735,8 +2735,10 @@ FSysError DirEntry::CopyTo( const DirEntry& rDest, FSysAction nActions ) const
HACK(redirection missing)
ByteString aThis(GUI2FSYS(GetFull()), osl_getThreadTextEncoding());
ByteString aDest(GUI2FSYS(rDest.GetFull()), osl_getThreadTextEncoding());
- link( aThis.GetBuffer(), aDest.GetBuffer() );
- return Sys2SolarError_Impl( errno );
+ if (link( aThis.GetBuffer(), aDest.GetBuffer() ) == -1)
+ return Sys2SolarError_Impl( errno );
+ else
+ return FSYS_ERR_OK;
}
#else
return FSYS_ERR_NOTSUPPORTED;