From 1c3d51fd6826fbc7d447243d40fcd351ad47ae84 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Tue, 26 Nov 2013 12:10:29 -0200 Subject: [PATCH] fdo#60698: Merge tvhlp1 into ucpchelp1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tvhlp1 just have 2 files, and this lib is used always with ucpchelp1. By these reasons, we can merge these 2 libs. Change-Id: I515f9c12893c986279ffac91b83879c467b091c7 Reviewed-on: https://gerrit.libreoffice.org/6820 Tested-by: LibreOffice gerrit bot Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- Repository.mk | 1 - postprocess/Rdb_services.mk | 1 - xmlhelp/Library_tvhlp1.mk | 35 ------------------- xmlhelp/Library_ucpchelp1.mk | 2 ++ xmlhelp/Module_xmlhelp.mk | 1 - .../{treeview => cxxhelp/inc}/tvfactory.hxx | 0 .../{treeview => cxxhelp/inc}/tvread.hxx | 0 xmlhelp/source/cxxhelp/provider/services.cxx | 7 ++-- xmlhelp/source/treeview/tvfactory.cxx | 28 --------------- xmlhelp/source/treeview/tvhlp1.component | 26 -------------- xmlhelp/util/ucpchelp1.component | 4 +++ 11 files changed, 11 insertions(+), 94 deletions(-) delete mode 100644 xmlhelp/Library_tvhlp1.mk rename xmlhelp/source/{treeview => cxxhelp/inc}/tvfactory.hxx (100%) rename xmlhelp/source/{treeview => cxxhelp/inc}/tvread.hxx (100%) delete mode 100644 xmlhelp/source/treeview/tvhlp1.component diff --git a/Repository.mk b/Repository.mk index a35da3784598..60a0c7625dd0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -532,7 +532,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ sofficeapp \ srtrs1 \ textconv_dict \ - tvhlp1 \ ucb1 \ ucbhelper \ ucpfile1 \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 8cf28478d5dd..e07017d3644b 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -325,7 +325,6 @@ $(eval $(call gb_Rdb_add_components,services,\ extensions/source/resource/res \ extensions/source/scanner/scn \ extensions/source/update/feed/updatefeed \ - xmlhelp/source/treeview/tvhlp1 \ xmlhelp/util/ucpchelp1 \ xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows) \ $(if $(filter-out WNT,$(OS)),\ diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk deleted file mode 100644 index 58487dd61158..000000000000 --- a/xmlhelp/Library_tvhlp1.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Library_Library,tvhlp1)) - -$(eval $(call gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1)) - -$(eval $(call gb_Library_use_sdk_api,tvhlp1)) - -$(eval $(call gb_Library_use_externals,tvhlp1,\ - boost_headers \ - expat \ -)) - -$(eval $(call gb_Library_use_libraries,tvhlp1,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ - utl \ - i18nlangtag \ -)) - -$(eval $(call gb_Library_add_exception_objects,tvhlp1,\ - xmlhelp/source/treeview/tvfactory \ - xmlhelp/source/treeview/tvread \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 9172d808e5e3..245d052d506a 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -73,6 +73,8 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\ xmlhelp/source/cxxhelp/provider/urlparameter \ xmlhelp/source/cxxhelp/qe/DocGenerator \ xmlhelp/source/cxxhelp/util/Decompressor \ + xmlhelp/source/treeview/tvfactory \ + xmlhelp/source/treeview/tvread \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk index 1cba02aa7afc..a1f79df747b5 100644 --- a/xmlhelp/Module_xmlhelp.mk +++ b/xmlhelp/Module_xmlhelp.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,xmlhelp)) $(eval $(call gb_Module_add_targets,xmlhelp,\ - Library_tvhlp1 \ Library_ucpchelp1 \ Package_helpxsl \ )) diff --git a/xmlhelp/source/treeview/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx similarity index 100% rename from xmlhelp/source/treeview/tvfactory.hxx rename to xmlhelp/source/cxxhelp/inc/tvfactory.hxx diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx similarity index 100% rename from xmlhelp/source/treeview/tvread.hxx rename to xmlhelp/source/cxxhelp/inc/tvread.hxx diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index f1fbd9ff7a52..42b39be9dd22 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -22,6 +22,7 @@ #include #include "provider.hxx" +#include "tvfactory.hxx" using namespace com::sun::star; @@ -36,13 +37,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; - // Create factory, if implementation name matches. - if ( ::chelp::ContentProvider::getImplementationName_Static(). equalsAscii( pImplName ) ) { xFactory = ::chelp::ContentProvider::createServiceFactory( xSMgr ); } + else if ( treeview::TVFactory::getImplementationName_static().equalsAscii( pImplName ) ) + { + xFactory = treeview::TVFactory::createServiceFactory( xSMgr ); + } if ( xFactory.is() ) { diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 6f6a5cbd9e57..b98bd69e630a 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -216,32 +216,4 @@ TVFactory::CreateInstance( return Reference< XInterface >::query( xP ); } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL treeview_component_getFactory( - const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey ) -{ - (void)pRegistryKey; - - void * pRet = 0; - - Reference< XMultiServiceFactory > xSMgr( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); - - Reference< XSingleServiceFactory > xFactory; - - // File Content Provider. - - if ( TVFactory::getImplementationName_static().equalsAscii( pImplName ) ) - { - xFactory = TVFactory::createServiceFactory( xSMgr ); - } - - if ( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - - return pRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/treeview/tvhlp1.component b/xmlhelp/source/treeview/tvhlp1.component deleted file mode 100644 index eb423154653c..000000000000 --- a/xmlhelp/source/treeview/tvhlp1.component +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component index 38ef9098b87d..1db2845122ad 100644 --- a/xmlhelp/util/ucpchelp1.component +++ b/xmlhelp/util/ucpchelp1.component @@ -23,4 +23,8 @@ + + + +