Author: damjan
Date: Fri Mar 18 03:55:28 2016
New Revision: 1735537
URL: http://svn.apache.org/viewvc?rev=1735537&view=rev
Log:
Use trunk's newer and ASLv2 licensed rptxml.component instead of the
older and LGPLv3 licensed one from the gbuild branch, which is
getting deleted instead.
Patch by: me
Removed:
openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/rptxml.component
Modified:
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk
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=1735537&r1=1735536&r2=1735537&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Fri Mar 18 03:55:28 2016
@@ -84,7 +84,7 @@ my_components = \
component/framework/util/fwm \
component/linguistic/source/lng \
component/oox/util/oox \
- component/reportdesign/source/filter/xml/rptxml \
+ component/reportdesign/util/rptxml \
component/reportdesign/util/rpt \
component/reportdesign/util/rptui \
component/vbahelper/util/msforms \
Modified:
openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk?rev=1735537&r1=1735536&r2=1735537&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk
Fri Mar 18 03:55:28 2016
@@ -24,7 +24,7 @@
$(eval $(call gb_Library_Library,rptxml))
$(eval $(call
gb_Library_add_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptxml))
-$(eval $(call
gb_Library_set_componentfile,rptxml,reportdesign/source/filter/xml/rptxml))
+$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml))
$(eval $(call gb_Library_add_api,rptxml,\
udkapi \
