diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 06:34:37 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 06:34:37 +0000 |
commit | d5d77c6243b6c2078c6297b03c182f4644ab9e20 (patch) | |
tree | 70f32d9c24b3e10d808cf906d57a06f31c3035d2 /connectivity/inc/connectivity | |
parent | cf57919ddf2946bb6d9cccbb152f08cb8c85b6e3 (diff) |
INTEGRATION: CWS changefileheader (1.6.276); FILE MERGED
2008/04/01 15:08:27 thb 1.6.276.2: #i85898# Stripping all external header guards
2008/03/28 15:23:15 rt 1.6.276.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'connectivity/inc/connectivity')
-rw-r--r-- | connectivity/inc/connectivity/dbcharset.hxx | 51 |
1 files changed, 19 insertions, 32 deletions
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index c83504c7fc..f9f00ea3ac 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -1,53 +1,40 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: dbcharset.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.6 $ + * $RCSfile: dbcharset.hxx,v $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:59:46 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * + * OpenOffice.org 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 version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 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 + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _DBHELPER_DBCHARSET_HXX_ #define _DBHELPER_DBCHARSET_HXX_ -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _RTL_TEXTENC_H #include <rtl/textenc.h> -#endif -#ifndef _RTL_TENCINFO_H #include <rtl/tencinfo.h> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif //......................................................................... namespace dbtools |