diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-23 16:38:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-23 15:10:56 +0000 |
| commit | 2ce6828bbbf6ba181bb2276adeec279e74151ef6 (patch) | |
| tree | 62fd69e31133237fd2204c3a82dadb9b5cba2a05 /scripting | |
| parent | 9413f2124dff0c38fd52d318d5ac2f392a7d36e0 (diff) | |
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 <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 8722a4706a02..8c645a3569b9 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -88,6 +88,8 @@ namespace dlgprov { //......................................................................... +static OUString aResourceResolverPropName("ResourceResolver"); + Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const OUString& i_sURL) { INetURLObject aInetObj( i_sURL ); @@ -147,7 +149,9 @@ namespace dlgprov // Set resource property if( xStringResourceManager.is() ) { - xDialogModel->setResourceResolver( xStringResourceManager ); + Any aStringResourceManagerAny; + aStringResourceManagerAny <<= xStringResourceManager; + xDialogModel->setPropertyValue( aResourceResolverPropName, aStringResourceManagerAny ); } return xDialogModel; |