diff options
Diffstat (limited to 'fileaccess')
| -rw-r--r-- | fileaccess/Library_fileacc.mk | 6 | ||||
| -rw-r--r-- | fileaccess/prj/build.lst | 2 | ||||
| -rw-r--r-- | fileaccess/source/FileAccess.cxx | 9 | ||||
| -rwxr-xr-x | fileaccess/source/fileacc.component | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index b6694e6453ad..6fb3bcb7a2d5 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -30,10 +30,14 @@ $(eval $(call gb_Library_Library,fileacc)) $(eval $(call gb_Library_set_include,fileacc,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_Library_add_api,fileacc,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,fileacc,\ cppu \ cppuhelper \ diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst index a37869840f49..8ec9888a16c0 100644 --- a/fileaccess/prj/build.lst +++ b/fileaccess/prj/build.lst @@ -1,2 +1,2 @@ -fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL +fa fileaccess : unotools DESKTOP:rdbmaker tools ucbhelper LIBXSLT:libxslt NULL fa fileaccess\prj nmake - all fa_prj NULL diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 1644c2724bbe..a19d90938c33 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -865,14 +865,7 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component index 3f14d4053216..f580c4b2eee1 100755 --- a/fileaccess/source/fileacc.component +++ b/fileaccess/source/fileacc.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fileacc" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.ucb.SimpleFileAccess"> <service name="com.sun.star.ucb.SimpleFileAccess"/> |