summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 14:22:49 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 14:22:49 +0000
commit2181102589bc4553a9a2d66f8886bc3aa52cc36b (patch)
treef69534d15dda2f788eed4fff99dcdec6d423f300 /ucb/source
parent274cbd3f3bca8e9f163bba9b5dde061bb25b5fdd (diff)
INTEGRATION: CWS changefileheader (1.6.72); FILE MERGED
2008/04/01 12:58:21 thb 1.6.72.2: #i85898# Stripping all external header guards 2008/03/31 15:30:26 rt 1.6.72.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/odma/odma_resultset.cxx48
-rw-r--r--ucb/source/ucp/odma/odma_services.cxx57
2 files changed, 38 insertions, 67 deletions
diff --git a/ucb/source/ucp/odma/odma_resultset.cxx b/ucb/source/ucp/odma/odma_resultset.cxx
index 0b3724e39b..2fdd2aa0fd 100644
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_resultset.cxx
@@ -1,35 +1,30 @@
/*************************************************************************
*
- * 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: odma_resultset.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.6 $
+ * $RCSfile: odma_resultset.cxx,v $
+ * $Revision: 1.7 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 18:11:26 $
+ * 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.
*
************************************************************************/
@@ -44,13 +39,8 @@
the necessary interfaces, but never recognizes/notifies changes!!!
*************************************************************************/
-
-#ifndef ODMA_DATASUPPLIER_HXX
#include "odma_datasupplier.hxx"
-#endif
-#ifndef ODMA_RESULTSET_HXX
#include "odma_resultset.hxx"
-#endif
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 86d582ecf2..1acb689f86 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -1,60 +1,41 @@
/*************************************************************************
*
- * 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: odma_services.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.6 $
+ * $RCSfile: odma_services.cxx,v $
+ * $Revision: 1.7 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 18:11:53 $
+ * 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_ucb.hxx"
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_
#include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
-
-#ifndef ODMA_CONTENTPROPS_HXX
#include "odma_contentprops.hxx"
-#endif
-#ifndef ODMA_PROVIDER_HXX
#include "odma_provider.hxx"
-#endif
-#ifndef ODMA_LIB_HXX
#include "odma_lib.hxx"
-#endif
using namespace rtl;
using namespace com::sun::star::uno;