fdo#46808, Convert beans::PropertyBag to new style

Change-Id: Ibb2466af4c9289cba93b8330d10db033d296bfc1

3 files changed, 56 insertions, 13 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index c907baa29dcd..0b13cac31eb8 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
 	udk-modules \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
-	PropertyBag \
 	PropertySet \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
@@ -97,6 +96,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
 ))
 
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
+	PropertyBag \
 	Introspection \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
@@ -196,6 +196,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
 	XPropertiesChangeNotifier \
 	XProperty \
 	XPropertyAccess \
+	XPropertyBag \
 	XPropertyChangeListener \
 	XPropertyContainer \
 	XPropertySet \
diff --git a/udkapi/com/sun/star/beans/PropertyBag.idl b/udkapi/com/sun/star/beans/PropertyBag.idl
index 14c0605bb8f1..5cb477458a25 100644
--- a/udkapi/com/sun/star/beans/PropertyBag.idl
+++ b/udkapi/com/sun/star/beans/PropertyBag.idl
@@ -19,15 +19,11 @@
 #ifndef __com_sun_star_beans_PropertyBag_idl__
 #define __com_sun_star_beans_PropertyBag_idl__
 
-#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/beans/XPropertyBag.idl>
 
-#include <com/sun/star/beans/XPropertyContainer.idl>
 
-#include <com/sun/star/beans/XPropertyAccess.idl>
 
-
-
- module com {  module sun {  module star {  module beans {
+module com {  module sun {  module star {  module beans {
 
 
 /** Implementation of this service can keep any properties and is useful
@@ -37,14 +33,11 @@
     property sets, giving direct access to the properties.  In this case,
     use the methods like <member>XPropertySet::getPropertyValue</member>.
  */
-published service PropertyBag
+published service PropertyBag : XPropertyBag
 {
-    interface com::sun::star::beans::XPropertySet;
-
-    interface com::sun::star::beans::XPropertyContainer;
-
-    interface com::sun::star::beans::XPropertyAccess;
+    createDefault();
 
+    createWithTypes( [in] sequence<type> AllowedTypes, [in] boolean AllowEmptyPropertyName, [in] boolean AutomaticAddition );
 };
 
 
diff --git a/udkapi/com/sun/star/beans/XPropertyBag.idl b/udkapi/com/sun/star/beans/XPropertyBag.idl
new file mode 100644
index 000000000000..3d9efd0abb6c
--- /dev/null
+++ b/udkapi/com/sun/star/beans/XPropertyBag.idl
@@ -0,0 +1,49 @@
+/* -*- 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_beans_XPropertyBag_idl__
+#define __com_sun_star_beans_XPropertyBag_idl__
+
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/beans/XPropertyContainer.idl>
+#include <com/sun/star/beans/XPropertyAccess.idl>
+
+
+
+ module com {  module sun {  module star {  module beans {
+
+
+/**
+    @since LibreOffice 4.1
+ */
+published interface XPropertyBag
+{
+    interface com::sun::star::beans::XPropertySet;
+
+    interface com::sun::star::beans::XPropertyContainer;
+
+    interface com::sun::star::beans::XPropertyAccess;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */