diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-16 16:17:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:23:59 +0200 |
commit | be50ad28f5bbdaeff527f646481ce263843c2401 (patch) | |
tree | 65ecdaa5762dda2d9a42cff394a536bf568ed4f6 /filter | |
parent | 6c61b20a8d4a6dcac28801cde82a211fb7e30654 (diff) |
fdo#46808, Convert awt::XUnoControlDialog to new style
Change-Id: I40d2e2ddd92186a2ba22ebfbdda8367391e8d355
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/t602/t602filter.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 0e2d6cff6606..54876048ebc6 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/awt/UnoControlDialog.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> @@ -1062,33 +1063,20 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() _Insert(xNameCont, T602DLG_CODE_LB, ListBoxModel); _Insert(xNameCont, T602DLG_CODE_TXT, TextModel); - Reference< XInterface > dialog = _InstCtx("com.sun.star.awt.UnoControlDialog",rComponentContext); + Reference< XUnoControlDialog > dialog = UnoControlDialog::create(rComponentContext); - Reference < XControl > xControl (dialog,UNO_QUERY); Reference < XControlModel > xControlModel (rInstance,UNO_QUERY); - if(!xControl.is()) - return sal_False; - - xControl->setModel( xControlModel ); + dialog->setModel( xControlModel ); Reference< XInterface > toolkit = _InstCtx("com.sun.star.awt.ExtToolkit", rComponentContext); Reference < XToolkit > xToolkit (toolkit,UNO_QUERY); - Reference < XWindow > xWindow (xControl,UNO_QUERY); - - if(!xWindow.is()) - return sal_False; - xWindow->setVisible( false ); - xControl->createPeer( xToolkit, NULL ); + dialog->setVisible( false ); + dialog->createPeer( xToolkit, NULL ); - Reference < XDialog > xDialog (dialog,UNO_QUERY); - - if(!xDialog.is()) - return sal_False; - - ret = ( xDialog->execute() != 0 ); + ret = ( dialog->execute() != 0 ); if ( ret ) { sal_Int16 tt = 0; @@ -1107,9 +1095,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() } } - Reference < XComponent > xComponent (dialog,UNO_QUERY); - - xComponent->dispose(); + Reference<XControl>(dialog)->dispose(); return ret; } |