diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-17 10:52:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-24 16:49:49 +0200 |
| commit | 33a0f8ce656c8c5bb9c3c3deaa10c182e262b374 (patch) | |
| tree | abd469ffb224c8d7b2de1cf76e3aada03e035fc1 /slideshow/source/engine/shapes | |
| parent | f252b332dd2652abb02851ba0c2521c045787801 (diff) | |
fdo#46808, Adapt awt::Toolkit UNO service to new style
Create a merged XToolkit2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Also mark sub-interfaces as non-optional.
Change-Id: I278d0288e92be277033013302267cf93f7d70480
Diffstat (limited to 'slideshow/source/engine/shapes')
| -rw-r--r-- | slideshow/source/engine/shapes/viewappletshape.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index eb0a53268a05..d4ee1d2b64d7 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/awt/WindowDescriptor.hpp> -#include <com/sun/star/awt/XToolkit.hpp> +#include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> @@ -150,11 +150,7 @@ namespace slideshow // create an awt window to contain the applet // ========================================== - uno::Reference< awt::XToolkit > xToolkit( - xFactory->createInstanceWithContext( - ::rtl::OUString("com.sun.star.awt.Toolkit" ), - mxComponentContext ), - uno::UNO_QUERY_THROW ); + uno::Reference< awt::XToolkit2 > xToolkit = awt::Toolkit::create(mxComponentContext); awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_SIMPLE, ::rtl::OUString(), |