diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-03-02 11:54:18 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 00:59:06 +0200 |
commit | b0fe6086c3a0d6a4b4927e79ca06833f3ead24df (patch) | |
tree | 3fa905f5795f10b0f55eda70f850d50605e3497a /xmlscript/source | |
parent | 270dd44c43555643a08bde21cb792e105a86ce72 (diff) |
CWS gnumake4: convert xmlscript to new build system [hg:d4df54d61f2a]
Diffstat (limited to 'xmlscript/source')
-rw-r--r-- | xmlscript/source/inc/xml_import.hxx | 65 | ||||
-rw-r--r-- | xmlscript/source/misc/makefile.mk | 48 | ||||
-rw-r--r-- | xmlscript/source/misc/unoservices.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/makefile.mk | 50 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/makefile.mk | 52 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/makefile.mk | 50 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/makefile.mk | 50 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/makefile.mk | 49 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2 |
12 files changed, 71 insertions, 305 deletions
diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx new file mode 100644 index 000000000000..d63fdff7f7cb --- /dev/null +++ b/xmlscript/source/inc/xml_import.hxx @@ -0,0 +1,65 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ +#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_ +#define _XMLSCRIPT_XML_IMPORT_HXX_ + +#include "com/sun/star/xml/input/XRoot.hpp" +#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp" + +namespace xmlscript +{ + +/*############################################################################## + + IMPORTING + +##############################################################################*/ + +/** Creates a document handler to be used for SAX1 parser that can handle + namespaces. Namespace URI are mapped to integer ids for performance. + Implementing the XImporter interface, you will get a startRootElement() + for the root element of your XML document and subsequent + startChildElement() callbacks for each sub element. + Namespaces of tags are identified by their integer value. + + @param xRoot + initial object being called for root context + @param bSingleThreadedUse + flag whether context management is synchronized. + @return + document handler for parser +*/ +::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > +SAL_CALL createDocumentHandler( + ::com::sun::star::uno::Reference< + ::com::sun::star::xml::input::XRoot > const & xRoot, + bool bSingleThreadedUse = true ) + SAL_THROW( () ); + +} + +#endif diff --git a/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk deleted file mode 100644 index dfac81bfa6aa..000000000000 --- a/xmlscript/source/misc/makefile.mk +++ /dev/null @@ -1,48 +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=misc -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -#----------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unoservices.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : $(PRJ)$/util$/target.pmk -.ENDIF # L10N_framework -.INCLUDE : target.mk diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 0d4d8db169ac..6bcaf49c1f72 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -107,7 +107,7 @@ namespace xmlscript extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -115,7 +115,7 @@ extern "C" // ----------------------------------------------------------------------------- - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk deleted file mode 100644 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 754b546a112c..d014486faaf6 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -35,7 +35,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 100644 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 5fb2a39c6913..d19e83a3526b 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -35,7 +35,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/xmlflat_imexp/makefile.mk b/xmlscript/source/xmlflat_imexp/makefile.mk deleted file mode 100644 index ed4d434afbd0..000000000000 --- a/xmlscript/source/xmlflat_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=xmlflat_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- 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 diff --git a/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk deleted file mode 100644 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 bac997d4dc94..9ea6f121dbc5 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -33,7 +33,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/makefile.mk b/xmlscript/source/xmlmod_imexp/makefile.mk deleted file mode 100644 index 174bf94c75ae..000000000000 --- a/xmlscript/source/xmlmod_imexp/makefile.mk +++ /dev/null @@ -1,49 +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=xmlmod_imexp -NO_BSYMBOLIC=TRUE -ENABLE_EXCEPTIONS=TRUE - -# --- 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 diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index 7f38f915aa62..2c2fe2c028f8 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -33,7 +33,7 @@ #include <rtl/ustrbuf.hxx> -#include <xmlscript/xml_import.hxx> +#include <xml_import.hxx> #include <comphelper/processfactory.hxx> |