Author: arist
Date: Wed Nov 14 22:57:55 2012
New Revision: 1409515
URL: http://svn.apache.org/viewvc?rev=1409515&view=rev
Log:
gnumake4_026_d4df54d61f2a.patch
# HG changeset patch
# User mba
# Date 1299063258 -3600
# Node ID d4df54d61f2aed965539ad54975350752f462556
# Parent 6c456d1d1488521d72df094709b4be39a9108a59
CWS gnumake4: convert xmlscript to new build system
Added:
incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk
incubator/ooo/branches/gbuild/main/xmlscript/Makefile
incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk
incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk
incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h
incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xml_helper.hxx
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
incubator/ooo/branches/gbuild/main/xmlscript/prj/build.lst
incubator/ooo/branches/gbuild/main/xmlscript/prj/d.lst
incubator/ooo/branches/gbuild/main/xmlscript/source/misc/unoservices.cxx
incubator/ooo/branches/gbuild/main/xmlscript/source/xml_helper/xml_impctx.cxx
incubator/ooo/branches/gbuild/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
incubator/ooo/branches/gbuild/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
incubator/ooo/branches/gbuild/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:57:55 2012
@@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,o
wizards \
writerfilter \
xmloff \
+ xmlscript \
))
# vim: set noet ts=4 sw=4:
Modified:
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
Wed Nov 14 22:57:55 2012
@@ -85,6 +85,7 @@ my_components = \
component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
+ component/xmlscript/util/xcr \
configmgr \
ctl \
date \
@@ -169,7 +170,6 @@ my_components = \
uui \
vbaevents \
vbaobj \
- xcr \
xmlfa \
xmlfd \
xmx \
Added: incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk Wed Nov 14
22:57:55 2012
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# 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_add_api,xcr,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,xcr,\
+ -I$(SRCDIR)/xmlscript/source/inc \
+ -I$(SRCDIR)/xmlscript/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_set_defs,xcr,\
+ $$(DEFS) \
+ -DXCR_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xcr,\
+ sal \
+ cppu \
+ cppuhelper \
+ $(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:
Added: incubator/ooo/branches/gbuild/main/xmlscript/Makefile
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Makefile?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Makefile Wed Nov 14 22:57:55
2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+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:
Added: incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk Wed Nov 14
22:57:55 2012
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# 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_Module_Module,xmlscript))
+
+$(eval $(call gb_Module_add_targets,xmlscript,\
+ Library_xcr \
+ Package_inc \
+ Package_dtd \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk Wed Nov 14
22:57:55 2012
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# 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_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))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk Wed Nov 14
22:57:55 2012
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# 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_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/inc))
+
+$(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))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h
(added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h Wed
Nov 14 22:57:55 2012
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * 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
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xml_helper.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xml_helper.hxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xml_helper.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xml_helper.hxx
Wed Nov 14 22:57:55 2012
@@ -30,6 +30,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -41,7 +42,7 @@ namespace xmlscript
##################################################################################################*/
//==================================================================================================
-class XMLElement
+class XCR_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XAttributeList >
{
public:
@@ -126,13 +127,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( () );
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Wed Nov 14 22:57:55 2012
@@ -37,13 +37,13 @@
#endif
#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<
@@ -51,7 +51,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,
@@ -62,7 +62,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,
@@ -71,7 +71,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 > xInput,
::com::sun::star::uno::Reference<
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
Wed Nov 14 22:57:55 2012
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -37,7 +37,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;
@@ -48,7 +48,7 @@ struct LibDescriptor
sal_Bool bPreload;
};
-struct LibDescriptorArray
+struct XCR_DLLPUBLIC LibDescriptorArray
{
LibDescriptor* mpLibs;
sal_Int32 mnLibCount;
@@ -60,27 +60,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) );
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
Wed Nov 14 22:57:55 2012
@@ -26,7 +26,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
{
@@ -36,7 +36,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;
@@ -44,14 +44,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) );
Modified: incubator/ooo/branches/gbuild/main/xmlscript/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/prj/build.lst?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/prj/build.lst Wed Nov 14
22:57:55 2012
@@ -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
+
Modified: incubator/ooo/branches/gbuild/main/xmlscript/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/prj/d.lst?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/prj/d.lst Wed Nov 14 22:57:55
2012
@@ -1,14 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlscript
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx
-..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmldlg_imexp.hxx
-..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmllib_imexp.hxx
-..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmlmod_imexp.hxx
-..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
-
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
-..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
Added: incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk?rev=1409515&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk Wed Nov 14
22:57:55 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/source/misc/unoservices.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/source/misc/unoservices.cxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/source/misc/unoservices.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/source/misc/unoservices.cxx
Wed Nov 14 22:57:55 2012
@@ -103,7 +103,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;
@@ -111,7 +111,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(
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/source/xml_helper/xml_impctx.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/source/xml_helper/xml_impctx.cxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/xmlscript/source/xml_helper/xml_impctx.cxx
(original)
+++
incubator/ooo/branches/gbuild/main/xmlscript/source/xml_helper/xml_impctx.cxx
Wed Nov 14 22:57:55 2012
@@ -31,7 +31,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"
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
(original)
+++
incubator/ooo/branches/gbuild/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
Wed Nov 14 22:57:55 2012
@@ -31,7 +31,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>
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
(original)
+++
incubator/ooo/branches/gbuild/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
Wed Nov 14 22:57:55 2012
@@ -29,7 +29,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
Modified:
incubator/ooo/branches/gbuild/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx?rev=1409515&r1=1409514&r2=1409515&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
(original)
+++
incubator/ooo/branches/gbuild/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
Wed Nov 14 22:57:55 2012
@@ -29,7 +29,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
