summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-29 17:20:22 +0200
committerAndras Timar <atimar@suse.com>2012-10-01 13:55:48 +0200
commitf5f06fb016766cc40817f1fcc3feec0b464845b0 (patch)
treeaefab28b58cbac33a616b4110ee8db43c831891b /extensions
parentSome clean up (diff)
downloadcore-f5f06fb016766cc40817f1fcc3feec0b464845b0.tar.gz
core-f5f06fb016766cc40817f1fcc3feec0b464845b0.zip
Use comphelper::getComponentContext
...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Executable_nsplugin.mk1
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx5
2 files changed, 4 insertions, 2 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 05bf003cd550..0f6af603c9ee 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Executable_add_libs,nsplugin,\
))
$(eval $(call gb_Executable_use_libraries,nsplugin,\
+ comphelper \
cppu \
cppuhelper \
sal \
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index b70a3e60ab40..c9b6ee9212df 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/presentation/XPresentation.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
+#include <comphelper/processfactory.hxx>
#include <vcl/window.hxx>
#include <rtl/textenc.h>
#include <rtl/locale.h>
@@ -239,8 +240,8 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
}
//create stream for the document
- Reference< beans::XPropertySet > xFactoryProperties( mxRemoteMSF, uno::UNO_QUERY );
- Reference< uno::XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY );
+ Reference< uno::XComponentContext > xContext(
+ comphelper::getComponentContext( mxRemoteMSF ) );
Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) );
Reference<io::XInputStream> xInputStream = xSimpleFileAccess->openFileRead( m_sURL );