From 2ce6828bbbf6ba181bb2276adeec279e74151ef6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 23 May 2013 16:38:15 +0200 Subject: fix awt::UnoControlModelDialog crash ...in commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654, "Convert awt::UnoControlDialogModel to new style" I added an attribute "ResourceResolver" because some of the client code was setting it using the property interface. It turns out that this was a bad idea because the "ResourceResolver" property is doing some very interesting stuff, so revert that part of the change. Change-Id: I62b890e60164e005867ced49c3e407a49ed09441 Reviewed-on: https://gerrit.libreoffice.org/4013 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- offapi/com/sun/star/awt/XUnoControlDialogModel.idl | 3 --- offapi/com/sun/star/resource/XStringResourceManager.idl | 2 +- offapi/com/sun/star/resource/XStringResourceResolver.idl | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl index 81cd2b1fd569..9032a37b582d 100644 --- a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl +++ b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module awt { @@ -67,8 +66,6 @@ published interface XUnoControlDialogModel [attribute] string DialogSourceURL; - [attribute] com::sun::star::resource::XStringResourceManager ResourceResolver; - /** specifies the text that is displayed in the caption bar of the dialog. */ [attribute] string Title; diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl index 423bedf61cf6..ad9a8f39062f 100644 --- a/offapi/com/sun/star/resource/XStringResourceManager.idl +++ b/offapi/com/sun/star/resource/XStringResourceManager.idl @@ -44,7 +44,7 @@ module com { module sun { module star { module resource { localized dialogs. */ -published interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver +interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver { /** Returns the resource's read only state diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl index 49bd841fa47c..d236f0d69ddf 100644 --- a/offapi/com/sun/star/resource/XStringResourceResolver.idl +++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl @@ -42,7 +42,7 @@ module com { module sun { module star { module resource { But also changing the locale at runtime can be supported in this way. */ -published interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster +interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster { /** Resolves the passed ResoureID for the current locale. This -- cgit v1.2.3