summaryrefslogtreecommitdiff
path: root/desktop/test/deployment/passive/passive_native.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/test/deployment/passive/passive_native.cxx')
-rw-r--r--desktop/test/deployment/passive/passive_native.cxx24
1 files changed, 11 insertions, 13 deletions
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index c3fb5a3b0e72..819f6ab0ef59 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -29,7 +29,7 @@
#include "com/sun/star/awt/XWindowPeer.hpp"
#include "com/sun/star/beans/PropertyValue.hpp"
#include "com/sun/star/frame/DispatchDescriptor.hpp"
-#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/Desktop.hpp"
#include "com/sun/star/frame/XDispatch.hpp"
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XFrame.hpp"
@@ -213,23 +213,21 @@ void Dispatch::dispatch(
css::uno::Sequence< css::beans::PropertyValue > const &)
throw (css::uno::RuntimeException)
{
+ css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(context_);
+ css::uno::Reference< css::frame::XFrame > xFrame = xDesktop->getCurrentFrame();
+ css::uno::Reference< css::awt::XWindowPeer > xWindowPeer( xFrame->getComponentWindow(), css::uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::awt::XToolkit2 > xToolkit = css::awt::Toolkit::create(context_);
css::uno::Reference< css::awt::XMessageBox > box(
- css::awt::Toolkit::create(context_)->createMessageBox(
- css::uno::Reference< css::awt::XWindowPeer >(
- css::uno::Reference< css::frame::XFrame >(
- css::uno::Reference< css::frame::XDesktop >(
- (context_->getServiceManager()->
- createInstanceWithContext(
- "com.sun.star.frame.Desktop", context_)),
- css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
- css::uno::UNO_SET_THROW)->getComponentWindow(),
- css::uno::UNO_QUERY_THROW),
+ xToolkit->createMessageBox(
+ xWindowPeer,
css::awt::Rectangle(), "infobox",
css::awt::MessageBoxButtons::BUTTONS_OK, "passive", "native"),
css::uno::UNO_SET_THROW);
+
box->execute();
- css::uno::Reference< css::lang::XComponent >(
- box, css::uno::UNO_QUERY_THROW)->dispose();
+
+ css::uno::Reference< css::lang::XComponent > xComponent(box, css::uno::UNO_QUERY_THROW);
+ xComponent->dispose();
}
static cppu::ImplementationEntry const services[] = {