Tag: cws_src680_dba24c User: fs Date: 2007-10-30 16:28:36+0000 Modified: dba/dbaccess/source/core/dataaccess/documentcontainer.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: RESYNC: (1.24-1.25); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.24.40.2&r2=1.24.40.3 Delta lines: +3 -6 ------------------- --- documentcontainer.cxx 2007-10-22 20:57:14+0000 1.24.40.2 +++ documentcontainer.cxx 2007-10-30 16:28:28+0000 1.24.40.3 @@ -84,9 +84,6 @@ #ifndef CONNECTIVITY_SQLERROR_HXX #include <connectivity/sqlerror.hxx> #endif -#ifndef _SO_CLSIDS_HXX -#include <so3/clsids.hxx> -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.46.20.5&r2=1.46.20.6 Delta lines: +5 -5 ------------------- --- documentdefinition.cxx 2007-10-22 20:58:09+0000 1.46.20.5 +++ documentdefinition.cxx 2007-10-30 16:28:31+0000 1.46.20.6 @@ -63,8 +63,8 @@ #ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX #include <comphelper/namedvaluecollection.hxx> #endif -#ifndef _SO_CLSIDS_HXX -#include <so3/clsids.hxx> +#ifndef _COMPHELPER_CLASSIDS_HXX +#include <comphelper/classids.hxx> #endif #ifndef _COM_SUN_STAR_AWT_XTOPWINDOW_HPP_ #include <com/sun/star/awt/XTopWindow.hpp> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
