tabcontrol: #i113362# impl tabcontrol in awt

4 files changed, 62 insertions, 2 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl b/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl
new file mode 100644
index 000000000000..a91065f72d66
--- /dev/null
+++ b/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * 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).
+ *
+ * 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 __com_sun_star_awt_UnoControlDialogModelProvider_idl__
+#define __com_sun_star_awt_UnoControlDialogModelProvider_idl__
+
+#include <com/sun/star/container/XNameContainer.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt {
+
+//=============================================================================
+
+/** specifies a service to load a dialog model and allows to access the control models inside
+
+    @since OOo 3.3.0
+ */
+service UnoControlDialogModelProvider : com::sun::star::container::XNameContainer
+{
+    /** Creates a new dialog model
+    */
+    create([in] string URL)raises ( com::sun::star::lang::IllegalArgumentException );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index 55734fd75ca6..f5a73d458e1a 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -161,6 +161,7 @@ IDLFILES=\
     UnoControlDialog.idl\
     UnoControlDialogElement.idl\
     UnoControlDialogModel.idl\
+    UnoControlDialogModelProvider.idl\
     UnoControlEdit.idl\
     UnoControlEditModel.idl\
     UnoControlFileControl.idl\
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
index 78570956de92..0f74e21865db 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
@@ -36,12 +36,17 @@ module com {  module sun {  module star {  module awt { module tab {
 //=============================================================================
 
 /** specifies the standard model of a XTabPageModel.
+    @since OOo 3.3.0
  */
 service UnoControlTabPageModel : XTabPageModel
 {
     /** Creates a new XTabPageModel with a given ID.
     */
     create([in] short tabPageID);
+
+    /** Creates a new XTabPageModel with a given ID and a url which is used to load teh tab page model.
+    */
+    load([in] short tabPageID,[in] string url);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
index 606d5e23ac28..65964337c43f 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/awt/tab/XTabPageContainerListener.idl>
 #include <com/sun/star/awt/tab/XTabPage.idl>
-#include <com/sun/star/awt/XControlContainer.idl>
 //=============================================================================
 
 module com {  module sun {  module star {  module awt { module tab {
@@ -42,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.3.0
  */
-interface XTabPageContainer: XControlContainer
+interface XTabPageContainer
 {
     /** Returns the number of tab pages.
         @returns