diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 17:39:42 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 17:39:42 +0000 |
commit | 3da024112730dcc26c89e402c78ef2ac8e6504a0 (patch) | |
tree | a65da435a06ef0ebdb227f8df90dbaa84cdde190 | |
parent | 5d9da0b93119413d551151a3ef13764ad2c8074b (diff) |
INTEGRATION: CWS changefileheader (1.4.774); FILE MERGED
2008/04/01 15:44:23 thb 1.4.774.3: #i85898# Stripping all external header guards
2008/04/01 12:43:08 thb 1.4.774.2: #i85898# Stripping all external header guards
2008/03/31 13:00:55 rt 1.4.774.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | svtools/inc/scriptedtext.hxx | 48 | ||||
-rw-r--r-- | svtools/inc/searchopt.hxx | 46 |
2 files changed, 36 insertions, 58 deletions
diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/scriptedtext.hxx index 73a21dec945f..0bf026b11ced 100644 --- a/svtools/inc/scriptedtext.hxx +++ b/svtools/inc/scriptedtext.hxx @@ -1,51 +1,39 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: scriptedtext.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 10:13:39 $ + * $RCSfile: scriptedtext.hxx,v $ + * $Revision: 1.5 $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This file is part of OpenOffice.org. * + * 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. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * 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). * - * 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 _SVTOOLS_SCRIPTEDTEXT_HXX #define _SVTOOLS_SCRIPTEDTEXT_HXX -#ifndef INCLUDED_SVTDLLAPI_H #include "svtools/svtdllapi.h" -#endif - -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _COM_SUN_STAR_I18N_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif namespace rtl { class OUString; } diff --git a/svtools/inc/searchopt.hxx b/svtools/inc/searchopt.hxx index 6b81048811d9..a9aa72ee1735 100644 --- a/svtools/inc/searchopt.hxx +++ b/svtools/inc/searchopt.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: searchopt.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 10:17:19 $ + * $RCSfile: searchopt.hxx,v $ + * $Revision: 1.5 $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This file is part of OpenOffice.org. * + * 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. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * 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). * - * 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 _SVT_SEARCHOPT_HXX_ #define _SVT_SEARCHOPT_HXX_ -#ifndef INCLUDED_SVLDLLAPI_H #include "svtools/svldllapi.h" -#endif - -#ifndef _SOLAR_H #include "tools/solar.h" -#endif class SvtSearchOptions_Impl; |