Tag: cws_dev300_dba30c User: fs Date: 2008-05-13 08:57:23+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: joining changes from CWS odbmacros3 to CWS dba30c: 2008/04/13 19:30:36 fs 1.27.32.1: diagnostics 2008/04/15 13:13:18 fs 1.27.32.2: RESYNC: (1.27-1.28); FILE MERGED 2008/05/09 09:27:24 fs 1.27.32.3: RESYNC: (1.28-1.29); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: linkeddocuments.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/linkeddocuments.cxx?r1=1.29&r2=1.29.2.1 Delta lines: +6 -3 ------------------- --- linkeddocuments.cxx 2008-05-05 16:02:41+0000 1.29 +++ linkeddocuments.cxx 2008-05-13 08:57:20+0000 1.29.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: linkeddocuments.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.29.2.1 $ * * This file is part of OpenOffice.org. * @@ -43,6 +43,9 @@ #include "dbustrings.hrc" #endif #include <comphelper/classids.hxx> +#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX +#include <comphelper/namedvaluecollection.hxx> +#endif #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #endif @@ -246,7 +249,7 @@ break; default: - OSL_ENSURE( false, "OLinkedDocumentsAccess::impl_open: invalid open mode!" ); + OSL_ENSURE( false, "OLinkedDocumentsAccess::implOpen: invalid open mode!" ); break; } aArguments.put( "OpenMode", sOpenMode ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
