5 files changed, 25 insertions, 30 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index a05b9eff04d7..258f746f54f1 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
 #include <tools/shl.hxx>
@@ -121,6 +121,7 @@
 #include <langhelper.hxx>
 
 #include <wordcountdialog.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -387,14 +388,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
         {
             try
             {
-                uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY);
-                if( xDialog.is() )
-                {
-                    xDialog->execute();
-                }
+                uno::Reference < ui::dialogs::XExecutableDialog > xDialog = ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() );
+                xDialog->execute();
             }
             catch (const uno::Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION();
             }
             rReq.Ignore ();
         }
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 7f76454fe223..a47eba8ab026 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -37,9 +37,10 @@
 #include <swwait.hxx>
 #include <docstat.hxx>
 #include <IDocumentStatistics.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 
 #include <svx/xtable.hxx>
 
@@ -206,14 +207,12 @@ void SwDrawShell::Execute(SfxRequest &rReq)
         {
             try
             {
-                uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY);
-                if( xDialog.is() )
-                {
-                    xDialog->execute();
-                }
+                uno::Reference < ui::dialogs::XExecutableDialog > xDialog = ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() );
+                xDialog->execute();
             }
             catch (const uno::Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION();
             }
             rReq.Ignore ();
         }
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 59b34c638b20..90cd5db13de5 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
@@ -71,6 +71,7 @@
 #include <editeng/editview.hxx>
 #include <vcl/outdev.hxx>
 #include <editeng/hyphenzoneitem.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <cmdid.h>
 #include <doc.hxx>
@@ -326,14 +327,12 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
         {
             try
             {
-                uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY);
-                if( xDialog.is() )
-                {
-                    xDialog->execute();
-                }
+                uno::Reference < ui::dialogs::XExecutableDialog > xDialog = ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() );
+                xDialog->execute();
             }
             catch (const uno::Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION();
             }
             rReq.Ignore ();
         }
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 8f7f34f88585..f8725d6caec8 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -39,6 +39,7 @@
 // #i73249#
 #include <svx/svdview.hxx>
 #include <vcl/msgbox.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <doc.hxx>
 #include <fmturl.hxx>
@@ -62,7 +63,7 @@
 #include <IDocumentStatistics.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 
 #include <helpid.h>
 #include <cmdid.h>
@@ -252,14 +253,12 @@ void SwFrameShell::Execute(SfxRequest &rReq)
         {
             try
             {
-                uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY);
-                if( xDialog.is() )
-                {
-                    xDialog->execute();
-                }
+                uno::Reference < ui::dialogs::XExecutableDialog > xDialog = ui::dialogs::XSLTFilterDialog::create(::comphelper::getProcessComponentContext());
+                xDialog->execute();
             }
             catch (const uno::Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION();
             }
             rReq.Ignore ();
         }
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index cb2f82e66a5d..01cb63599e6a 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -19,7 +19,7 @@
 
 
 #include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <hintids.hxx>
@@ -114,6 +114,7 @@
 #include <langhelper.hxx>
 #include <uiitems.hxx>
 #include <wordcountdialog.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -1244,14 +1245,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
     {
         try
         {
-            uno::Reference < ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), uno::UNO_QUERY);
-            if( xDialog.is() )
-            {
-                xDialog->execute();
-            }
+            uno::Reference < ui::dialogs::XExecutableDialog > xDialog = ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() );
+            xDialog->execute();
         }
         catch (const uno::Exception&)
         {
+            DBG_UNHANDLED_EXCEPTION();
         }
         rReq.Ignore ();
     }