summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-23 16:38:15 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-05-24 14:42:21 +0200
commit5e0e21f083b034d78d1d24377ce4e7bd2d6b1ef3 (patch)
tree9926d83311e0e4c4bb9e489eb65ac8e20284abb3 /toolkit/source
parentcc83b1619bfd1e0648544404241924fd819592de (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> (cherry picked from commit 2ce6828bbbf6ba181bb2276adeec279e74151ef6)
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx8
1 files changed, 0 insertions, 8 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index bd3ce4c09771..6042203dc30f 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -307,14 +307,6 @@ sal_Int32 UnoControlDialogModel::getPropertyInt32(const OUString& aPropertyName)
return b;
}
-Reference<css::resource::XStringResourceManager> UnoControlDialogModel::getResourceResolver() throw(css::uno::RuntimeException)
-{
- uno::Any any = getPropertyValue("ResourceResolver");
- Reference<css::resource::XStringResourceManager> b;
- any >>= b;
- return b;
-}
-
css::awt::FontDescriptor UnoControlDialogModel::getFontDescriptor() throw(css::uno::RuntimeException)
{
uno::Any any = getPropertyValue("FontDescriptor");