INTEGRATION: CWS changefileheader (1.4.262); FILE MERGED
2008/04/01 10:58:16 thb 1.4.262.2: #i85898# Stripping all external header guards 2008/03/28 15:35:36 rt 1.4.262.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm
parent
86029eea18
commit
12fe318e0a
2 changed files with 36 additions and 61 deletions
|
|
@ -1,35 +1,30 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* $RCSfile: statusindicatorinterfacewrapper.cxx,v $
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* $Revision: 1.4 $
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2006-09-16 14:24:59 $
|
||||
* $RCSfile: statusindicatorinterfacewrapper.cxx,v $
|
||||
* $Revision: 1.5 $
|
||||
*
|
||||
* 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,18 +34,9 @@
|
|||
//_________________________________________________________________________________________________________________
|
||||
// my own includes
|
||||
//_________________________________________________________________________________________________________________
|
||||
|
||||
#ifndef __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_
|
||||
#include <uielement/statusindicatorinterfacewrapper.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
|
||||
#include <uielement/progressbarwrapper.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
|
||||
#include <threadhelp/resetableguard.hxx>
|
||||
#endif
|
||||
|
||||
//_________________________________________________________________________________________________________________
|
||||
// other includes
|
||||
|
|
|
|||
|
|
@ -1,35 +1,30 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* $RCSfile: toolbar.cxx,v $
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* $Revision: 1.4 $
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2006-09-16 14:25:29 $
|
||||
* $RCSfile: toolbar.cxx,v $
|
||||
* $Revision: 1.5 $
|
||||
*
|
||||
* 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,14 +34,8 @@
|
|||
//_________________________________________________________________________________________________________________
|
||||
// my own includes
|
||||
//_________________________________________________________________________________________________________________
|
||||
|
||||
#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX_
|
||||
#include <uielement/toolbar.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
|
||||
#include <uielement/toolbarmanager.hxx>
|
||||
#endif
|
||||
|
||||
namespace framework
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue