filter: convert odfflatxml library

6 files changed, 60 insertions, 66 deletions

diff --git a/Repository.mk b/Repository.mk
index 75feaa033204..6ef7e6936370 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     msfilter \
     msword \
 	msworks \
+	odfflatxml \
 	pdffilter \
 	placeware \
     qstart_gtk \
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
new file mode 100644
index 000000000000..58267a1db539
--- /dev/null
+++ b/filter/Library_odfflatxml.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Michael Stahl <mst@openoffice.org> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,odfflatxml))
+
+$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
+
+$(eval $(call gb_Library_add_api,odfflatxml,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,odfflatxml,\
+	-I$(SRCDIR)/filter/inc/pch \
+	$$(INCLUDE) \
+	-I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odfflatxml,\
+	xo \
+	tl \
+	ucbhelper \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odfflatxml,\
+	filter/source/odfflatxml/OdfFlatXml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index c1ba5959a0eb..21306609c479 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Library_itg \
 	Library_iti \
 	Library_msfilter \
+	Library_odfflatxml \
 	Library_pdffilter \
 	Library_placeware \
 	Library_svgfilter \
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 33b630909842..76713fe09885 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,3 +1,2 @@
 fl      filter  :    TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
 fl  filter\prj nmake - all fl_prj   NULL
-fl  filter\source\odfflatxml                nmake   -   all fl_odfflatxml       fl_inc NULL
diff --git a/filter/source/odfflatxml/makefile.mk b/filter/source/odfflatxml/makefile.mk
deleted file mode 100644
index 0783bd94325a..000000000000
--- a/filter/source/odfflatxml/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ	= ..$/..
-PRJNAME = filter
-TARGET  = odfflatxml
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-SLOFILES=$(SLO)$/OdfFlatXml.obj
-LIBNAME=odfflatxml
-SHL1TARGETDEPN=makefile.mk
-SHL1OBJS=$(SLOFILES)
-SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX)
-SHL1IMPLIB=i$(LIBNAME)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-    $(TOOLSLIB)         \
-    $(CPPUHELPERLIB)    \
-    $(CPPULIB)          \
-    $(XMLOFFLIB) \
-    $(SALLIB) \
-    $(UCBHELPERLIB)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/odfflatxml.component
-
-$(MISC)/odfflatxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        odfflatxml.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt odfflatxml.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fc2d249b493d..07086aba180c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -66,6 +66,7 @@ my_components = \
     component/filter/source/config/cache/filterconfig1 \
     component/filter/source/flash/flash \
     component/filter/source/msfilter/msfilter \
+    component/filter/source/odfflatxml/odfflatxml \
     component/filter/source/pdf/pdffilter \
     component/filter/source/placeware/placeware \
     component/filter/source/svg/svgfilter \
@@ -151,7 +152,6 @@ my_components = \
     localebe1 \
     mysql \
     odbc \
-    odfflatxml \
     protocolhandler \
     scriptframe \
     sdbc2 \