mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Use factory methods for frame::DispatchHelper instances

Browse Source 
Change-Id: I7bdf16fc6d042e5ecd404c604a8b7c31c1ac7bc1
This commit is contained in:
Noel Grandin
2012-08-23 15:43:05 +02:00
committed by Stephan Bergmann
parent 65c78617de
commit f789715a41
6 changed files with 91 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
chart2/source/controller/main/ChartController_Window.cxx
View File

@@ -51,7 +51,7 @@
#include <com/sun/star/chart2/RelativeSize.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <com/sun/star/frame/XDispatchHelper.hpp>
#include <com/sun/star/frame/DispatchHelper.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
#include <comphelper/InlineContainer.hxx>
@@ -1550,20 +1550,15 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
if( ! bReturn &&
nCode == KEY_ESCAPE )
{
uno::Reference< frame::XDispatchHelper > xDispatchHelper(
m_xCC->getServiceManager()->createInstanceWithContext(
C2U("com.sun.star.frame.DispatchHelper"), m_xCC ), uno::UNO_QUERY );
if( xDispatchHelper.is())
{
uno::Sequence< beans::PropertyValue > aArgs;
xDispatchHelper->executeDispatch(
uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ),
C2U(".uno:TerminateInplaceActivation"),
C2U("_parent"),
frame::FrameSearchFlag::PARENT,
aArgs );
bReturn = true;
}
uno::Reference< frame::XDispatchHelper > xDispatchHelper( frame::DispatchHelper::create(m_xCC) );
uno::Sequence< beans::PropertyValue > aArgs;
xDispatchHelper->executeDispatch(
uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ),
C2U(".uno:TerminateInplaceActivation"),
C2U("_parent"),
frame::FrameSearchFlag::PARENT,
aArgs );
bReturn = true;
}
if( ! bReturn &&