diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:22:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:22:57 +0000 |
| commit | 7cca3dec21e8377546ce11c72cb0bf721382751e (patch) | |
| tree | 9265e4d53505f9a0e38235f987bd9abff8fad885 /basic | |
| parent | c27a71a254ffa224810a11570c82961300df98e3 (diff) | |
INTEGRATION: CWS dba221a_SRC680 (1.4.4.2.4); FILE MERGED
2007/04/17 08:24:42 fs 1.4.4.2.4.2: #i10000#
2007/04/17 06:39:26 fs 1.4.4.2.4.1: #i76066# re-do the lost fix for issue #i65448#
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/uno/namecont.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 91a9a5f6efdf..6f592e68d1aa 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -4,9 +4,9 @@ * * $RCSfile: namecont.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2007-03-15 15:39:18 $ + * last change: $Author: kz $ $Date: 2007-05-09 13:22:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,6 +78,9 @@ #include "namecont.hxx" #include "basicmanagerrepository.hxx" +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif @@ -1722,6 +1725,17 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto uno::Reference< embed::XStorage > xSourceLibrariesStor; if( bStorage ) { + // first of all, clean the target library storage, since the storing procedure must do overwrite + try { + if ( xStorage->hasByName( maLibrariesDir ) ) + xStorage->removeElement( maLibrariesDir ); + } + catch( uno::Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + return; + } + // Don't write if only empty standard lib exists if( nNameCount == 1 ) { |