summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/odma
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 14:22:34 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 14:22:34 +0000
commit274cbd3f3bca8e9f163bba9b5dde061bb25b5fdd (patch)
treeb66d46308555b9a3969e5f93645288156e58fa2f /ucb/source/ucp/odma
parent49bfb34f5df7368b292869ec1a6cca105012d6a5 (diff)
INTEGRATION: CWS changefileheader (1.5.72); FILE MERGED
2008/04/01 16:02:22 thb 1.5.72.3: #i85898# Stripping all external header guards 2008/04/01 12:58:21 thb 1.5.72.2: #i85898# Stripping all external header guards 2008/03/31 15:30:26 rt 1.5.72.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'ucb/source/ucp/odma')
-rw-r--r--ucb/source/ucp/odma/odma_provider.hxx50
-rw-r--r--ucb/source/ucp/odma/odma_resultset.hxx48
2 files changed, 38 insertions, 60 deletions
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index ef052906fc..682e44fa64 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -1,55 +1,43 @@
/*************************************************************************
*
- * 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_provider.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.5 $
+ * $RCSfile: odma_provider.hxx,v $
+ * $Revision: 1.6 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 18:11:12 $
+ * 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.
*
************************************************************************/
#ifndef ODMA_PROVIDER_HXX
#define ODMA_PROVIDER_HXX
-#ifndef _UCBHELPER_PROVIDERHELPER_HXX
#include <ucbhelper/providerhelper.hxx>
-#endif
-#ifndef ODMA_LIB_HXX
#include "odma_lib.hxx"
-#endif
#include "rtl/ref.hxx"
#include <map>
-
-#ifndef ODMA_CONTENTPROPS_HXX
#include "odma_contentprops.hxx"
-#endif
namespace odma {
diff --git a/ucb/source/ucp/odma/odma_resultset.hxx b/ucb/source/ucp/odma/odma_resultset.hxx
index 9b62ae9cad..cb1ac90597 100644
--- a/ucb/source/ucp/odma/odma_resultset.hxx
+++ b/ucb/source/ucp/odma/odma_resultset.hxx
@@ -1,50 +1,40 @@
/*************************************************************************
*
- * 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.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.5 $
+ * $RCSfile: odma_resultset.hxx,v $
+ * $Revision: 1.6 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 18:11:39 $
+ * 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.
*
************************************************************************/
#ifndef ODMA_RESULTSET_HXX
#define ODMA_RESULTSET_HXX
-#ifndef _UCBHELPER_RESULTSETHELPER_HXX
#include <ucbhelper/resultsethelper.hxx>
-#endif
#include "rtl/ref.hxx"
-
-#ifndef ODMA_CONTENT_HXX
#include "odma_content.hxx"
-#endif
namespace odma {