fdo#46808, convert sdb::QueryDesigner to new style

Change-Id: I694dd16920304d0f07369e97c87a4a97b92eadeb

4 files changed, 56 insertions, 40 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 2c18bf8c84c7..7151bc3e4e34 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -292,6 +292,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
 	InteractionHandler \
     FilterDialog \
     OrderDialog \
+	QueryDefinition \
 	ReportDesign \
 	TableDefinition \
 	TextConnectionSettings \
@@ -1042,7 +1043,6 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,
 	OrderColumn \
 	PreparedStatement \
 	Query \
-	QueryDefinition \
 	QueryDescriptor \
 	QueryDesign \
 	RelationDesign \
@@ -3125,6 +3125,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\
 	XOfficeDatabaseDocument \
 	XParametersSupplier \
 	XQueriesSupplier \
+	XQueryDefinition \
 	XQueryDefinitionsSupplier \
 	XReportDocumentsSupplier \
 	XResultSetAccess \
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 6107e3119086..2f0f7fe3515f 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -19,7 +19,7 @@
 #ifndef __com_sun_star_sdb_QueryDefinition_idl__
 #define __com_sun_star_sdb_QueryDefinition_idl__
 
-#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/sdb/XQueryDefinition.idl>
 
  module com {  module sun {  module star {  module sdb {
 
@@ -30,44 +30,7 @@
     It can be used, if there is a need to execute SQL statement more than once.
     </p>
  */
-published service QueryDefinition
-{
-
-    /** access to the owning database definition object.
-     */
-    interface com::sun::star::beans::XPropertySet;
-
-
-    /** is the name of the definition.
-     */
-    [readonly, property] string Name;
-
-
-    /** is the command of the query, this is typically a select statement.
-     */
-    [property] string Command;
-
-
-    /** should we use escape processing for the query.
-     */
-    [property] boolean EscapeProcessing;
-
-
-    /** is the name of the table which should be updated. This is usually used
-        for queries which relate on more than one table.
-     */
-    [property] string UpdateTableName;
-
-
-    /** is the name of the update table catalog.
-     */
-    [property] string UpdateCatalogName;
-
-
-    /** is the name of the update table schema.
-     */
-    [property] string UpdateSchemaName;
-};
+published service QueryDefinition : XQueryDefinition;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/sdb/XQueryDefinition.idl b/offapi/com/sun/star/sdb/XQueryDefinition.idl
new file mode 100644
index 000000000000..064a7bba897b
--- /dev/null
+++ b/offapi/com/sun/star/sdb/XQueryDefinition.idl
@@ -0,0 +1,52 @@
+/* -*- 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_sdb_XQueryDefinition_idl__
+#define __com_sun_star_sdb_XQueryDefinition_idl__
+
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/ucb/XContent.idl>
+#include <com/sun/star/lang/XComponent.idl>
+
+ module com {  module sun {  module star {  module sdb {
+
+
+/**
+    @since LibreOffice 4.1
+ */
+published interface XQueryDefinition
+{
+
+    /** access to the owning database definition object.
+     */
+    interface com::sun::star::beans::XPropertySet;
+
+    interface com::sun::star::ucb::XContent;
+
+    interface com::sun::star::lang::XComponent;
+
+};
+
+
+}; }; }; };
+
+/*===========================================================================
+===========================================================================*/
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index f3483965dc05..b0c2c88a8ae8 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb