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

10
extensions/source/nsplugin/source/so_instance.cxx
View File

@@ -28,6 +28,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/DispatchHelper.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/lang/SystemDependent.hpp>
#include <com/sun/star/awt/XSystemChildFactory.hpp>
@@ -299,14 +300,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
debug_fprintf(NSP_LOG_APPEND, "load document success\n");
// create frame::XDispatchHelper and frame::XDispatchProvider
m_xDispatcher = Reference< frame::XDispatchHelper > (
mxRemoteMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))),
uno::UNO_QUERY );
if(!m_xDispatcher.is())
{
debug_fprintf(NSP_LOG_APPEND, "m_xDispatcher can not be getten\n");
return sal_False;
}
m_xDispatcher = Reference< frame::XDispatchHelper >( frame::DispatchHelper::create( xContext ) );
m_xDispatchProvider = Reference< frame::XDispatchProvider >(m_xFrame, uno::UNO_QUERY);
if(!m_xDispatchProvider.is())
{