diff options
Diffstat (limited to 'fileaccess')
-rwxr-xr-x[-rw-r--r--] | fileaccess/prj/build.lst | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | fileaccess/prj/d.lst | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | fileaccess/source/FileAccess.cxx | 26 | ||||
-rwxr-xr-x | fileaccess/source/fileacc.component | 34 | ||||
-rwxr-xr-x[-rw-r--r--] | fileaccess/source/fileacc.xml | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | fileaccess/source/makefile.mk | 8 |
6 files changed, 44 insertions, 27 deletions
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst index a60a92e9c12b..0349810c3838 100644..100755 --- a/fileaccess/prj/build.lst +++ b/fileaccess/prj/build.lst @@ -1,3 +1,3 @@ -fa fileaccess : unotools rdbmaker tools ucbhelper NULL +fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL fa fileaccess usr1 - all fa_mkout NULL fa fileaccess\source nmake - all fa_src NULL diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst index 695487c56035..c9b2bdd18f06 100644..100755 --- a/fileaccess/prj/d.lst +++ b/fileaccess/prj/d.lst @@ -3,3 +3,4 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml +..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 08b709277b21..40257aee3749 100644..100755 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -881,32 +881,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) ); - - const Sequence< rtl::OUString > & rSNL = io_FileAccess::FileAccess_getSupportedServiceNames(); - const rtl::OUString * pArray = rSNL.getConstArray(); - for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component new file mode 100755 index 000000000000..3f14d4053216 --- /dev/null +++ b/fileaccess/source/fileacc.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ucb.SimpleFileAccess"> + <service name="com.sun.star.ucb.SimpleFileAccess"/> + </implementation> +</component> diff --git a/fileaccess/source/fileacc.xml b/fileaccess/source/fileacc.xml index c87ed30b335a..c87ed30b335a 100644..100755 --- a/fileaccess/source/fileacc.xml +++ b/fileaccess/source/fileacc.xml diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk index 2b7826534618..8c8a91b0f675 100644..100755 --- a/fileaccess/source/makefile.mk +++ b/fileaccess/source/makefile.mk @@ -66,3 +66,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib .INCLUDE : target.mk + +ALLTAR : $(MISC)/fileacc.component + +$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fileacc.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fileacc.component |