diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-20 13:54:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:23:59 +0200 |
commit | 5ab3015aaec7bea309721fcf04af06c8c1519fcb (patch) | |
tree | 9740f1aed062c472d43d8c6cc3a17ad4081848fb /filter | |
parent | be50ad28f5bbdaeff527f646481ce263843c2401 (diff) |
fdo#46808, Clean up old usages of ExtToolkit
This service no longer exists in LO, and no-one seems to know what
this service was, so convert it to use the awt::Toolkit service,
since that service returns the interface the code expects.
Change-Id: I761effbd49a9a3a15ec9c8716c72d4220a3e987e
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/t602/t602filter.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 54876048ebc6..0d3c948e0996 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -25,6 +25,7 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/UnoControlDialogModel.hpp> #include <com/sun/star/bridge/XUnoUrlResolver.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -939,9 +940,6 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() _prop->setPropertyValue(OUString::createFromAscii(_nam), any); #define _propGet(_prop,_nam) \ _prop->getPropertyValue(OUString::createFromAscii(_nam)); -#define _InstCtx(_path,_ctx)\ - rServiceManager->createInstanceWithContext(\ - OUString::createFromAscii(_path),_ctx); #define _Insert(_cont,_nam,_obj) \ any <<= _obj;\ _cont->insertByName( OUString::createFromAscii(_nam), any ); @@ -1069,9 +1067,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() dialog->setModel( xControlModel ); - Reference< XInterface > toolkit = _InstCtx("com.sun.star.awt.ExtToolkit", rComponentContext); - - Reference < XToolkit > xToolkit (toolkit,UNO_QUERY); + Reference < XToolkit > xToolkit = Toolkit::create( rComponentContext ); dialog->setVisible( false ); dialog->createPeer( xToolkit, NULL ); |