fdo#46808, Adapt sdbc::ConnectionPool UNO service to new style

ConnectionPool was already a new-style service, but since it was
not exposing all of it's interfaces properly I had to create
a unified interface XConnectionPool.

Change-Id: Idfa3fa3335173ceeab1785b4049422874b6c9d5a

3 files changed, 45 insertions, 2 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 295cc9042caa..eab0bf35086a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3150,6 +3150,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\
 	XCloseable \
 	XColumnLocate \
 	XConnection \
+	XConnectionPool \
 	XDataSource \
 	XDatabaseMetaData \
 	XDatabaseMetaData2 \
diff --git a/offapi/com/sun/star/sdbc/ConnectionPool.idl b/offapi/com/sun/star/sdbc/ConnectionPool.idl
index b9c9e7a2226a..0a3028427ef9 100644
--- a/offapi/com/sun/star/sdbc/ConnectionPool.idl
+++ b/offapi/com/sun/star/sdbc/ConnectionPool.idl
@@ -21,7 +21,7 @@
 
  module com {  module sun {  module star {  module sdbc {
 
- published interface XDriverManager;
+ published interface XConnectionPool;
 
 
 /** is the basic service for pooling SDBC connections.
@@ -38,7 +38,7 @@
     @see com::sun::star::sdbc::XDriver
     @see com::sun::star::sdbc::XConnection
  */
-published service ConnectionPool: XDriverManager;
+published service ConnectionPool: XConnectionPool;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/sdbc/XConnectionPool.idl b/offapi/com/sun/star/sdbc/XConnectionPool.idl
new file mode 100644
index 000000000000..2cb87f5d7f52
--- /dev/null
+++ b/offapi/com/sun/star/sdbc/XConnectionPool.idl
@@ -0,0 +1,42 @@
+/* -*- 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_XConnectionPool_idl__
+#define __com_sun_star_sdbc_XConnectionPool_idl__
+
+#include <com/sun/star/sdbc/XDriverManager.idl>
+#include <com/sun/star/sdbc/XDriverAccess.idl>
+
+module com {  module sun {  module star {  module sdbc {
+
+/*
+  @since LibreOffice 4.1
+*/
+published interface XConnectionPool
+{
+    interface XDriverManager;
+    interface XDriverAccess;
+};
+
+
+}; }; }; };
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */