diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-06-13 23:20:18 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-13 23:20:18 +0100 |
commit | b879a95c1d1b6241e7bc1b6fb6349e91e4baf5f1 (patch) | |
tree | cba640a6241b00fc7db443b40cc91c769da667b0 | |
parent | survive missing writer component for testing purposes (diff) | |
download | core-b879a95c1d1b6241e7bc1b6fb6349e91e4baf5f1.tar.gz core-b879a95c1d1b6241e7bc1b6fb6349e91e4baf5f1.zip |
gbuildize hwpfilter
-rw-r--r-- | hwpfilter/Library_hwp.mk | 98 | ||||
-rw-r--r-- | hwpfilter/Makefile | 38 | ||||
-rw-r--r-- | hwpfilter/Module_hwpfilter.mk | 34 | ||||
-rw-r--r-- | hwpfilter/prj/build.lst | 7 | ||||
-rw-r--r-- | hwpfilter/prj/d.lst | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | hwpfilter/prj/makefile.mk (renamed from hwpfilter/inc/makefile.mk) | 27 | ||||
-rw-r--r-- | hwpfilter/source/cspline.cxx (renamed from hwpfilter/source/cspline.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/fontmap.cxx (renamed from hwpfilter/source/fontmap.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/formula.cxx (renamed from hwpfilter/source/formula.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/grammar.cxx (renamed from hwpfilter/source/grammar.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hbox.cxx (renamed from hwpfilter/source/hbox.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hcode.cxx (renamed from hwpfilter/source/hcode.cpp) | 2 | ||||
-rw-r--r-- | hwpfilter/source/hfont.cxx (renamed from hwpfilter/source/hfont.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hgzip.cxx (renamed from hwpfilter/source/hgzip.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/himgutil.cxx (renamed from hwpfilter/source/himgutil.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hinfo.cxx (renamed from hwpfilter/source/hinfo.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.cxx (renamed from hwpfilter/source/hiodev.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hpara.cxx (renamed from hwpfilter/source/hpara.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hstream.cxx (renamed from hwpfilter/source/hstream.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hstyle.cxx (renamed from hwpfilter/source/hstyle.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/htags.cxx (renamed from hwpfilter/source/htags.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hutil.cxx (renamed from hwpfilter/source/hutil.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hwp.component | 1 | ||||
-rw-r--r-- | hwpfilter/source/hwpeq.cxx (renamed from hwpfilter/source/hwpeq.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hwpfile.cxx (renamed from hwpfilter/source/hwpfile.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hwpread.cxx (renamed from hwpfilter/source/hwpread.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 27 | ||||
-rw-r--r-- | hwpfilter/source/lexer.cxx (renamed from hwpfilter/source/lexer.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/list.hxx | 8 | ||||
-rw-r--r-- | hwpfilter/source/makefile.mk | 103 | ||||
-rw-r--r-- | hwpfilter/source/mzstring.cxx (renamed from hwpfilter/source/mzstring.cpp) | 0 | ||||
-rw-r--r-- | hwpfilter/source/solver.cxx (renamed from hwpfilter/source/solver.cpp) | 0 |
32 files changed, 190 insertions, 160 deletions
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk new file mode 100644 index 000000000000..321d4bee411d --- /dev/null +++ b/hwpfilter/Library_hwp.mk @@ -0,0 +1,98 @@ +# 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. +# +# The Initial Developer of the Original Code is +# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# 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,hwp)) + +$(eval $(call gb_Library_add_precompiled_header,hwp,$(SRCDIR)/hwpfilter/inc/pch/precompiled_hwpfilter)) + +$(eval $(call gb_Library_set_include,hwp,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/hwpfilter/inc/pch) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,hwp,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_cxxflags,hwp,\ + $$(CXXFLAGS) \ + -DSYSTEM_ZLIB \ +)) +$(eval $(call gb_Library_add_linked_libs,hwp,\ + z \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,hwp,\ + zlib \ +)) +endif + +ifeq ($(OS),WNT) + +$(eval $(call gb_Library_add_linked_libs,hwp,\ + ole32 \ + uuid \ +)) + +endif + +$(eval $(call gb_Library_set_componentfile,hwp,hwpfilter/source/hwp)) + +$(eval $(call gb_Library_add_exception_objects,hwp,\ + hwpfilter/source/attributes \ + hwpfilter/source/cspline \ + hwpfilter/source/fontmap \ + hwpfilter/source/formula \ + hwpfilter/source/grammar \ + hwpfilter/source/hbox \ + hwpfilter/source/hcode \ + hwpfilter/source/hfont \ + hwpfilter/source/hgzip \ + hwpfilter/source/himgutil \ + hwpfilter/source/hinfo \ + hwpfilter/source/hiodev \ + hwpfilter/source/hpara \ + hwpfilter/source/hstream \ + hwpfilter/source/hstyle \ + hwpfilter/source/htags \ + hwpfilter/source/hutil \ + hwpfilter/source/hwpeq \ + hwpfilter/source/hwpfile \ + hwpfilter/source/hwpread \ + hwpfilter/source/hwpreader \ + hwpfilter/source/lexer \ + hwpfilter/source/mzstring \ + hwpfilter/source/solver \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/hwpfilter/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk new file mode 100644 index 000000000000..b4e55302daba --- /dev/null +++ b/hwpfilter/Module_hwpfilter.mk @@ -0,0 +1,34 @@ +# 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. +# +# The Initial Developer of the Original Code is +# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# 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_Module_Module,hwpfilter)) + +$(eval $(call gb_Module_add_targets,hwpfilter,\ + Library_hwp \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/hwpfilter/prj/build.lst b/hwpfilter/prj/build.lst index 51240453413d..f17ca9d58c5e 100644 --- a/hwpfilter/prj/build.lst +++ b/hwpfilter/prj/build.lst @@ -1,5 +1,2 @@ -hw hwpfilter : offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt NULL -hw hwpfilter usr1 - all hw_mkout NULL -hw hwpfilter\prj get - all hw_prj NULL -hw hwpfilter\inc nmake - all hw_inc NULL -hw hwpfilter\source nmake - all hw_source hw_inc NULL +hw hwpfilter : offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt ure NULL +hw hwpfilter\prj nmake - all hw_prj NULL diff --git a/hwpfilter/prj/d.lst b/hwpfilter/prj/d.lst index 24f09e93a5a1..e69de29bb2d1 100644 --- a/hwpfilter/prj/d.lst +++ b/hwpfilter/prj/d.lst @@ -1,5 +0,0 @@ -..\%__SRC%\bin\hwp.dll %_DEST%\bin\hwp.dll -..\%__SRC%\lib\ihwp*.lib %_DEST%\bin\ihwp*.lib -..\%__SRC%\lib\libhwp.so %_DEST%\lib\libhwp.so -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\misc\hwp.component %_DEST%\xml\hwp.component diff --git a/hwpfilter/inc/makefile.mk b/hwpfilter/prj/makefile.mk index 12bc00212154..e312a7ccab65 100644..100755 --- a/hwpfilter/inc/makefile.mk +++ b/hwpfilter/prj/makefile.mk @@ -24,24 +24,17 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. - -PRJNAME=hwpfilter -TARGET=inc - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- +PRJ=.. +TARGET=prj -.INCLUDE : target.mk +.INCLUDE : settings.mk -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/hwpfilter/source/cspline.cpp b/hwpfilter/source/cspline.cxx index 8493ff339bb4..8493ff339bb4 100644 --- a/hwpfilter/source/cspline.cpp +++ b/hwpfilter/source/cspline.cxx diff --git a/hwpfilter/source/fontmap.cpp b/hwpfilter/source/fontmap.cxx index d3f9906f3eb2..d3f9906f3eb2 100644 --- a/hwpfilter/source/fontmap.cpp +++ b/hwpfilter/source/fontmap.cxx diff --git a/hwpfilter/source/formula.cpp b/hwpfilter/source/formula.cxx index d2a73ac72d07..d2a73ac72d07 100644 --- a/hwpfilter/source/formula.cpp +++ b/hwpfilter/source/formula.cxx diff --git a/hwpfilter/source/grammar.cpp b/hwpfilter/source/grammar.cxx index 2afc1d897490..2afc1d897490 100644 --- a/hwpfilter/source/grammar.cpp +++ b/hwpfilter/source/grammar.cxx diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cxx index fcdd706a3fdb..fcdd706a3fdb 100644 --- a/hwpfilter/source/hbox.cpp +++ b/hwpfilter/source/hbox.cxx diff --git a/hwpfilter/source/hcode.cpp b/hwpfilter/source/hcode.cxx index 65ab7d662b5c..9a31e0ad5680 100644 --- a/hwpfilter/source/hcode.cpp +++ b/hwpfilter/source/hcode.cxx @@ -1426,7 +1426,7 @@ char *urltowin(const char *src, char *dest ) char ext[4]; strncpy(ext,src + srclen - 3,3); ext[3]=0; - //printf("hcode.cpp : ext = %s\n",ext); + //printf("hcode.cxx : ext = %s\n",ext); if( !_strnicmp(ext,"HWP",3) || !_strnicmp(ext,"HWT",3)){ strcpy(dest,src); diff --git a/hwpfilter/source/hfont.cpp b/hwpfilter/source/hfont.cxx index 12c8705ba17f..12c8705ba17f 100644 --- a/hwpfilter/source/hfont.cpp +++ b/hwpfilter/source/hfont.cxx diff --git a/hwpfilter/source/hgzip.cpp b/hwpfilter/source/hgzip.cxx index 13811d2069a8..13811d2069a8 100644 --- a/hwpfilter/source/hgzip.cpp +++ b/hwpfilter/source/hgzip.cxx diff --git a/hwpfilter/source/himgutil.cpp b/hwpfilter/source/himgutil.cxx index 3d94280f6135..3d94280f6135 100644 --- a/hwpfilter/source/himgutil.cpp +++ b/hwpfilter/source/himgutil.cxx diff --git a/hwpfilter/source/hinfo.cpp b/hwpfilter/source/hinfo.cxx index fb57e49d6de3..fb57e49d6de3 100644 --- a/hwpfilter/source/hinfo.cpp +++ b/hwpfilter/source/hinfo.cxx diff --git a/hwpfilter/source/hiodev.cpp b/hwpfilter/source/hiodev.cxx index 0416a96c7091..0416a96c7091 100644 --- a/hwpfilter/source/hiodev.cpp +++ b/hwpfilter/source/hiodev.cxx diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cxx index 06a5786d90ea..06a5786d90ea 100644 --- a/hwpfilter/source/hpara.cpp +++ b/hwpfilter/source/hpara.cxx diff --git a/hwpfilter/source/hstream.cpp b/hwpfilter/source/hstream.cxx index c6b8c24a2152..c6b8c24a2152 100644 --- a/hwpfilter/source/hstream.cpp +++ b/hwpfilter/source/hstream.cxx diff --git a/hwpfilter/source/hstyle.cpp b/hwpfilter/source/hstyle.cxx index 8cce811067a0..8cce811067a0 100644 --- a/hwpfilter/source/hstyle.cpp +++ b/hwpfilter/source/hstyle.cxx diff --git a/hwpfilter/source/htags.cpp b/hwpfilter/source/htags.cxx index 30244a83f9b8..30244a83f9b8 100644 --- a/hwpfilter/source/htags.cpp +++ b/hwpfilter/source/htags.cxx diff --git a/hwpfilter/source/hutil.cpp b/hwpfilter/source/hutil.cxx index 2827bda4e88a..2827bda4e88a 100644 --- a/hwpfilter/source/hutil.cpp +++ b/hwpfilter/source/hutil.cxx diff --git a/hwpfilter/source/hwp.component b/hwpfilter/source/hwp.component index 5280cfbbd46b..972c6a61d5b3 100644 --- a/hwpfilter/source/hwp.component +++ b/hwpfilter/source/hwp.component @@ -30,5 +30,6 @@ xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.comp.hwpimport.HwpImportFilter"> <service name="com.sun.star.document.ImportFilter"/> + <service name="com.sun.star.document.ExtendedTypeDetection"/> </implementation> </component> diff --git a/hwpfilter/source/hwpeq.cpp b/hwpfilter/source/hwpeq.cxx index 0808d5100b55..0808d5100b55 100644 --- a/hwpfilter/source/hwpeq.cpp +++ b/hwpfilter/source/hwpeq.cxx diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cxx index b77cc1dad25f..b77cc1dad25f 100644 --- a/hwpfilter/source/hwpfile.cpp +++ b/hwpfilter/source/hwpfile.cxx diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cxx index b67b814fe211..b67b814fe211 100644 --- a/hwpfilter/source/hwpread.cpp +++ b/hwpfilter/source/hwpread.cxx diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 07eee5d7e581..e23e2d9fc6c2 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -134,14 +134,8 @@ HwpReader::~HwpReader() } -#ifndef UDK100 sal_Bool HwpReader::filter(const Sequence< PropertyValue >& aDescriptor) throw(RuntimeException) -#else -void HwpReader::parseStream(const InputSource & structSource) -throw(SAXException, IOException, RuntimeException) -#endif { -#ifndef UDK100 Reference< XInputStream> rInputStream; for ( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ ) { @@ -175,9 +169,6 @@ throw(SAXException, IOException, RuntimeException) break; } } -#else - Reference< XInputStream> rInputStream = structSource.aInputStream; -#endif HStream stream; Sequence < sal_Int8 > aBuffer; @@ -190,18 +181,11 @@ throw(SAXException, IOException, RuntimeException) stream.addData( (byte *)aBuffer.getConstArray(), nRead ); nTotal += nRead; } -#ifndef UDK100 + if( nTotal == 0 ) return sal_False; -#endif if (hwpfile.ReadHwpFile(stream)) - { -#ifdef UDK100 - throw SAXException(); -#else return sal_False; -#endif - } if (m_rxDocumentHandler.is()) m_rxDocumentHandler->startDocument(); @@ -239,10 +223,7 @@ throw(SAXException, IOException, RuntimeException) if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endDocument(); -#ifndef UDK100 return sal_True; -#endif - } @@ -3762,17 +3743,13 @@ void HwpReader::makeFormula(TxtBox * hbox) pPar = pPar->Next(); } mybuf[l] = '\0'; -// rchars(ascii(mybuf)); -//#ifndef UDK100 + Formula *form = new Formula(mybuf); form->setDocumentHandler(m_rxDocumentHandler); form->setAttributeListImpl(pList); form->parse(); delete form; -//#endif - - } diff --git a/hwpfilter/source/lexer.cpp b/hwpfilter/source/lexer.cxx index 3c73a66ff48e..3c73a66ff48e 100644 --- a/hwpfilter/source/lexer.cpp +++ b/hwpfilter/source/lexer.cxx diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx index cbc8d56b0ff2..c4df08e0a0f3 100644 --- a/hwpfilter/source/list.hxx +++ b/hwpfilter/source/list.hxx @@ -36,7 +36,7 @@ * USE STL CONTAINERS FOR NEW CODE! * * The classes LinkedList and LinkedListIterator were originally - * implemented in two files LinkedList.cpp/.h, whose license would not + * implemented in two files LinkedList.cxx/.h, whose license would not * allow re-distribution through OpenOffice.org. This file * re-implements the same functionality, based on the STL. */ @@ -92,7 +92,7 @@ public: void reset( ); /// set iterator to first element - // bug-compatible with original LinkedList.h/cpp: Ignore parameter! + // bug-compatible with original LinkedList.h/cxx: Ignore parameter! void operator++( int ); /// advance iterator by one step (ignore n !!!) void operator--( int ); /// go one step backwards (ignore n !!!) @@ -261,7 +261,7 @@ void LinkedListIterator<T>::operator++( int ) { ASSERT( mpList != NULL ); - // bug-compatible with LinkedList.cpp: ignore parameter! + // bug-compatible with LinkedList.cxx: ignore parameter! mnPosition ++; } @@ -270,7 +270,7 @@ void LinkedListIterator<T>::operator--( int ) { ASSERT( mpList != NULL ); - // bug-compatible with LinkedList.cpp: ignore parameter! + // bug-compatible with LinkedList.cxx: ignore parameter! mnPosition --; } diff --git a/hwpfilter/source/makefile.mk b/hwpfilter/source/makefile.mk deleted file mode 100644 index a8e137b6851b..000000000000 --- a/hwpfilter/source/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* 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=hwpfilter -TARGET=hwp - -USE_DEFFILE=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -SLOFILES = \ - $(SLO)$/attributes.obj \ - $(SLO)$/cspline.obj \ - $(SLO)$/fontmap.obj \ - $(SLO)$/formula.obj \ - $(SLO)$/grammar.obj \ - $(SLO)$/hbox.obj \ - $(SLO)$/hcode.obj \ - $(SLO)$/hfont.obj \ - $(SLO)$/hgzip.obj \ - $(SLO)$/himgutil.obj \ - $(SLO)$/hinfo.obj \ - $(SLO)$/hiodev.obj \ - $(SLO)$/hpara.obj \ - $(SLO)$/hstream.obj \ - $(SLO)$/hstyle.obj \ - $(SLO)$/htags.obj \ - $(SLO)$/hutil.obj \ - $(SLO)$/hwpeq.obj \ - $(SLO)$/hwpfile.obj \ - $(SLO)$/hwpread.obj \ - $(SLO)$/hwpreader.obj \ - $(SLO)$/lexer.obj \ - $(SLO)$/mzstring.obj \ - $(SLO)$/solver.obj - -# --- Shared-Library ----------------------------------------------- - -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(SALLIB) \ - $(ZLIB3RDLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= \ - $(OLE32LIB) $(UUIDLIB) -.ENDIF # "$(GUI)"=="WNT" - - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1VERSIONMAP = $(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/hwp.component - -$(MISC)/hwp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - hwp.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt hwp.component diff --git a/hwpfilter/source/mzstring.cpp b/hwpfilter/source/mzstring.cxx index c8d7e977bdac..c8d7e977bdac 100644 --- a/hwpfilter/source/mzstring.cpp +++ b/hwpfilter/source/mzstring.cxx diff --git a/hwpfilter/source/solver.cpp b/hwpfilter/source/solver.cxx index 9748769b5d24..9748769b5d24 100644 --- a/hwpfilter/source/solver.cpp +++ b/hwpfilter/source/solver.cxx |