Author: damjan
Date: Mon Mar 7 17:04:50 2016
New Revision: 1733945
URL: http://svn.apache.org/viewvc?rev=1733945&view=rev
Log:
Merge r1409513 and r1409515 from branches/gbuild:
CWS gnumake4: reimplement basegfx_s hack for new build system
CWS gnumake4: convert xmlscript to new build system
Also needed to fix includes for xmlscript.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk
- copied unchanged from r1409513,
incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
- copied, changed from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Makefile
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/Makefile
openoffice/branches/gbuild-reintegration/main/xmlscript/Module_xmlscript.mk
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/Module_xmlscript.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Package_dtd.mk
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/Package_dtd.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Package_inc.mk
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xcrdllapi.h
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/inc/xmlscript/xcrdllapi.h
openoffice/branches/gbuild-reintegration/main/xmlscript/prj/makefile.mk
- copied unchanged from r1409515,
incubator/ooo/branches/gbuild/main/xmlscript/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/inc/pdfihelper.hxx
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/test/tests.cxx
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xml_helper.hxx
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
openoffice/branches/gbuild-reintegration/main/xmlscript/prj/build.lst
openoffice/branches/gbuild-reintegration/main/xmlscript/prj/d.lst
openoffice/branches/gbuild-reintegration/main/xmlscript/source/misc/unoservices.cxx
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xml_helper/xml_impctx.cxx
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 7 17:04:50 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Mon Mar 7
17:04:50 2016
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,o
cppcanvas \
drawinglayer \
editeng \
+ formula \
framework \
idl \
linguistic \
@@ -56,7 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,o
wizards \
writerfilter \
xmloff \
- formula \
+ xmlscript \
))
# vim: set noet ts=4 sw=4:
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Mon Mar 7
17:04:50 2016
@@ -144,6 +144,7 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ basegfx_s \
jpeglib \
ooopathutils \
salcpprt \
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk Mon
Mar 7 17:04:50 2016
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,basegfx))
$(eval $(call gb_Module_add_targets,basegfx,\
Library_basegfx \
Package_inc \
+ StaticLibrary_basegfx_s \
))
ifeq ($(ENABLE_UNIT_TESTS),YES)
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
Mon Mar 7 17:04:50 2016
@@ -27,6 +27,12 @@
#ifndef INCLUDED_BASEGFXDLLAPI_H
#define INCLUDED_BASEGFXDLLAPI_H
+#if defined BASEGFX_STATICLIBRARY
+#define BASEGFX_DLLPUBLIC
+#define BASEGFX_DLLPRIVATE
+
+#else
+
#if defined BASEGFX_DLLIMPLEMENTATION
#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
@@ -35,3 +41,5 @@
#define BASEGFX_DLLPRIVATE SAL_DLLPRIVATE
#endif
+
+#endif
\ No newline at end of file
Modified:
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Mon Mar 7 17:04:50 2016
@@ -102,6 +102,7 @@ my_components = \
component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
+ component/xmlscript/util/xcr \
configmgr \
ctl \
date \
@@ -187,7 +188,6 @@ my_components = \
vbaevents \
vbaobj \
vclcanvas \
- xcr \
xmlfa \
xmlfd \
xmx \
Modified:
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/inc/pdfihelper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/inc/pdfihelper.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/inc/pdfihelper.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/inc/pdfihelper.hxx
Mon Mar 7 17:04:50 2016
@@ -24,6 +24,8 @@
#ifndef INCLUDED_PDFI_HELPER_HXX
#define INCLUDED_PDFI_HELPER_HXX
+#define BASEGFX_STATICLIBRARY
+
#include "contentsink.hxx"
#include <rtl/ustring.hxx>
Modified:
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/test/tests.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/test/tests.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/test/tests.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/test/tests.cxx
Mon Mar 7 17:04:50 2016
@@ -24,6 +24,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
+#define BASEGFX_STATICLIBRARY
+
#ifdef SYSTEM_ZLIB
#include "zlib.h"
#else
Modified:
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
Mon Mar 7 17:04:50 2016
@@ -24,6 +24,8 @@
#ifndef INCLUDED_PDFI_PROCESSOR_HXX
#define INCLUDED_PDFI_PROCESSOR_HXX
+#include "pdfihelper.hxx"
+
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
@@ -46,7 +48,6 @@
#include <hash_map>
#include "imagecontainer.hxx"
-#include "pdfihelper.hxx"
#include "contentsink.hxx"
#include "treevisitorfactory.hxx"
#include "genericelements.hxx"
Copied: openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
(from r1409515, incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk?p2=openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk&p1=incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk&r1=1409515&r2=1733945&rev=1733945&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk Mon
Mar 7 17:04:50 2016
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_api,xcr,\
$(eval $(call gb_Library_set_include,xcr,\
-I$(SRCDIR)/xmlscript/source/inc \
+ -I$(SRCDIR)/xmlscript/inc/xmlscript \
-I$(SRCDIR)/xmlscript/inc/pch \
$$(INCLUDE) \
))
Modified:
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xml_helper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xml_helper.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xml_helper.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xml_helper.hxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
Mon Mar 7 17:04:50 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/xmlscript/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/prj/build.lst?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlscript/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/xmlscript/prj/build.lst Mon
Mar 7 17:04:50 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/xmlscript/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/prj/d.lst?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlscript/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlscript/prj/d.lst Mon Mar
7 17:04:50 2016
@@ -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
Modified:
openoffice/branches/gbuild-reintegration/main/xmlscript/source/misc/unoservices.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/source/misc/unoservices.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/source/misc/unoservices.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/source/misc/unoservices.cxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xml_helper/xml_impctx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/source/xml_helper/xml_impctx.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xml_helper/xml_impctx.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xml_helper/xml_impctx.cxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
Mon Mar 7 17:04:50 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmllib_imexp/xmllib_import.cxx
Mon Mar 7 17:04:50 2016
@@ -29,7 +29,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
Modified:
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx?rev=1733945&r1=1733944&r2=1733945&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
Mon Mar 7 17:04:50 2016
@@ -29,7 +29,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
