From 750b8fa5b433e90f4762d9fdfc34befcfaf07a2b Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 21 Feb 2011 12:09:00 +0000 Subject: make docx import cater for enhanced fields also removed erroneous import of dropdown ( when not using enhanced fields as awt control ) now uses dropdown textfield instead --- writerfilter/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'writerfilter/prj') diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst index e70b99a052c5..b97a22778f78 100644 --- a/writerfilter/prj/build.lst +++ b/writerfilter/prj/build.lst @@ -1,4 +1,4 @@ -wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL +wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox xmloff 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 -- cgit From fd5a147a6366d828edb97dd7c6731a14794611ab Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 14 Apr 2011 12:35:11 +0200 Subject: gbuildize writerfilter --- writerfilter/prj/build.lst | 10 +--------- writerfilter/prj/d.lst | 8 -------- writerfilter/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 17 deletions(-) create mode 100755 writerfilter/prj/makefile.mk (limited to 'writerfilter/prj') diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst index e70b99a052c5..c0859939c3bb 100644 --- a/writerfilter/prj/build.lst +++ b/writerfilter/prj/build.lst @@ -1,11 +1,3 @@ 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 diff --git a/writerfilter/prj/d.lst b/writerfilter/prj/d.lst index 1d09ecf9ad2b..e69de29bb2d1 100644 --- a/writerfilter/prj/d.lst +++ b/writerfilter/prj/d.lst @@ -1,8 +0,0 @@ -..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\misc\writerfilter.component %_DEST%\xml%_EXT%\writerfilter.component - -mkdir: %_DEST%\inc%_EXT%\writerfilter\doctok -..\%__SRC%\inc\doctok\sprmids.hxx %_DEST%\inc%_EXT%\writerfilter\doctok\sprmids.hxx diff --git a/writerfilter/prj/makefile.mk b/writerfilter/prj/makefile.mk new file mode 100755 index 000000000000..e312a7ccab65 --- /dev/null +++ b/writerfilter/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit From e50e23937fbf1eac5a04af8d8c08b67c2f9ec6fe Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 14 Apr 2011 14:47:50 +0200 Subject: fix build --- writerfilter/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'writerfilter/prj') diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst index c0859939c3bb..0553bc3e082f 100644 --- a/writerfilter/prj/build.lst +++ b/writerfilter/prj/build.lst @@ -1,3 +1,3 @@ wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL wf writerfilter usr1 - all wf_mkout NULL -wf writerfilter\prj nmake - all wf_prj +wf writerfilter\prj nmake - all wf_prj NULL -- cgit