diff options
author | Noel Grandin <noel@peralex.com> | 2013-04-25 11:02:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-04-25 11:03:15 +0200 |
commit | 746784e16f31133e4dc4e062fa5b7f1620e8cda6 (patch) | |
tree | a5cd6a24db5fbc390d50c1ab502c81f05fc388aa /sdext | |
parent | e894e57aabceb0b2ccd69d129b5223e2a28596fa (diff) |
fdo#46808 Convert awt::Pointer to new style
Change-Id: Ic2ff491e656ab7bcf0bd5994b601818a26478243
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/presenter/PresenterPaneBorderManager.cxx | 6 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSlideShowView.cxx | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 5cb992a6d1de..0e63720c040a 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -83,11 +83,7 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) { - mxPointer = Reference<awt::XPointer>( - xFactory->createInstanceWithContext( - OUString("com.sun.star.awt.Pointer"), - rxContext), - UNO_QUERY_THROW); + mxPointer = awt::Pointer::create(rxContext); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 34457f18d9d8..1a663fcf036a 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -26,6 +26,7 @@ #include "PresenterPaneContainer.hxx" #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/awt/Pointer.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -465,12 +466,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) // Create a pointer when it does not yet exist. if ( ! mxPointer.is()) { - Reference<lang::XMultiServiceFactory> xFactory ( - mxComponentContext, UNO_QUERY); - if (xFactory.is()) - mxPointer = Reference<awt::XPointer>( - xFactory->createInstance(OUString("com.sun.star.awt.Pointer")), - UNO_QUERY); + mxPointer = awt::Pointer::create(mxComponentContext); } // Set the pointer to the given shape and the window(peer) to the |