mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS changefileheader (1.25.16); FILE MERGED

Browse Source 
2008/04/01 12:27:29 thb 1.25.16.2: #i85898# Stripping all external header guards
2008/03/31 12:22:50 rt 1.25.16.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm
2008-04-11 12:21:49 +00:00
parent f069bbbde5
commit 369fd1883c
1 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
configmgr/source/misc/mergechange.cxx
View File

@@ -1,35 +1,30 @@
/************************************************************************* /*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: mergechange.cxx,v $ * $RCSfile: mergechange.cxx,v $
* $Revision: 1.26 $
* *
* $Revision: 1.25 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: ihi $ $Date: 2007-11-23 14:29:17 $ * 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.
* *
* The Contents of this file are made available subject to * OpenOffice.org is distributed in the hope that it will be useful,
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* 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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Lesser General Public License for more details. * GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public License
* License along with this library; if not, write to the Free Software * version 3 along with OpenOffice.org. If not, see
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * <http://www.openoffice.org/license.html>
* MA 02111-1307 USA * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
@@ -39,39 +34,17 @@
#include <stdio.h> #include <stdio.h>
#include "mergechange.hxx" #include "mergechange.hxx"
#ifndef CONFIGMGR_MERGEHELPER_HXX
#include "mergehelper.hxx" #include "mergehelper.hxx"
#endif
#ifndef CONFIGMGR_UPDATEHELPER_HXX
#include "updatehelper.hxx" #include "updatehelper.hxx"
#endif
#ifndef _CONFIGMGR_TREEACTIONS_HXX_
#include "treeactions.hxx" #include "treeactions.hxx"
#endif
#ifndef CONFIGMGR_CHANGE_HXX
#include "change.hxx" #include "change.hxx"
#endif
#ifndef CONFIGMGR_TREE_CHANGEFACTORY_HXX
#include "treechangefactory.hxx" #include "treechangefactory.hxx"
#endif
#ifndef CONFIGMGR_TREECHANGELIST_HXX
#include "treechangelist.hxx" #include "treechangelist.hxx"
#endif
#ifndef CONFIGMGR_CONFIGEXCEPT_HXX_
#include "configexcept.hxx" #include "configexcept.hxx"
#endif
#ifndef CONFIGMGR_TREEACCESSOR_HXX
#include "treeaccessor.hxx" #include "treeaccessor.hxx"
#endif
#ifndef _CONFIGMGR_TRACER_HXX_
#include "tracer.hxx" #include "tracer.hxx"
#endif
#define ASCII(x) rtl::OUString::createFromAscii(x) #define ASCII(x) rtl::OUString::createFromAscii(x)