Attachment #37997 for issue #66722

View | Details | Raw Unified | Return to issue 66722
Collapse All | Expand All

Lines 57-64 Link Here

(-)connectivity/source/drivers/kab/KConnection.cxx (-2 / +3 lines)
57	#include <com/sun/star/sdbc/TransactionIsolation.hpp>	57	#include <com/sun/star/sdbc/TransactionIsolation.hpp>
58	#endif	58	#endif
59		59
60	#define KDE_HEADERS_WANT_KABC_STDADDRESSBOOK	60	#ifndef INCLUDED_VCL_KDE_HEADERS_H
61	#include "kde_headers.hxx"	61	#include <vcl/kde_headers.h>
		62	#endif
62		63
63	using namespace connectivity::kab;	64	using namespace connectivity::kab;
64	using namespace com::sun::star::uno;	65	using namespace com::sun::star::uno;




#include <osl/process.h>
#endif

#ifndef INCLUDED_VCL_KDE_HEADERS_H
#include <vcl/kde_headers.h>
#endif
#define KDE_HEADERS_WANT_KLOCALE
#define KDE_HEADERS_WANT_KDEVERSION
#include "kde_headers.hxx"

namespace connectivity
{

Lines 41-47 Link Here

(-)connectivity/source/drivers/kab/KDatabaseMetaData.cxx (-1 / +4 lines)
41	#ifndef CONNECTIVITY_KAB_KDEINIT_H	41	#ifndef CONNECTIVITY_KAB_KDEINIT_H
42	#include "KDEInit.h"	42	#include "KDEInit.h"
43	#endif	43	#endif
44	#include <klocale.h>	44
		45	#ifndef INCLUDED_VCL_KDE_HEADERS_H
		46	#include <vcl/kde_headers.h>
		47	#endif
45		48
46	#ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_	49	#ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
47	#include "FDatabaseMetaDataResultSet.hxx"	50	#include "FDatabaseMetaDataResultSet.hxx"

Lines 50-60 Link Here

(-)connectivity/source/drivers/kab/KResultSet.cxx (-5 lines)
50	#include "kfields.hxx"	50	#include "kfields.hxx"
51	#endif	51	#endif
52		52
53	#define KDE_HEADERS_WANT_KABC_ADDRESSBOOK
54	#include "kde_headers.hxx"
55
56	#include <qdatetime.h>
57
58	#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_	53	#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
59	#include <com/sun/star/beans/PropertyAttribute.hpp>	54	#include <com/sun/star/beans/PropertyAttribute.hpp>
60	#endif	55	#endif

Lines 43-50 Link Here

(-)connectivity/source/drivers/kab/KResultSet.hxx (-2 / +3 lines)
43	#include "KResultSetMetaData.hxx"	43	#include "KResultSetMetaData.hxx"
44	#endif	44	#endif
45		45
46	#define KDE_HEADERS_WANT_KABC_ADDRESSEE	46	#ifndef INCLUDED_VCL_KDE_HEADERS_H
47	#include "kde_headers.hxx"	47	#include <vcl/kde_headers.h>
		48	#endif
48		49
49	#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_	50	#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
50	#include <com/sun/star/sdbc/XRow.hpp>	51	#include <com/sun/star/sdbc/XRow.hpp>

Lines 40-47 Link Here

(-)connectivity/source/drivers/kab/kcondition.hxx (-2 / +3 lines)
40	#include <comphelper/types.hxx>	40	#include <comphelper/types.hxx>
41	#endif	41	#endif
42		42
43	#define KDE_HEADERS_WANT_KABC_ADDRESSEE	43	#ifndef INCLUDED_VCL_KDE_HEADERS_H
44	#include "kde_headers.hxx"	44	#include <vcl/kde_headers.h>
		45	#endif
45		46
46	#ifndef _DBHELPER_DBEXCEPTION_HXX_	47	#ifndef _DBHELPER_DBEXCEPTION_HXX_
47	#include <connectivity/dbexception.hxx>	48	#include <connectivity/dbexception.hxx>




/*************************************************************************
 *
 *  OpenOffice.org - a multi-platform office productivity suite
 *
 *  $RCSfile: kde_headers.hxx,v $
 *
 *  $Revision: 1.2 $
 *
 *  last change: $Author: kz $ $Date: 2006/07/06 14:23:21 $
 *
 *  The Contents of this file are made available subject to
 *  the terms of GNU Lesser General Public License Version 2.1.
 *
 *
 *    GNU Lesser General Public License Version 2.1
 *    =============================================
 *    Copyright 2006 by Sun Microsystems, Inc.
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public
 *    License version 2.1, as published by the Free Software Foundation.
 *
 *    This library is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *    Lesser General Public License for more details.
 *
 *    You should have received a copy of the GNU Lesser General Public
 *    License along with this library; if not, write to the Free Software
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 *    MA  02111-1307  USA
 *
 ************************************************************************/

#ifndef _SAL_CONFIG_H_
#include "sal/config.h"
#endif

// Suppress warnings:
#if defined __GNUC__
#pragma GCC system_header
#endif

#ifdef KDE_HEADERS_WANT_KAPPLICATION
#include <kapplication.h>
#endif

#ifdef KDE_HEADERS_WANT_KCMDLINEARGS
#include <kcmdlineargs.h>
#endif

#ifdef KDE_HEADERS_WANT_KGLOBAL
#include <kglobal.h>
#endif

#ifdef KDE_HEADERS_WANT_KLOCALE
#include <klocale.h>
#endif

#ifdef KDE_HEADERS_WANT_KDEVERSION
#include <kdeversion.h>
#endif

#ifdef KDE_HEADERS_WANT_KABC_ADDRESSBOOK
#include <kabc/addressbook.h>
#endif

#ifdef KDE_HEADERS_WANT_KABC_STDADDRESSBOOK
#include <kabc/stdaddressbook.h>
#endif

#ifdef KDE_HEADERS_WANT_KABC_FIELD
#include <kabc/field.h>
#endif

#ifdef KDE_HEADERS_WANT_KABC_ADDRESSEE
#include <kabc/addressee.h>
#endif


Lines 36-43 Link Here

(-)connectivity/source/drivers/kab/kfields.hxx (-2 / +3 lines)
36	#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_	36	#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
37	#define _CONNECTIVITY_KAB_FIELDS_HXX_	37	#define _CONNECTIVITY_KAB_FIELDS_HXX_
38		38
39	#define KDE_HEADERS_WANT_KABC_FIELD	39	#ifndef INCLUDED_VCL_KDE_HEADERS_H
40	#include "kde_headers.hxx"	40	#include <vcl/kde_headers.h>
		41	#endif
41		42
42	#ifndef _DBHELPER_DBEXCEPTION_HXX_	43	#ifndef _DBHELPER_DBEXCEPTION_HXX_
43	#include <connectivity/dbexception.hxx>	44	#include <connectivity/dbexception.hxx>

Lines 40-47 Link Here

(-)connectivity/source/drivers/kab/korder.hxx (-2 / +3 lines)
40	#include "rtl/ustring.hxx"	40	#include "rtl/ustring.hxx"
41	#endif	41	#endif
42		42
43	#define KDE_HEADERS_WANT_KABC_ADDRESSEE	43	#ifndef INCLUDED_VCL_KDE_HEADERS_H
44	#include "kde_headers.hxx"	44	#include <vcl/kde_headers.h>
		45	#endif
45		46
46	#include <vector>	47	#include <vector>
47		48

Return to issue 66722

Lines 44-55 Link Here

(-)connectivity/source/drivers/kab/KDEInit.cxx (-6 / +3 lines)
44	#include <osl/process.h>	44	#include <osl/process.h>
45	#endif	45	#endif
46		46
47	#define KDE_HEADERS_WANT_KAPPLICATION	47	#ifndef INCLUDED_VCL_KDE_HEADERS_H
48	#define KDE_HEADERS_WANT_KCMDLINEARGS	48	#include <vcl/kde_headers.h>
49	#define KDE_HEADERS_WANT_KGLOBAL	49	#endif
50	#define KDE_HEADERS_WANT_KLOCALE
51	#define KDE_HEADERS_WANT_KDEVERSION
52	#include "kde_headers.hxx"
53		50
54	namespace connectivity	51	namespace connectivity
55	{	52	{

Lines 1-80 Link Here

(-)connectivity/source/drivers/kab/kde_headers.hxx (-80 lines)
1	/*************************************************************************
2	*
3	* OpenOffice.org - a multi-platform office productivity suite
4	*
5	* $RCSfile: kde_headers.hxx,v $
6	*
7	* $Revision: 1.2 $
8	*
9	* last change: $Author: kz $ $Date: 2006/07/06 14:23:21 $
10	*
11	* The Contents of this file are made available subject to
12	* the terms of GNU Lesser General Public License Version 2.1.
13	*
14	*
15	* GNU Lesser General Public License Version 2.1
16	* =============================================
17	* Copyright 2006 by Sun Microsystems, Inc.
18	* 901 San Antonio Road, Palo Alto, CA 94303, USA
19	*
20	* This library is free software; you can redistribute it and/or
21	* modify it under the terms of the GNU Lesser General Public
22	* License version 2.1, as published by the Free Software Foundation.
23	*
24	* This library is distributed in the hope that it will be useful,
25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27	* Lesser General Public License for more details.
28	*
29	* You should have received a copy of the GNU Lesser General Public
30	* License along with this library; if not, write to the Free Software
31	* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32	* MA 02111-1307 USA
33	*
34	************************************************************************/
35
36	#ifndef _SAL_CONFIG_H_
37	#include "sal/config.h"
38	#endif
39
40	// Suppress warnings:
41	#if defined __GNUC__
42	#pragma GCC system_header
43	#endif
44
45	#ifdef KDE_HEADERS_WANT_KAPPLICATION
46	#include <kapplication.h>
47	#endif
48
49	#ifdef KDE_HEADERS_WANT_KCMDLINEARGS
50	#include <kcmdlineargs.h>
51	#endif
52
53	#ifdef KDE_HEADERS_WANT_KGLOBAL
54	#include <kglobal.h>
55	#endif
56
57	#ifdef KDE_HEADERS_WANT_KLOCALE
58	#include <klocale.h>
59	#endif
60
61	#ifdef KDE_HEADERS_WANT_KDEVERSION
62	#include <kdeversion.h>
63	#endif
64
65	#ifdef KDE_HEADERS_WANT_KABC_ADDRESSBOOK
66	#include <kabc/addressbook.h>
67	#endif
68
69	#ifdef KDE_HEADERS_WANT_KABC_STDADDRESSBOOK
70	#include <kabc/stdaddressbook.h>
71	#endif
72
73	#ifdef KDE_HEADERS_WANT_KABC_FIELD
74	#include <kabc/field.h>
75	#endif
76
77	#ifdef KDE_HEADERS_WANT_KABC_ADDRESSEE
78	#include <kabc/addressee.h>
79	#endif
80