diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 21:12:24 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 21:12:24 +0000 |
commit | 5627b84fd7b9d09d5cff0d4110e9d71ddd66b7a4 (patch) | |
tree | 59798670adc57b3709c0aad4b3b9e26ad3438612 /sc/source/ui/docshell | |
parent | 21bb49de816bed5e1ed9f6d23f32b6346aef910b (diff) |
INTEGRATION: CWS changefileheader (1.59.34); FILE MERGED
2008/04/01 15:30:42 thb 1.59.34.3: #i85898# Stripping all external header guards
2008/04/01 12:36:41 thb 1.59.34.2: #i85898# Stripping all external header guards
2008/03/31 17:15:29 rt 1.59.34.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 54 |
1 files changed, 18 insertions, 36 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 297c51cdb990..4a69034ad80f 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.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: docsh4.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.59 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-07 12:20:01 $ + * $RCSfile: docsh4.cxx,v $ + * $Revision: 1.60 $ * - * 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. * ************************************************************************/ @@ -37,9 +32,7 @@ #include "precompiled_sc.hxx" -#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ #include <com/sun/star/embed/XEmbeddedObject.hpp> -#endif using namespace ::com::sun::star; @@ -75,19 +68,11 @@ using namespace ::com::sun::star; #include <svx/pageitem.hxx> #include <svx/svditer.hxx> #include <svx/svdpage.hxx> -#ifndef _SVX_FMSHELL_HXX //autogen #include <svx/fmshell.hxx> -#endif -#ifndef _SFX_PASSWD_HXX #include <sfx2/passwd.hxx> -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif #include <sfx2/docinsert.hxx> -#ifndef _SVTOOLS_PASSWORDHELPER_HXX #include <svtools/PasswordHelper.hxx> -#endif #include <comphelper/processfactory.hxx> #include "docuno.hxx" @@ -132,10 +117,7 @@ using namespace ::com::sun::star; #include "rangeseq.hxx" #include "chgtrack.hxx" #include "printopt.hxx" - -#ifndef _COM_SUN_STAR_DOCUMENT_UPDATEDOCMODE_HPP_ #include <com/sun/star/document/UpdateDocMode.hpp> -#endif #include "scresid.hxx" //add by CHINA001 #include "scabstdlg.hxx" //CHINA001 |