Manual merging dodgyness from cws merging: cws-swqbugfixes14.diff: + sw/source/ui/wrtsh/delete.cxx + #i41424# [ Writer editing ergonomics foo & undo etc. ] cws-swqcore05.diff: + sw/source/core/doc/docnum.cxx (SetOutlineNumRule) change + sw/source/core/undo/docundo.cxx change: looks scary. + sw/source/core/undo/undo.hrc - i18n issues ? Gnome-vfs smb:/// + 'remember password' etc.