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 /include | |
| 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 'include')
| -rw-r--r-- | include/toolkit/controls/dialogcontrol.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index f92652a8ef0f..a749c241fbc7 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -166,9 +166,6 @@ public: { return getPropertyString("ImageURL"); } virtual void SAL_CALL setImageURL(const rtl::OUString& p1) throw(::com::sun::star::uno::RuntimeException) { setPropertyString("ImageURL", p1); } - virtual com::sun::star::uno::Reference<com::sun::star::resource::XStringResourceManager> SAL_CALL getResourceResolver() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setResourceResolver(const com::sun::star::uno::Reference<com::sun::star::resource::XStringResourceManager>& p1) throw(::com::sun::star::uno::RuntimeException) - { setPropertyValue( "ResourceResolver", css::uno::Any(p1) ); } virtual com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFontDescriptor(const com::sun::star::awt::FontDescriptor& p1) throw(::com::sun::star::uno::RuntimeException) { setPropertyValue( "FontDescriptor", css::uno::Any(p1) ); } |