diff options
Diffstat (limited to 'xmlscript')
23 files changed, 185 insertions, 384 deletions
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk new file mode 100644 index 000000000000..d3bb35c4fddf --- /dev/null +++ b/xmlscript/Library_xcr.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xcr)) + +$(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc)) + +$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr)) + +$(eval $(call gb_Library_set_include,xcr,\ + -I$(SRCDIR)/xmlscript/source/inc \ + -I$(SRCDIR)/xmlscript/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_defs,xcr,\ + -DXCR_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,xcr,\ + sal \ + cppu \ + cppuhelper \ + stl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,xcr,\ + xmlscript/source/xmldlg_imexp/xmldlg_impmodels \ + xmlscript/source/xmldlg_imexp/xmldlg_import \ + xmlscript/source/xmldlg_imexp/xmldlg_addfunc \ + xmlscript/source/xmldlg_imexp/xmldlg_export \ + xmlscript/source/xmldlg_imexp/xmldlg_expmodels \ + xmlscript/source/misc/unoservices \ + xmlscript/source/xml_helper/xml_byteseq \ + xmlscript/source/xml_helper/xml_impctx \ + xmlscript/source/xml_helper/xml_element \ + xmlscript/source/xmlflat_imexp/xmlbas_import \ + xmlscript/source/xmlflat_imexp/xmlbas_export \ + xmlscript/source/xmllib_imexp/xmllib_import \ + xmlscript/source/xmllib_imexp/xmllib_export \ + xmlscript/source/xmlmod_imexp/xmlmod_import \ + xmlscript/source/xmlmod_imexp/xmlmod_export \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmlscript/inc/makefile.mk b/xmlscript/Makefile index 4141e88a2844..90947b2e5f48 100755..100644 --- a/xmlscript/inc/makefile.mk +++ b/xmlscript/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -24,24 +24,15 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=xmlscript -TARGET=inc +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -# --- Settings ----------------------------------------------------- +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(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/xmlscript/source/misc/makefile.mk b/xmlscript/Module_xmlscript.mk index dfac81bfa6aa..30fa3147c8f5 100755 --- a/xmlscript/source/misc/makefile.mk +++ b/xmlscript/Module_xmlscript.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,24 +25,12 @@ # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_Module_Module,xmlscript)) -PRJNAME=xmlscript -TARGET=misc -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Module_add_targets,xmlscript,\ + Library_xcr \ + Package_inc \ + Package_dtd \ +)) -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unoservices.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk -.ENDIF # L10N_framework -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/xmlscript/source/xmlmod_imexp/makefile.mk b/xmlscript/Package_dtd.mk index 174bf94c75ae..cab5ddd0faeb 100755 --- a/xmlscript/source/xmlmod_imexp/makefile.mk +++ b/xmlscript/Package_dtd.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -24,26 +24,11 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=..$/.. -PRJNAME=xmlscript -TARGET=xmlmod_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/dtd)) +$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dialog.dtd)) +$(eval $(call gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,libraries.dtd)) +$(eval $(call gb_Package_add_file,xmlscript_inc,bin/library.dtd,library.dtd)) +$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,module.dtd)) -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmlmod_import.obj \ - $(SLO)$/xmlmod_export.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk - -.ENDIF # L10N_framework -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/xmlscript/source/xmlflat_imexp/makefile.mk b/xmlscript/Package_inc.mk index ed4d434afbd0..649dde7b44b3 100755 --- a/xmlscript/source/xmlflat_imexp/makefile.mk +++ b/xmlscript/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,26 +25,13 @@ # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/inc)) -PRJNAME=xmlscript -TARGET=xmlflat_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,xmlscript/xmldlg_imexp.hxx)) +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,xmlscript/xml_helper.hxx)) +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,xmlscript/xmllib_imexp.hxx)) +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,xmlscript/xmlmod_imexp.hxx)) +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,xmlscript/xmlns.h)) +$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xcrdllapi.h,xmlscript/xcrdllapi.h)) -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmlbas_export.obj \ - $(SLO)$/xmlbas_import.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk -.ENDIF # L10N_framework - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/xmlscript/inc/xmlscript/xcrdllapi.h b/xmlscript/inc/xmlscript/xcrdllapi.h new file mode 100644 index 000000000000..8c4a7a581dc4 --- /dev/null +++ b/xmlscript/inc/xmlscript/xcrdllapi.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XCRdllapi.h,v $ + * $Revision: 1.4 $ + * + * 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. + * + ************************************************************************/ + +#ifndef INCLUDED_XCRDLLAPI_H +#define INCLUDED_XCRDLLAPI_H + +#include "sal/types.h" + +#if defined(XCR_DLLIMPLEMENTATION) +#define XCR_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define XCR_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define XCR_DLLPRIVATE SAL_DLLPRIVATE + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx index f3b272db7afd..48c0905a0b49 100644 --- a/xmlscript/inc/xmlscript/xml_helper.hxx +++ b/xmlscript/inc/xmlscript/xml_helper.hxx @@ -35,6 +35,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> +#include "xmlscript/xcrdllapi.h" namespace xmlscript { @@ -46,7 +47,7 @@ namespace xmlscript ##################################################################################################*/ //================================================================================================== -class XMLElement +class XCR_DLLPUBLIC XMLElement : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList > { public: @@ -131,13 +132,13 @@ protected: ##################################################################################################*/ //================================================================================================== -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL createInputStream( ::rtl::ByteSequence const & rInData ) SAL_THROW( () ); //================================================================================================== -::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ::rtl::ByteSequence * pOutData ) SAL_THROW( () ); diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx index 47d0d17e989f..86b98c13406b 100644 --- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx @@ -36,13 +36,13 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "xmlscript/xmlns.h" - +#include "xmlscript/xcrdllapi.h" namespace xmlscript { //============================================================================== -void SAL_CALL exportDialogModel( +XCR_DLLPUBLIC void SAL_CALL exportDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, ::com::sun::star::uno::Reference< @@ -52,7 +52,7 @@ void SAL_CALL exportDialogModel( SAL_THROW( (::com::sun::star::uno::Exception) ); //============================================================================== -::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel, @@ -65,7 +65,7 @@ SAL_CALL importDialogModel( // additional functions for convenience //============================================================================== -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider > +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider > SAL_CALL exportDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel, @@ -76,7 +76,7 @@ SAL_CALL exportDialogModel( SAL_THROW( (::com::sun::star::uno::Exception) ); //============================================================================== -void SAL_CALL importDialogModel( +XCR_DLLPUBLIC void SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > const & xInput, ::com::sun::star::uno::Reference< diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx index 95750c26655f..9b5aad1318cc 100644 --- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include "xmlscript/xmlns.h" - +#include "xmlscript/xcrdllapi.h" namespace xmlscript { @@ -42,7 +42,7 @@ namespace xmlscript // HACK C++ struct to transport info. Later the container // itself should do the export/import and use exportet XML // functionality from xmlscript -struct LibDescriptor +struct XCR_DLLPUBLIC LibDescriptor { ::rtl::OUString aName; ::rtl::OUString aStorageURL; @@ -53,7 +53,7 @@ struct LibDescriptor sal_Bool bPreload; }; -struct LibDescriptorArray +struct XCR_DLLPUBLIC LibDescriptorArray { LibDescriptor* mpLibs; sal_Int32 mnLibCount; @@ -65,27 +65,27 @@ struct LibDescriptorArray }; -void +XCR_DLLPUBLIC void SAL_CALL exportLibraryContainer( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, const LibDescriptorArray* pLibArray ) SAL_THROW( (::com::sun::star::uno::Exception) ); -::com::sun::star::uno::Reference< +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) SAL_THROW( (::com::sun::star::uno::Exception) ); -void +XCR_DLLPUBLIC void SAL_CALL exportLibrary( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, const LibDescriptor& rLib ) SAL_THROW( (::com::sun::star::uno::Exception) ); -::com::sun::star::uno::Reference< +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL importLibrary( LibDescriptor& rLib ) SAL_THROW( (::com::sun::star::uno::Exception) ); diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx index f2e3b169454f..fd2faf14586a 100644 --- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <xmlscript/xmlns.h> - +#include "xmlscript/xcrdllapi.h" namespace xmlscript { @@ -41,7 +41,7 @@ namespace xmlscript // HACK C++ struct to transport info. Later the container // itself should do the export/import and use exportet XML // functionality from xmlscript -struct ModuleDescriptor +struct XCR_DLLPUBLIC ModuleDescriptor { ::rtl::OUString aName; ::rtl::OUString aLanguage; @@ -49,14 +49,14 @@ struct ModuleDescriptor ::rtl::OUString aModuleType; // VBA }; -void +XCR_DLLPUBLIC void SAL_CALL exportScriptModule( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, const ModuleDescriptor& rMod ) SAL_THROW( (::com::sun::star::uno::Exception) ); -::com::sun::star::uno::Reference< +XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL importScriptModule( ModuleDescriptor& rMod ) SAL_THROW( (::com::sun::star::uno::Exception) ); diff --git a/xmlscript/prj/build.lst b/xmlscript/prj/build.lst index 388a59f134ff..ea87780c3832 100644 --- a/xmlscript/prj/build.lst +++ b/xmlscript/prj/build.lst @@ -1,10 +1,3 @@ xt xmlscript : comphelper tools offapi LIBXSLT:libxslt NULL -xt xmlscript usr1 - all xt_mkout NULL -xt xmlscript\inc nmake - all xt_inc NULL -xt xmlscript\source\xml_helper nmake - all xt_xml_helper xt_inc NULL -xt xmlscript\source\xmldlg_imexp nmake - all xt_xmldlg_imexp xt_inc NULL -xt xmlscript\source\xmllib_imexp nmake - all xt_xmllib_imexp xt_inc NULL -xt xmlscript\source\xmlmod_imexp nmake - all xt_xmlmod_imexp xt_inc NULL -xt xmlscript\source\xmlflat_imexp nmake - all xt_xmlflat_imexp xt_inc NULL -xt xmlscript\source\misc nmake - all xt_misc xt_inc NULL -xt xmlscript\util nmake - all xt_util xt_xml_helper xt_xmldlg_imexp xt_xmllib_imexp xt_xmlmod_imexp xt_xmlflat_imexp xt_misc NULL +xt xmlscript\prj nmake - all xt_prj NULL + diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst index 6a2447ad8c1f..e69de29bb2d1 100644 --- a/xmlscript/prj/d.lst +++ b/xmlscript/prj/d.lst @@ -1,14 +0,0 @@ -mkdir: %_DEST%\inc\xmlscript -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib - -..\inc\xmlscript\xml_helper.hxx %_DEST%\inc\xmlscript\xml_helper.hxx -..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc\xmlscript\xmldlg_imexp.hxx -..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc\xmlscript\xmllib_imexp.hxx -..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc\xmlscript\xmlmod_imexp.hxx -..\inc\xmlscript\xmlns.h %_DEST%\inc\xmlscript\xmlns.h - -..\dtd\*.dtd %_DEST%\bin\*.dtd -..\%__SRC%\misc\xcr.component %_DEST%\xml\xcr.component diff --git a/xmlscript/util/target.pmk b/xmlscript/prj/makefile.mk index 907ec41dd90f..88cd9dfe08b8 100755 --- a/xmlscript/util/target.pmk +++ b/xmlscript/prj/makefile.mk @@ -24,12 +24,17 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -.IF "$(debug)" != "" -# msvc++: no inlining -.IF "$(COM)" == "MSC" -CFLAGS += /Ob0 -.ENDIF +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 diff --git a/xmlscript/inc/xmlscript/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index ca8cc3a0f0e9..2e36643379fd 100644 --- a/xmlscript/inc/xmlscript/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -31,7 +31,6 @@ #include "com/sun/star/xml/input/XRoot.hpp" #include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp" - namespace xmlscript { diff --git a/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk deleted file mode 100755 index 7b48695bae64..000000000000 --- a/xmlscript/source/xml_helper/makefile.mk +++ /dev/null @@ -1,50 +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=xmlscript -TARGET=xml_helper -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xml_impctx.obj \ - $(SLO)$/xml_element.obj \ - $(SLO)$/xml_byteseq.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk -.ENDIF # L10N_framework - -.INCLUDE : target.mk diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 646fadfb1b9f..308efd537c29 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -36,7 +36,7 @@ #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase3.hxx" -#include "xmlscript/xml_import.hxx" +#include "xml_import.hxx" #include "com/sun/star/xml/input/XAttributes.hpp" #include "com/sun/star/lang/XInitialization.hpp" diff --git a/xmlscript/source/xmldlg_imexp/makefile.mk b/xmlscript/source/xmldlg_imexp/makefile.mk deleted file mode 100755 index e0583aa78d9b..000000000000 --- a/xmlscript/source/xmldlg_imexp/makefile.mk +++ /dev/null @@ -1,52 +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=xmlscript -TARGET=xmldlg_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmldlg_import.obj \ - $(SLO)$/xmldlg_impmodels.obj \ - $(SLO)$/xmldlg_export.obj \ - $(SLO)$/xmldlg_expmodels.obj \ - $(SLO)$/xmldlg_addfunc.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk -.ENDIF # L10N_framework - -.INCLUDE : target.mk diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index b5d61fd7dc83..8e3b28dafcb9 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -36,7 +36,7 @@ #include <rtl/ustrbuf.hxx> -#include <xmlscript/xml_import.hxx> +#include <xml_import.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/CharSet.hpp> diff --git a/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk deleted file mode 100755 index c6ef65a43393..000000000000 --- a/xmlscript/source/xmllib_imexp/makefile.mk +++ /dev/null @@ -1,50 +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=xmlscript -TARGET=xmllib_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmllib_import.obj \ - $(SLO)$/xmllib_export.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk - -.ENDIF # L10N_framework - -.INCLUDE : target.mk diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index a1fd0fff2b2f..2be008de582c 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -34,7 +34,7 @@ #include <rtl/ustrbuf.hxx> -#include <xmlscript/xml_import.hxx> +#include <xml_import.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index efae2852eec6..ab64e9eddb61 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -34,7 +34,7 @@ #include <rtl/ustrbuf.hxx> -#include <xmlscript/xml_import.hxx> +#include <xml_import.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk deleted file mode 100755 index c10f31946aca..000000000000 --- a/xmlscript/util/makefile.mk +++ /dev/null @@ -1,85 +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=xmlscript -TARGET=xcr -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#------------------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET).lib - -LIB1FILES= \ - $(SLB)$/xml_helper.lib \ - $(SLB)$/xmldlg_imexp.lib \ - $(SLB)$/xmllib_imexp.lib \ - $(SLB)$/xmlmod_imexp.lib \ - $(SLB)$/xmlflat_imexp.lib \ - $(SLB)$/misc.lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1LIBS= \ - $(LIB1TARGET) - -SHL1STDLIBS= \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt - @echo ------------------------------ - @echo Making: $@ - $(TYPE) xcr.flt > $@ - -ALLTAR : $(MISC)/xcr.component - -$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xcr.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xcr.component diff --git a/xmlscript/util/xcr.flt b/xmlscript/util/xcr.flt deleted file mode 100755 index e9a7f0344007..000000000000 --- a/xmlscript/util/xcr.flt +++ /dev/null @@ -1,13 +0,0 @@ -??_7 -??_8 -??_C -??_E -??_F -??_G -??_H -??_I -0Imp -Impl@@ -Imp@@ -__CT -_STL |