diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-27 11:24:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-28 08:10:22 +0200 |
| commit | 1d1825db869d3c633ec222fdaa7e4a813ac0627a (patch) | |
| tree | d1c84dfbe5780bc063d78c335783fa9cffda800e /filter | |
| parent | 61fffd72ac9f09b95faf266f29e643c7bff802bd (diff) | |
fdo#46808, Convert awt::UnoControlDialog to new style
Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
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 4ef5b6deeecf..9218eb75483e 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> @@ -1067,31 +1068,18 @@ 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 < XToolkit > xToolkit = Toolkit::create( rComponentContext ); - 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; @@ -1110,9 +1098,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() } } - Reference < XComponent > xComponent (dialog,UNO_QUERY); - - xComponent->dispose(); + Reference<XControl>(dialog)->dispose(); return ret; } |