diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 21:24:51 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 21:24:51 +0000 |
commit | 5b6c93fc202199ce7d06faf2638f97573231dfce (patch) | |
tree | fd52afbfcf53d4b13b3f5df6d0903082c02d4d5c /xmloff/source/style/PageMasterStyleMap.cxx | |
parent | 23aac4dde8e206b8288ccc9a67522aa3f28a669f (diff) |
INTEGRATION: CWS changefileheader (1.32.20); FILE MERGED
2008/04/01 13:04:58 thb 1.32.20.2: #i85898# Stripping all external header guards
2008/03/31 16:28:19 rt 1.32.20.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'xmloff/source/style/PageMasterStyleMap.cxx')
-rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index fb65a42dd73d..ba849d07c47f 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.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: PageMasterStyleMap.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.32 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-07 16:17:44 $ + * $RCSfile: PageMasterStyleMap.cxx,v $ + * $Revision: 1.33 $ * - * 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. * ************************************************************************/ @@ -39,13 +34,8 @@ #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include <xmloff/PageMasterStyleMap.hxx> #endif - -#ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif using namespace ::xmloff::token; |