strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS changefileheader (1.2.450); FILE MERGED

Browse source 
2008/04/01 13:04:12 thb 1.2.450.2: #i85898# Stripping all external header guards
2008/03/31 16:27:52 rt 1.2.450.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-10 19:34:46 +00:00
parent 911048c871
commit bbee5f74ae
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
xmloff/inc/PropertySetMerger.hxx
View file

@ -1,44 +1,37 @@
/************************************************************************* /*************************************************************************
* *
* OpenOffice.org - a multi-platform office productivity suite * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* $RCSfile: PropertySetMerger.hxx,v $ * Copyright 2008 by Sun Microsystems, Inc.
* *
* $Revision: 1.2 $ * OpenOffice.org - a multi-platform office productivity suite
* *
* last change: $Author: rt $ $Date: 2005-09-09 12:40:22 $ * $RCSfile: PropertySetMerger.hxx,v $
* $Revision: 1.3 $
* *
* The Contents of this file are made available subject to * This file is part of OpenOffice.org.
* 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.
* *
* GNU Lesser General Public License Version 2.1 * OpenOffice.org is distributed in the hope that it will be useful,
* ============================================= * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright 2005 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 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 * You should have received a copy of the GNU Lesser General Public License
* modify it under the terms of the GNU Lesser General Public * version 3 along with OpenOffice.org. If not, see
* License version 2.1, as published by the Free Software Foundation. * <http://www.openoffice.org/license.html>
* * for a copy of the LGPLv3 License.
* 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
* *
************************************************************************/ ************************************************************************/
#ifndef _XMLOFF_PROPERTYSETMERGER_HXX_ #ifndef _XMLOFF_PROPERTYSETMERGER_HXX_
#define _XMLOFF_PROPERTYSETMERGER_HXX_ #define _XMLOFF_PROPERTYSETMERGER_HXX_
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#endif
extern ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > extern ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
PropertySetMerger_CreateInstance( PropertySetMerger_CreateInstance(