From 1c3d51fd6826fbc7d447243d40fcd351ad47ae84 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Tue, 26 Nov 2013 12:10:29 -0200 Subject: 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 - xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 132 ++++++++++ xmlhelp/source/cxxhelp/inc/tvread.hxx | 371 +++++++++++++++++++++++++++ xmlhelp/source/cxxhelp/provider/services.cxx | 7 +- xmlhelp/source/treeview/tvfactory.cxx | 28 -- xmlhelp/source/treeview/tvfactory.hxx | 132 ---------- xmlhelp/source/treeview/tvhlp1.component | 26 -- xmlhelp/source/treeview/tvread.hxx | 371 --------------------------- xmlhelp/util/ucpchelp1.component | 4 + 13 files changed, 514 insertions(+), 597 deletions(-) delete mode 100644 xmlhelp/Library_tvhlp1.mk create mode 100644 xmlhelp/source/cxxhelp/inc/tvfactory.hxx create mode 100644 xmlhelp/source/cxxhelp/inc/tvread.hxx delete mode 100644 xmlhelp/source/treeview/tvfactory.hxx delete mode 100644 xmlhelp/source/treeview/tvhlp1.component delete mode 100644 xmlhelp/source/treeview/tvread.hxx 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/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx new file mode 100644 index 000000000000..da765330f80c --- /dev/null +++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx @@ -0,0 +1,132 @@ +/* -*- 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 _TREEVIEW_TVFACTORY_HXX_ +#define _TREEVIEW_TVFACTORY_HXX_ + +#include +#include +#include +#include +#include +#include +#include +#include + + + +namespace treeview { + + class TVFactory: + public cppu::OWeakObject, + public com::sun::star::lang::XServiceInfo, + public com::sun::star::lang::XTypeProvider, + public com::sun::star::lang::XMultiServiceFactory + { + public: + + TVFactory( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + + ~TVFactory(); + + // XInterface + virtual com::sun::star::uno::Any SAL_CALL + queryInterface( + const com::sun::star::uno::Type& aType ) + throw( com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL + acquire( + void ) + throw(); + + virtual void SAL_CALL + release( + void ) + throw(); + + + // XTypeProvider + + XTYPEPROVIDER_DECL() + + + // XServiceInfo + virtual OUString SAL_CALL + getImplementationName( + void ) + throw( com::sun::star::uno::RuntimeException ); + + virtual sal_Bool SAL_CALL + supportsService( + const OUString& ServiceName ) + throw(com::sun::star::uno::RuntimeException ); + + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames( + void ) + throw( com::sun::star::uno::RuntimeException ); + + // XMultiServiceFactory + + virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + createInstance( + const OUString& aServiceSpecifier ) + throw( com::sun::star::uno::Exception, + com::sun::star::uno::RuntimeException ); + + virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + createInstanceWithArguments( + const OUString& ServiceSpecifier, + const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments ) + throw( com::sun::star::uno::Exception, + com::sun::star::uno::RuntimeException); + + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + getAvailableServiceNames( ) + throw( com::sun::star::uno::RuntimeException ); + + // Other + + static OUString SAL_CALL getImplementationName_static(); + + static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + + static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL + createServiceFactory( + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); + + static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + CreateInstance( + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); + + + private: + + // Members + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_xHDS; + }; + +} + + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx new file mode 100644 index 000000000000..e47038c89f18 --- /dev/null +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -0,0 +1,371 @@ +/* -*- 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 _TREEVIEW_TVREAD_HXX_ +#define _TREEVIEW_TVREAD_HXX_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace treeview { + + class ConfigData + { + public: + enum { + PRODUCTNAME, PRODUCTVERSION, VENDORNAME, VENDORVERSION, + VENDORSHORT }; + ConfigData(); + int m_vAdd[5]; + OUString m_vReplacement[5]; + OUString prodName,prodVersion,vendName,vendVersion,vendShort; + + std::vector< sal_uInt64 > vFileLen; + std::vector< OUString > vFileURL; + OUString locale,system; + OUString appendix; + + void SAL_CALL replaceName( OUString& oustring ) const; + }; + + class TVDom; + class TVChildTarget; + + class TVBase + : public cppu::OWeakObject, + public com::sun::star::lang::XTypeProvider, + public com::sun::star::container::XNameAccess, + public com::sun::star::container::XHierarchicalNameAccess, + public com::sun::star::util::XChangesNotifier, + public com::sun::star::lang::XComponent + { + friend class TVChildTarget; + + public: + + virtual ~TVBase() { } + + // XInterface + virtual com::sun::star::uno::Any SAL_CALL + queryInterface( + const com::sun::star::uno::Type& aType ) + throw( com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL + acquire( + void ) + throw(); + + virtual void SAL_CALL + release( + void ) + throw(); + + // XTypeProvider + + XTYPEPROVIDER_DECL() + + // XNameAccess + + virtual com::sun::star::uno::Type SAL_CALL + getElementType( ) + throw( com::sun::star::uno::RuntimeException ) + { + return getCppuVoidType(); + } + + virtual sal_Bool SAL_CALL hasElements() + throw( com::sun::star::uno::RuntimeException ) + { + return true; + } + + // XChangesNotifier + + virtual void SAL_CALL + addChangesListener( + const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) + throw( com::sun::star::uno::RuntimeException ) + { + // read only + (void)aListener; + } + + virtual void SAL_CALL + removeChangesListener( + const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) + throw( com::sun::star::uno::RuntimeException ) + { + // read only + (void)aListener; + } + + // XComponent + + virtual void SAL_CALL dispose( ) + throw( com::sun::star::uno::RuntimeException ) + { + } + + virtual void SAL_CALL addEventListener( + const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) + throw( com::sun::star::uno::RuntimeException ) + { + (void)xListener; + } + + virtual void SAL_CALL + removeEventListener( + const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) + throw( com::sun::star::uno::RuntimeException ) + { + (void)aListener; + } + + // Abstract functions + // XNameAccess + + virtual com::sun::star::uno::Any SAL_CALL + getByName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::lang::WrappedTargetException, + com::sun::star::uno::RuntimeException) = 0; + + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + getElementNames( ) + throw( com::sun::star::uno::RuntimeException ) = 0; + + virtual sal_Bool SAL_CALL + hasByName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ) = 0; + + // XHierarchicalNameAccess + + virtual com::sun::star::uno::Any SAL_CALL + getByHierarchicalName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::uno::RuntimeException ) = 0; + + virtual sal_Bool SAL_CALL + hasByHierarchicalName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ) = 0; + + }; // end class TVBase + + class TVRead + : public TVBase + { + friend class TVChildTarget; + + public: + TVRead( const ConfigData& configData,TVDom* tvDom = 0 ); + + ~TVRead(); + + // XNameAccess + + virtual com::sun::star::uno::Any SAL_CALL + getByName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::lang::WrappedTargetException, + com::sun::star::uno::RuntimeException); + + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + getElementNames( ) + throw( com::sun::star::uno::RuntimeException ); + + virtual sal_Bool SAL_CALL + hasByName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ); + + // XHierarchicalNameAccess + + virtual com::sun::star::uno::Any SAL_CALL + getByHierarchicalName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::uno::RuntimeException ); + + virtual sal_Bool SAL_CALL + hasByHierarchicalName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ); + + private: + + OUString Title; + OUString TargetURL; + rtl::Reference< TVChildTarget > Children; + + }; // end class TVRead + + class TVChildTarget + : public TVBase + { + public: + + TVChildTarget( const ConfigData& configData,TVDom* tvDom ); + + TVChildTarget( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + + ~TVChildTarget(); + + virtual com::sun::star::uno::Any SAL_CALL + getByName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::lang::WrappedTargetException, + com::sun::star::uno::RuntimeException); + + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + getElementNames( ) + throw( com::sun::star::uno::RuntimeException ); + + virtual sal_Bool SAL_CALL + hasByName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ); + + // XHierarchicalNameAccess + + virtual com::sun::star::uno::Any SAL_CALL + getByHierarchicalName( const OUString& aName ) + throw( com::sun::star::container::NoSuchElementException, + com::sun::star::uno::RuntimeException ); + + virtual sal_Bool SAL_CALL + hasByHierarchicalName( const OUString& aName ) + throw( com::sun::star::uno::RuntimeException ); + + private: + std::vector< rtl::Reference< TVRead > > Elements; + + ConfigData init( + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + getConfiguration( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const; + + ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > + getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider, + const char* file ) const; + + OUString + getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + const char* key ) const; + + sal_Bool + getBooleanKey( + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + const char* key) const; + + void subst( OUString& instpath ) const; + + bool SearchAndInsert(TVDom* p, TVDom* tvDom); + + void Check(TVDom* tvDom); + + }; // end class TVChildTarget + + enum IteratorState + { + USER_EXTENSIONS, + SHARED_EXTENSIONS, + BUNDLED_EXTENSIONS, + END_REACHED + }; + + class ExtensionIteratorBase + { + public: + ExtensionIteratorBase( const OUString& aLanguage ); + void init( void ); + + private: + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage + ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + + protected: + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextUserHelpPackage + ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextSharedHelpPackage + ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage + ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + + void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + + osl::Mutex m_aMutex; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; + + IteratorState m_eState; + OUString m_aLanguage; + + com::sun::star::uno::Sequence< com::sun::star::uno::Reference + < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; + bool m_bUserPackagesLoaded; + + com::sun::star::uno::Sequence< com::sun::star::uno::Reference + < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; + bool m_bSharedPackagesLoaded; + + com::sun::star::uno::Sequence< com::sun::star::uno::Reference + < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; + bool m_bBundledPackagesLoaded; + + int m_iUserPackage; + int m_iSharedPackage; + int m_iBundledPackage; + + }; // end class ExtensionIteratorBase + + class TreeFileIterator : public ExtensionIteratorBase + { + public: + TreeFileIterator( const OUString& aLanguage ) + : ExtensionIteratorBase( aLanguage ) + {} + + OUString nextTreeFile( sal_Int32& rnFileSize ); + + private: + OUString expandURL( const OUString& aURL ); + OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize, + com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + + }; // end class TreeFileIterator + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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/tvfactory.hxx b/xmlhelp/source/treeview/tvfactory.hxx deleted file mode 100644 index da765330f80c..000000000000 --- a/xmlhelp/source/treeview/tvfactory.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- 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 _TREEVIEW_TVFACTORY_HXX_ -#define _TREEVIEW_TVFACTORY_HXX_ - -#include -#include -#include -#include -#include -#include -#include -#include - - - -namespace treeview { - - class TVFactory: - public cppu::OWeakObject, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XMultiServiceFactory - { - public: - - TVFactory( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); - - ~TVFactory(); - - // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL - acquire( - void ) - throw(); - - virtual void SAL_CALL - release( - void ) - throw(); - - - // XTypeProvider - - XTYPEPROVIDER_DECL() - - - // XServiceInfo - virtual OUString SAL_CALL - getImplementationName( - void ) - throw( com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL - supportsService( - const OUString& ServiceName ) - throw(com::sun::star::uno::RuntimeException ); - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( - void ) - throw( com::sun::star::uno::RuntimeException ); - - // XMultiServiceFactory - - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstance( - const OUString& aServiceSpecifier ) - throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); - - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( - const OUString& ServiceSpecifier, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments ) - throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException); - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames( ) - throw( com::sun::star::uno::RuntimeException ); - - // Other - - static OUString SAL_CALL getImplementationName_static(); - - static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - - static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL - createServiceFactory( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); - - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - CreateInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); - - - private: - - // Members - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_xHDS; - }; - -} - - -#endif - -/* 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/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx deleted file mode 100644 index e47038c89f18..000000000000 --- a/xmlhelp/source/treeview/tvread.hxx +++ /dev/null @@ -1,371 +0,0 @@ -/* -*- 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 _TREEVIEW_TVREAD_HXX_ -#define _TREEVIEW_TVREAD_HXX_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace treeview { - - class ConfigData - { - public: - enum { - PRODUCTNAME, PRODUCTVERSION, VENDORNAME, VENDORVERSION, - VENDORSHORT }; - ConfigData(); - int m_vAdd[5]; - OUString m_vReplacement[5]; - OUString prodName,prodVersion,vendName,vendVersion,vendShort; - - std::vector< sal_uInt64 > vFileLen; - std::vector< OUString > vFileURL; - OUString locale,system; - OUString appendix; - - void SAL_CALL replaceName( OUString& oustring ) const; - }; - - class TVDom; - class TVChildTarget; - - class TVBase - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::container::XNameAccess, - public com::sun::star::container::XHierarchicalNameAccess, - public com::sun::star::util::XChangesNotifier, - public com::sun::star::lang::XComponent - { - friend class TVChildTarget; - - public: - - virtual ~TVBase() { } - - // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL - acquire( - void ) - throw(); - - virtual void SAL_CALL - release( - void ) - throw(); - - // XTypeProvider - - XTYPEPROVIDER_DECL() - - // XNameAccess - - virtual com::sun::star::uno::Type SAL_CALL - getElementType( ) - throw( com::sun::star::uno::RuntimeException ) - { - return getCppuVoidType(); - } - - virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException ) - { - return true; - } - - // XChangesNotifier - - virtual void SAL_CALL - addChangesListener( - const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ) - { - // read only - (void)aListener; - } - - virtual void SAL_CALL - removeChangesListener( - const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ) - { - // read only - (void)aListener; - } - - // XComponent - - virtual void SAL_CALL dispose( ) - throw( com::sun::star::uno::RuntimeException ) - { - } - - virtual void SAL_CALL addEventListener( - const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ) - { - (void)xListener; - } - - virtual void SAL_CALL - removeEventListener( - const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ) - { - (void)aListener; - } - - // Abstract functions - // XNameAccess - - virtual com::sun::star::uno::Any SAL_CALL - getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException) = 0; - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames( ) - throw( com::sun::star::uno::RuntimeException ) = 0; - - virtual sal_Bool SAL_CALL - hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ) = 0; - - // XHierarchicalNameAccess - - virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException ) = 0; - - virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ) = 0; - - }; // end class TVBase - - class TVRead - : public TVBase - { - friend class TVChildTarget; - - public: - TVRead( const ConfigData& configData,TVDom* tvDom = 0 ); - - ~TVRead(); - - // XNameAccess - - virtual com::sun::star::uno::Any SAL_CALL - getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames( ) - throw( com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL - hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ); - - // XHierarchicalNameAccess - - virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ); - - private: - - OUString Title; - OUString TargetURL; - rtl::Reference< TVChildTarget > Children; - - }; // end class TVRead - - class TVChildTarget - : public TVBase - { - public: - - TVChildTarget( const ConfigData& configData,TVDom* tvDom ); - - TVChildTarget( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); - - ~TVChildTarget(); - - virtual com::sun::star::uno::Any SAL_CALL - getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames( ) - throw( com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL - hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ); - - // XHierarchicalNameAccess - - virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ); - - private: - std::vector< rtl::Reference< TVRead > > Elements; - - ConfigData init( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - getConfiguration( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const; - - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > - getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider, - const char* file ) const; - - OUString - getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key ) const; - - sal_Bool - getBooleanKey( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, - const char* key) const; - - void subst( OUString& instpath ) const; - - bool SearchAndInsert(TVDom* p, TVDom* tvDom); - - void Check(TVDom* tvDom); - - }; // end class TVChildTarget - - enum IteratorState - { - USER_EXTENSIONS, - SHARED_EXTENSIONS, - BUNDLED_EXTENSIONS, - END_REACHED - }; - - class ExtensionIteratorBase - { - public: - ExtensionIteratorBase( const OUString& aLanguage ); - void init( void ); - - private: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage - ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - - protected: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextUserHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextSharedHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - - void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); - - osl::Mutex m_aMutex; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; - - IteratorState m_eState; - OUString m_aLanguage; - - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; - bool m_bUserPackagesLoaded; - - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; - bool m_bSharedPackagesLoaded; - - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; - bool m_bBundledPackagesLoaded; - - int m_iUserPackage; - int m_iSharedPackage; - int m_iBundledPackage; - - }; // end class ExtensionIteratorBase - - class TreeFileIterator : public ExtensionIteratorBase - { - public: - TreeFileIterator( const OUString& aLanguage ) - : ExtensionIteratorBase( aLanguage ) - {} - - OUString nextTreeFile( sal_Int32& rnFileSize ); - - private: - OUString expandURL( const OUString& aURL ); - OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); - - }; // end class TreeFileIterator - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 @@ + + + + -- cgit