openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409427 - in /incubator/ooo/branches/gbuild/main: Module_ooo.mk Repository.mk postprocess/packcomponents/makefile.mk writerfilter/prj/build.lst writerfilter/source/filter/WriterFilter.cxx writerfilter/unocomponent/component.cxx
Date Wed, 14 Nov 2012 21:34:28 GMT
Author: arist
Date: Wed Nov 14 21:34:27 2012
New Revision: 1409427

URL: http://svn.apache.org/viewvc?rev=1409427&view=rev
Log:
writerfilter10_02_1013d9bf5d0a.patch
# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1296648620 -3600
# Node ID 1013d9bf5d0ac91ef467b7fbabf9a2d3b37633c1
# Parent 104f3dd91d928557b6bb1724389fcd5eeea81c77
writerfilter10: convert writerfilter to gbuild


Modified:
    incubator/ooo/branches/gbuild/main/Module_ooo.mk
    incubator/ooo/branches/gbuild/main/Repository.mk
    incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/branches/gbuild/main/writerfilter/prj/build.lst
    incubator/ooo/branches/gbuild/main/writerfilter/source/filter/WriterFilter.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/component.cxx

Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 21:34:27 2012
@@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	unoxml \
 	vbahelper \
 	vcl \
+	writerfilter \
 	xmloff \
 ))
 

Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 21:34:27 2012
@@ -59,6 +59,7 @@ $(eval $(call gb_Helper_register_librari
 	lng \
 	msfilter \
 	msword \
+	oox \
 	qstart_gtk \
 	sax \
 	sb \
@@ -79,6 +80,7 @@ $(eval $(call gb_Helper_register_librari
 	unordf \
 	unoxml \
 	vbahelper \
+	writerfilter \
 	vcl \
     vclplug_gen \
     vclplug_gtk \
@@ -126,6 +128,7 @@ $(eval $(call gb_Helper_register_librari
 	passwordcontainer \
 	vbaswobj \
     msforms \
+	writerfilter_debug \
 ))
 
 

Modified: incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 21:34:27
2012
@@ -75,6 +75,7 @@ my_components = \
     component/toolkit/util/tk \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
+    component/writerfilter/util/writerfilter \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
     configmgr \
@@ -168,7 +169,6 @@ my_components = \
     vbaevents \
     vbaobj \
     vclcanvas \
-    writerfilter \
     xcr \
     xmlfa \
     xmlfd \

Modified: incubator/ooo/branches/gbuild/main/writerfilter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/prj/build.lst?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/prj/build.lst Wed Nov 14 21:34:27 2012
@@ -1,11 +1,2 @@
 wf	writerfilter	: soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt
oox NULL
-wf	writerfilter	usr1	-	all	wf_mkout NULL
-wf	writerfilter\source\resourcemodel	nmake	-	all	wf_resourcemodel NULL
-wf	writerfilter\source\doctok	nmake	-	all	wf_doctok wf_resourcemodel NULL
-wf	writerfilter\source\ooxml	nmake	-	all	wf_ooxml wf_resourcemodel NULL
-wf  writerfilter\source\filter      nmake   - all   wf_filter NULL
-wf  writerfilter\source\dmapper      nmake   - all   wf_dmapper wf_doctok wf_ooxml wf_resourcemodel
NULL
-wf	writerfilter\unocomponent\debugservices\doctok	nmake	-	all	wf_debugservicesdoctok NULL
-wf	writerfilter\unocomponent\debugservices\ooxml	nmake	-	all	wf_debugservicesooxml NULL
-wf	writerfilter\unocomponent	nmake	-	all	wf_unocomponent wf_doctok wf_ooxml wf_resourcemodel
wf_debugservicesdoctok wf_debugservicesooxml NULL
-wf  writerfilter\util   nmake   - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_unocomponent
NULL
+wf	writerfilter\prj	nmake	-	all	wf_prj NULL

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/filter/WriterFilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/filter/WriterFilter.cxx?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/filter/WriterFilter.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/filter/WriterFilter.cxx Wed Nov
14 21:34:27 2012
@@ -57,12 +57,14 @@ static struct ::cppu::ImplementationEntr
     { 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
-void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment
** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment **
/*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory
* xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory
* xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries
);
 }

Modified: incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/component.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/component.cxx?rev=1409427&r1=1409426&r2=1409427&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/component.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/component.cxx Wed Nov 14
21:34:27 2012
@@ -21,14 +21,9 @@
 
 
 
-#ifndef _CPPUHELPTER_FACTORY_
-#include <cppuhelper/factory.hxx>
-#endif
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <debugservices/doctok/DocTokTestService.hxx>
 #include <debugservices/doctok/DocTokAnalyzeService.hxx>
 #include <debugservices/ooxml/OOXMLTestService.hxx>
@@ -52,17 +47,19 @@ static struct ::cppu::ImplementationEntr
 };
 
 
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName,
uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment **
/*ppEnv*/ )
 {
 	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory
* xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory
* xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     fprintf(stderr, "Loading service: %s: ", implName);
 
     void * pResult = ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries
);
-    
+
     fprintf(stderr, "%p\n", pResult);
 
 	return pResult;



Mime
View raw message