User: hr Date: 2006/08/15 03:47:39 Modified: dba/dbaccess/source/filter/xml/dbloader2.cxx
Log: INTEGRATION: CWS dba30 (1.7.6); FILE MERGED 2006/07/19 12:27:13 fs 1.7.6.10: RESYNC: (1.19-1.20); FILE MERGED 2006/05/08 11:20:15 fs 1.7.6.9: RESYNC: (1.18-1.19); FILE MERGED 2006/04/20 06:47:17 oj 1.7.6.8: RESYNC: (1.17-1.18); FILE MERGED 2006/03/21 18:25:20 fs 1.7.6.7: RESYNC: (1.16-1.17); FILE MERGED 2005/12/29 13:18:03 oj 1.7.6.6: #i46951# check if url is factory 2005/10/13 14:55:33 fs 1.7.6.5: RESYNC: (1.15-1.16); FILE MERGED 2005/09/30 06:33:16 fs 1.7.6.4: RESYNC: (1.12-1.15); FILE MERGED 2005/05/25 15:02:46 fs 1.7.6.3: RESYNC: (1.10-1.12); FILE MERGED 2005/03/30 10:14:51 fs 1.7.6.2: RESYNC: (1.7-1.10); FILE MERGED 2005/03/24 10:48:40 fs 1.7.6.1: #i45921# File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.21&r2=1.22 Delta lines: +5 -1 ------------------- --- dbloader2.cxx 19 Jul 2006 15:59:31 -0000 1.21 +++ dbloader2.cxx 15 Aug 2006 10:47:37 -0000 1.22 @@ -57,6 +57,9 @@ #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_ +#include <com/sun/star/frame/XFramesSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_FRAME_XFRAMELOADER_HPP_ #include <com/sun/star/frame/XFrameLoader.hpp> #endif @@ -514,7 +517,8 @@ { sal_Bool bInteractive = sal_False; - bCreateNew = _rURL.match(SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_DATABASE)); + ::rtl::OUString sFactoryName = SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_DATABASE); + bCreateNew = sFactoryName.match(_rURL); Sequence<Any> aCreationArgs; if ( !bCreateNew ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
