diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-27 11:24:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-28 08:10:22 +0200 |
commit | 1d1825db869d3c633ec222fdaa7e4a813ac0627a (patch) | |
tree | d1c84dfbe5780bc063d78c335783fa9cffda800e /offapi | |
parent | 61fffd72ac9f09b95faf266f29e643c7bff802bd (diff) |
fdo#46808, Convert awt::UnoControlDialog to new style
Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/UnoControlDialog.idl | 20 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/XUnoControlDialog.idl | 58 | ||||
-rw-r--r-- | offapi/type_reference/offapi.rdb | bin | 6833152 -> 6832128 bytes |
4 files changed, 63 insertions, 18 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index dcaf757c6a79..a0488b127c4a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -60,6 +60,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ PopupMenu \ TabController \ Toolkit \ + UnoControlDialog \ UnoControlDialogModelProvider \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ @@ -524,7 +525,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ UnoControlCurrencyFieldModel \ UnoControlDateField \ UnoControlDateFieldModel \ - UnoControlDialog \ UnoControlDialogElement \ UnoControlDialogModel \ UnoControlEdit \ @@ -1884,6 +1884,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XTopWindowListener \ XUnitConversion \ XUnoControlContainer \ + XUnoControlDialog \ XUserInputInterception \ XVclContainer \ XVclContainerListener \ diff --git a/offapi/com/sun/star/awt/UnoControlDialog.idl b/offapi/com/sun/star/awt/UnoControlDialog.idl index 4cc079e4f082..67e0b79b8381 100644 --- a/offapi/com/sun/star/awt/UnoControlDialog.idl +++ b/offapi/com/sun/star/awt/UnoControlDialog.idl @@ -19,28 +19,14 @@ #ifndef __com_sun_star_awt_UnoControlDialog_idl__ #define __com_sun_star_awt_UnoControlDialog_idl__ -#include <com/sun/star/awt/UnoControlContainer.idl> +#include <com/sun/star/awt/XUnoControlDialog.idl> -#include <com/sun/star/awt/XTopWindow.idl> - -#include <com/sun/star/awt/XDialog2.idl> - - - - module com { module sun { module star { module awt { +module com { module sun { module star { module awt { /** specifies a dialog control. */ -published service UnoControlDialog -{ - service com::sun::star::awt::UnoControlContainer; - - interface com::sun::star::awt::XTopWindow; - - interface com::sun::star::awt::XDialog2; - -}; +published service UnoControlDialog : XUnoControlDialog; }; }; }; }; diff --git a/offapi/com/sun/star/awt/XUnoControlDialog.idl b/offapi/com/sun/star/awt/XUnoControlDialog.idl new file mode 100644 index 000000000000..3d513b71adc3 --- /dev/null +++ b/offapi/com/sun/star/awt/XUnoControlDialog.idl @@ -0,0 +1,58 @@ +/* -*- 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_awt_XUnoControlDialog_idl__ +#define __com_sun_star_awt_XUnoControlDialog_idl__ + +#include <com/sun/star/container/XNameContainer.idl> +#include <com/sun/star/awt/XControl.idl> +#include <com/sun/star/awt/XDialog2.idl> +#include <com/sun/star/awt/XTopWindow.idl> +#include <com/sun/star/awt/XControlContainer.idl> +#include <com/sun/star/awt/XWindow.idl> + + +module com { module sun { module star { module awt { + +/** + The interface for the UnoControlDialog service. + This service actually implements a whole whack of interfaces. This is the just + the subset that our code needs. + + @since LibreOffice 4.1 + */ +published interface XUnoControlDialog +{ + + interface com::sun::star::awt::XControlContainer; // -> XInterface + + interface com::sun::star::awt::XControl; // -> XComponent + + interface com::sun::star::awt::XWindow; // -> XComponent + + interface com::sun::star::awt::XTopWindow; // -> XInterface + + interface com::sun::star::awt::XDialog2; // -> XDialog -> XInterface +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb Binary files differindex 0d73ab1bc233..88226211f543 100644 --- a/offapi/type_reference/offapi.rdb +++ b/offapi/type_reference/offapi.rdb |