summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-11-24 20:08:12 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-11-24 20:12:00 +0100
commitdb160a3cd5aa8d42ac90efd91b4c1825a9fe3156 (patch)
tree1ad93a7031d4dc982c99ffac463186b81bb23c35
parentd7a5ec62e91ce3dc5b784815254218f16181f676 (diff)
fdo#46808: move com::sun::star:sdbc::DriverManager to new UNO-style
Change-Id: I9807fbe8bce95e7e801ac584d89b3b1da97d8662
-rw-r--r--offapi/UnoApi_offapi.mk2
-rw-r--r--offapi/com/sun/star/sdbc/DriverManager.idl41
-rw-r--r--offapi/com/sun/star/sdbc/XDriverManager2.idl60
-rw-r--r--offapi/type_reference/types.rdbbin7655424 -> 7655424 bytes
4 files changed, 65 insertions, 38 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f1e53a29be08..6e85574e5e99 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -247,6 +247,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/applic
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
ConnectionPool \
+ DriverManager \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
CertificateContainer \
@@ -3194,6 +3195,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
XDriver \
XDriverAccess \
XDriverManager \
+ XDriverManager2 \
XGeneratedResultSet \
XIsolatedConnection \
XMultipleResults \
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index 7d04d9c18c39..e9166ef91572 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -19,49 +19,14 @@
#ifndef __com_sun_star_sdbc_DriverManager_idl__
#define __com_sun_star_sdbc_DriverManager_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
+#include <com/sun/star/sdbc/XDriverManager2.idl>
- module com { module sun { module star { module sdbc {
-
- published interface XConnection;
- published interface XDriver;
- published interface XDriverManager;
-
-
-/** is the basic service for managing a set of SDBC drivers.
-
-
- <p>
- As part of its initialization, the DriverManager service will
- attempt to load the registered drivers.
-
- </p>
- <p>
- When the method <code>getConnection</code> is called,
- the DriverManager will attempt to
- locate a suitable driver.
-
- </p>
- @see com::sun::star::sdbc::XDriver
- @see com::sun::star::sdbc::XConnection
- */
-published service DriverManager
-{
-
- /** is the basic interface for establishing database connections.
- */
- interface XDriverManager;
-
- /** creates an enumeration on all installed / registered drivers.
- */
- interface com::sun::star::container::XEnumerationAccess;
-};
+module com { module sun { module star { module sdbc {
+published service DriverManager : XDriverManager2;
}; }; }; };
-/*===========================================================================
-===========================================================================*/
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sdbc/XDriverManager2.idl b/offapi/com/sun/star/sdbc/XDriverManager2.idl
new file mode 100644
index 000000000000..6512eb3131cc
--- /dev/null
+++ b/offapi/com/sun/star/sdbc/XDriverManager2.idl
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_sdbc_XDriverManager2_idl__
+#define __com_sun_star_sdbc_XDriverManager2_idl__
+
+#include <com/sun/star/container/XEnumerationAccess.idl>
+#include <com/sun/star/sdbc/XDriverManager.idl>
+
+module com { module sun { module star { module sdbc {
+
+/** is the basic interface for managing a set of SDBC drivers.
+
+ <p>
+ As part of its initialization, the DriverManager service will
+ attempt to load the registered drivers.
+
+ </p>
+ <p>
+ When the method <code>getConnection</code> is called,
+ the DriverManager will attempt to
+ locate a suitable driver.
+
+ </p>
+ @see com::sun::star::sdbc::XDriver
+ @see com::sun::star::sdbc::XConnection
+ */
+published interface XDriverManager2
+{
+
+ /** is the basic interface for establishing database connections.
+ */
+ interface XDriverManager;
+
+ /** creates an enumeration on all installed / registered drivers.
+ */
+ interface com::sun::star::container::XEnumerationAccess;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 05eb70a05fc3..4478c945a67b 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ