diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 09:58:26 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 09:58:26 +0000 |
commit | 9454d429fd26af6e2cf9b6837a3834f72047d42e (patch) | |
tree | 72ebbb20c2142b60c0afd8c927017a00ac0ab666 /registry/tools | |
parent | INTEGRATION: CWS changefileheader (1.5.30); FILE MERGED (diff) | |
download | core-9454d429fd26af6e2cf9b6837a3834f72047d42e.tar.gz core-9454d429fd26af6e2cf9b6837a3834f72047d42e.zip |
INTEGRATION: CWS changefileheader (1.6.42); FILE MERGED
2008/04/01 15:23:08 thb 1.6.42.2: #i85898# Stripping all external header guards
2008/03/31 07:25:18 rt 1.6.42.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'registry/tools')
-rw-r--r-- | registry/tools/regmerge.cxx | 56 |
1 files changed, 18 insertions, 38 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx index 47da5158866b..45cab0927b10 100644 --- a/registry/tools/regmerge.cxx +++ b/registry/tools/regmerge.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: regmerge.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-17 01:55:09 $ + * $RCSfile: regmerge.cxx,v $ + * $Revision: 1.7 $ * - * 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. * ************************************************************************/ @@ -40,27 +35,12 @@ #include <string.h> #include "registry/registry.h" - -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif - -#ifndef _RTL_ALLOC_H_ #include <rtl/alloc.h> -#endif - -#ifndef _OSL_PROCESS_H_ #include <osl/process.h> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _OSL_THREAD_H_ #include <osl/thread.h> -#endif -#ifndef _OSL_FILE_HXX_ #include <osl/file.hxx> -#endif #ifdef SAL_UNX #define SEPARATOR '/' |