diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 07:25:06 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 07:25:06 +0000 |
commit | 228bebebdef3e7e1b42d39e771bd0a8d599e1096 (patch) | |
tree | e978089ff282b05f4cbb1672b319821125abe5d6 /shell | |
parent | bcb4fa9323fa31d12a31ffa1faee338c190068b8 (diff) |
INTEGRATION: CWS changefileheader (1.6.122); FILE MERGED
2008/04/01 12:41:16 thb 1.6.122.2: #i85898# Stripping all external header guards
2008/03/31 13:17:14 rt 1.6.122.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 64 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/util/dbgmacros.cxx | 46 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/util/registry.cxx | 49 |
3 files changed, 57 insertions, 102 deletions
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index fefc934b56..9c9952e057 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -1,72 +1,46 @@ /************************************************************************* * - * 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: thumbviewer.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.6 $ + * $RCSfile: thumbviewer.cxx,v $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:45:57 $ + * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" - -#ifndef GLOBAL_HXX_INCLUDED #include "internal/global.hxx" -#endif #ifndef INFOTIPS_HXX_INCLUDED #include "internal/thumbviewer.hxx" #endif - -#ifndef SHLXTHDL_HXX_INCLUDED #include "internal/shlxthdl.hxx" -#endif - -#ifndef UTILITIES_HXX_INCLUDED #include "internal/utilities.hxx" -#endif - -#ifndef REGISTRY_HXX_INCLUDED #include "internal/registry.hxx" -#endif - -#ifndef FILEEXTENSIONS_HXX_INCLUDED #include "internal/fileextensions.hxx" -#endif - -#ifndef CONFIG_HXX_INCLUDED #include "internal/config.hxx" -#endif - -#ifndef ZIPFILE_HXX_INCLUDED #include "internal/zipfile.hxx" -#endif #include "internal/resource.h" #include <stdio.h> diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx index f1bb6b6397..ca76e8b8c3 100644 --- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx +++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * 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: dbgmacros.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.6 $ + * $RCSfile: dbgmacros.cxx,v $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:46:15 $ + * 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. * ************************************************************************/ @@ -44,10 +39,7 @@ #pragma warning(pop) #endif #include <stdio.h> - -#ifndef DBGMACROS_HXX_INCLUDED #include "internal/dbgmacros.hxx" -#endif void DbgAssert(bool /*condition*/, const char* /*message*/) { diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 2ccbd6e5ff..f7ade4614f 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * 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: registry.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.6 $ + * $RCSfile: registry.cxx,v $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:47:05 $ + * 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. * ************************************************************************/ @@ -44,14 +39,8 @@ #pragma warning(pop) #endif #include <malloc.h> - -#ifndef DBGMACROS_HXX_INCLUDED #include "internal/dbgmacros.hxx" -#endif - -#ifndef REGISTRY_HXX_INCLUDED #include "internal/registry.hxx" -#endif #if defined _MSC_VER #pragma warning(push, 1) |