diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 11:39:05 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 11:39:05 +0000 |
commit | 919867b4a2af9c84c82e34ec72130a16cdadb8bb (patch) | |
tree | 0b3e2dac84d9864105e56a74430f63ad9280ca65 /sfx2/source/dialog | |
parent | dd0d952f52df6a6882315f2329b39232333cfe01 (diff) |
INTEGRATION: CWS changefileheader (1.20.80); FILE MERGED
2008/04/01 15:39:06 thb 1.20.80.3: #i85898# Stripping all external header guards
2008/04/01 12:40:46 thb 1.20.80.2: #i85898# Stripping all external header guards
2008/03/31 13:38:16 rt 1.20.80.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/macropg.cxx | 51 |
1 files changed, 19 insertions, 32 deletions
diff --git a/sfx2/source/dialog/macropg.cxx b/sfx2/source/dialog/macropg.cxx index 26435894f6..915f5e51d3 100644 --- a/sfx2/source/dialog/macropg.cxx +++ b/sfx2/source/dialog/macropg.cxx @@ -1,44 +1,36 @@ /************************************************************************* * - * 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: macropg.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.20 $ + * $RCSfile: macropg.cxx,v $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2008-01-07 09:03:21 $ + * 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_sfx2.hxx" - -#ifndef _BASMGR_HXX //autogen #include <basic/basmgr.hxx> -#endif #ifndef GCC #endif @@ -61,13 +53,8 @@ #include <sfx2/macrconf.hxx> #include <sfx2/sfxdefs.hxx> #include "helpid.hrc" - -#ifndef _HEADERTABLISTBOX_HXX #include "headertablistbox.hxx" -#endif -#ifndef _MACROPG_IMPL_HXX #include "macropg_impl.hxx" -#endif _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) : |