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

fdo#46808, Convert SfxFrameLoader service to new style

Browse Source 
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
This commit is contained in:
Noel Grandin
2013-05-29 08:09:33 +02:00
parent a8a35e54f5
commit 30dd9b2ff5
6 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/inc/services.h
View File

@@ -59,7 +59,6 @@ namespace framework{
#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" )
#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" )
#define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")
#define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" )
#define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" )

3
framework/source/loadenv/loadenv.cxx
View File

@@ -52,6 +52,7 @@
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/OfficeFrameLoader.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XFrameLoader.hpp>
#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
@@ -1194,7 +1195,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
{
try
{
return m_xContext->getServiceManager()->createInstanceWithContext(IMPLEMENTATIONNAME_GENERICFRAMELOADER, m_xContext);
return css::frame::OfficeFrameLoader::create(m_xContext);
}
catch(const css::uno::RuntimeException&)
{ throw; }

1
offapi/UnoApi_offapi.mk
View File

@@ -198,6 +198,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
LayoutManager \
MediaTypeDetectionHelper \
ModuleManager \
OfficeFrameLoader \
SessionListener \
StartModule \
TaskCreator \

37
offapi/com/sun/star/frame/OfficeFrameLoader.idl Normal file
View File

@@ -0,0 +1,37 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef __com_sun_star_frame_OfficeFrameLoader_idl__
#define __com_sun_star_frame_OfficeFrameLoader_idl__
#include <com/sun/star/frame/XSynchronousFrameLoader.idl>
module com { module sun { module star { module frame {
/**
@since LibreOffice 4.2
*/
service OfficeFrameLoader : XSynchronousFrameLoader;
}; }; }; };
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
sfx2/source/view/frmload.cxx
View File

@@ -681,8 +681,9 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() th
Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
Sequence< OUString > seqServiceNames( 2 );
seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" );
seqServiceNames.getArray() [1] = OUString( "com.sun.star.frame.OfficeFrameLoader" );
return seqServiceNames ;
}

1
sfx2/util/sfx.component
View File

@@ -38,6 +38,7 @@
</implementation>
<implementation name="com.sun.star.comp.office.FrameLoader">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
<service name="com.sun.star.frame.OfficeFrameLoader"/>
</implementation>
<implementation name="com.sun.star.comp.sfx2.AppDispatchProvider">
<service name="com.sun.star.frame.ProtocolHandler"/>