Author: damjan
Date: Wed Feb 24 18:11:27 2016
New Revision: 1732197
URL: http://svn.apache.org/viewvc?rev=1732197&view=rev
Log:
Merge r1409427 from branches/gbuild:
writerfilter10: convert writerfilter to gbuild
DOESN'T BUILD, but I'll fix that in separate patches.
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/writerfilter/prj/build.lst
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/WriterFilter.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/component.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 18:11:27 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Wed Feb 24
18:11:27 2016
@@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,o
unoxml \
vbahelper \
vcl \
+ writerfilter \
xmloff \
formula \
))
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Wed Feb 24
18:11:27 2016
@@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_librari
lng \
msfilter \
msword \
+ oox \
qstart_gtk \
sax \
sb \
@@ -81,6 +82,7 @@ $(eval $(call gb_Helper_register_librari
unordf \
unoxml \
vbahelper \
+ writerfilter \
vcl \
vclplug_gen \
vclplug_gtk \
@@ -128,6 +130,7 @@ $(eval $(call gb_Helper_register_librari
passwordcontainer \
vbaswobj \
msforms \
+ writerfilter_debug \
))
Modified:
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Wed Feb 24 18:11:27 2016
@@ -94,6 +94,7 @@ my_components = \
component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
+ component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
configmgr \
@@ -186,7 +187,6 @@ my_components = \
vbaevents \
vbaobj \
vclcanvas \
- writerfilter \
xcr \
xmlfa \
xmlfd \
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/prj/build.lst?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/writerfilter/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/writerfilter/prj/build.lst
Wed Feb 24 18:11:27 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/WriterFilter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/WriterFilter.cxx?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/WriterFilter.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/WriterFilter.cxx
Wed Feb 24 18:11:27 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/component.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/component.cxx?rev=1732197&r1=1732196&r2=1732197&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/component.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/component.cxx
Wed Feb 24 18:11:27 2016
@@ -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;
