diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-22 09:24:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-04-08 13:53:04 +0200 |
| commit | b248624126c271c88381d3dad6e04fc954f65779 (patch) | |
| tree | 989f9131b865ea470ced1317834b91de06efd9e4 /slideshow | |
| parent | c68b934cd03e60ab6e0579108089b0e834ac47ad (diff) | |
fdo#46808, Convert frame::Frame to new style
Change-Id: I74427d1e0059808f04960c648b93245b06c20f7f
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewappletshape.cxx | 11 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewappletshape.hxx | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 0d6dbe0f1109..87175eeb3d8a 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include "viewappletshape.hxx" @@ -170,18 +170,13 @@ namespace slideshow // create a frame, and load the applet into it // =========================================== - mxFrame.set( - xFactory->createInstanceWithContext( - OUString("com.sun.star.frame.Frame" ), - mxComponentContext ), - uno::UNO_QUERY_THROW ); - + mxFrame = frame::Frame::create( mxComponentContext ); mxFrame->initialize( xOwnWindow ); uno::Reference < frame::XSynchronousFrameLoader > xLoader( mxViewer, uno::UNO_QUERY_THROW ); xLoader->load( uno::Sequence < beans::PropertyValue >(), - mxFrame ); + uno::Reference<frame::XFrame>(mxFrame, uno::UNO_QUERY_THROW) ); // resize surrounding window and applet to current shape size diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 92514d942f36..d852ebd9ef76 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XSynchronousFrameLoader; - class XFrame; + class XFrame2; } namespace uno { class XComponentContext; @@ -148,7 +148,7 @@ namespace slideshow /// the frame containing the applet ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XFrame> mxFrame; + ::com::sun::star::frame::XFrame2> mxFrame; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; }; |