mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targetted rename xcr -> xmlscript to match includes and module name

Browse Source
This commit is contained in:
Michael Meeks
2012-07-06 21:28:03 +01:00
parent 0c8190999b
commit ae7534f616
32 changed files with 94 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -377,7 +377,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
wpftdraw \ wpftdraw \
wpftwriter \ wpftwriter \
writerfilter \ writerfilter \
xcr \ xmlscript \
xmlfa \ xmlfa \
xmlfd \ xmlfd \
xo \ xo \

2
basctl/Library_basctl.mk
View File

@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
utl \ utl \
ucbhelper \ ucbhelper \
vcl \ vcl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
basic/CppunitTest_basic_enable.mk
View File

@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
tl \ tl \
utl \ utl \
vcl \ vcl \
xcr \ xmlscript \
test \ test \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
basic/CppunitTest_basic_nested_struct.mk
View File

@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
tl \ tl \
utl \ utl \
vcl \ vcl \
xcr \ xmlscript \
test \ test \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
basic/CppunitTest_basic_scanner.mk
View File

@@ -20,7 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
tl \ tl \
utl \ utl \
vcl \ vcl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
basic/Library_sb.mk
View File

@@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
tl \ tl \
utl \ utl \
vcl \ vcl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
dbaccess/Library_dbmm.mk
View File

@@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
ucbhelper \ ucbhelper \
utl \ utl \
vcl \ vcl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
desktop/Library_deployment.mk
View File

@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
tl \ tl \
ucbhelper \ ucbhelper \
utl \ utl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
desktop/Library_deploymentmisc.mk
View File

@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
tl \ tl \
ucbhelper \ ucbhelper \
utl \ utl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
desktop/Pagein_common.mk
View File

@@ -51,7 +51,7 @@ $(eval $(call gb_Pagein_add_objects,common,\
$(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \ $(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \
basegfx \ basegfx \
sot \ sot \
xcr \ xmlscript \
sb \ sb \
stocservices \ stocservices \
bootstrap \ bootstrap \

2
filter/Library_msfilter.mk
View File

@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,msfilter,\
vcl \ vcl \
svl \ svl \
sot \ sot \
xcr \ xmlscript \
utl \ utl \
tl \ tl \
comphelper \ comphelper \

2
ios/qa/sc/Makefile
View File

@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC) CFLAGS = $(SOLARINC)
LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxcrlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
all: $(APPDIR)/$(APP) stuff all: $(APPDIR)/$(APP) stuff

2
oox/Library_oox.mk
View File

@@ -73,7 +73,7 @@ $(eval $(call gb_Library_use_libraries,oox,\
utl \ utl \
vcl \ vcl \
xo \ xo \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
postprocess/packcomponents/makefile.mk
View File

@@ -126,7 +126,7 @@ my_components = \
component/uui/util/uui \ component/uui/util/uui \
component/xmloff/source/transform/xof \ component/xmloff/source/transform/xof \
component/xmloff/util/xo \ component/xmloff/util/xo \
component/xmlscript/util/xcr \ component/xmlscript/util/xmlscript \
component/xmlsecurity/util/xmlsecurity \ component/xmlsecurity/util/xmlsecurity \
component/xmlsecurity/util/xsec_fw \ component/xmlsecurity/util/xsec_fw \

4
scp2/source/ooo/file_library_ooo.scp
View File

@@ -1407,8 +1407,8 @@ File gid_File_Lib_Vcl
Dir = SCP2_OOO_BIN_DIR; Dir = SCP2_OOO_BIN_DIR;
End End
STD_LIB_FILE( gid_File_Lib_Xcr, xcr) STD_LIB_FILE( gid_File_Lib_Xcr, xmlscript)
STD_LIB_FILE( gid_File_Lib_Xof , xof) STD_LIB_FILE( gid_File_Lib_Xof, xof)
File gid_File_Lib_Xo File gid_File_Lib_Xo
Name = LIBNAME(xo); Name = LIBNAME(xo);

2
scripting/Library_dlgprov.mk
View File

@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\
ucbhelper \ ucbhelper \
vbahelper \ vbahelper \
vcl \ vcl \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

2
scripting/source/dlgprov/dlgprov.xml
View File

@@ -67,7 +67,7 @@
<project-build-dependency>sal</project-build-dependency> <project-build-dependency>sal</project-build-dependency>
<runtime-module-dependency>sfx2</runtime-module-dependency> <runtime-module-dependency>sfx2</runtime-module-dependency>
<runtime-module-dependency>xcr</runtime-module-dependency> <runtime-module-dependency>xmlscript</runtime-module-dependency>
<runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency> <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
<runtime-module-dependency>cppu3</runtime-module-dependency> <runtime-module-dependency>cppu3</runtime-module-dependency>
<runtime-module-dependency>sal3</runtime-module-dependency> <runtime-module-dependency>sal3</runtime-module-dependency>

2
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@@ -55,7 +55,7 @@ gb_MERGEDLIBS := \
ucb1 \ ucb1 \
ucpfile1 \ ucpfile1 \
uui \ uui \
xcr \ xmlscript \
xo \ xo \
endif endif

4
solenv/inc/libs.mk
View File

@@ -64,7 +64,7 @@ I18NUTILLIB=-li18nutil$(COMID)
I18NISOLANGLIB=-li18nisolang1$(COMID) I18NISOLANGLIB=-li18nisolang1$(COMID)
I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX) I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION) SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION)
XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) XMLSCRIPTLIB =-lxmlscript$(DLLPOSTFIX)
COMPHELPERLIB=-lcomphelp$(COMID) COMPHELPERLIB=-lcomphelp$(COMID)
CONNECTIVITYLIB=-lconnectivity CONNECTIVITYLIB=-lconnectivity
LDAPBERLIB=-lldapber LDAPBERLIB=-lldapber
@@ -385,7 +385,7 @@ I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib I18NISOLANGLIB=ii18nisolang.lib
I18NREGEXPLIB=ii18nregexp.lib I18NREGEXPLIB=ii18nregexp.lib
SALHELPERLIB=isalhelper.lib SALHELPERLIB=isalhelper.lib
XMLSCRIPTLIB=ixcr.lib XMLSCRIPTLIB=ixmlscript.lib
COMPHELPERLIB=icomphelp.lib COMPHELPERLIB=icomphelp.lib
CONNECTIVITYLIB=connectivity.lib CONNECTIVITYLIB=connectivity.lib
LDAPBERLIB=ldapber.lib LDAPBERLIB=ldapber.lib

2
svx/Library_svx.mk
View File

@@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
utl \ utl \
vcl \ vcl \
xo \ xo \
xcr \ xmlscript \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))

18
xmlscript/Library_xcr.mk → xmlscript/Library_xmlscript.mk
View File

@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Library_Library,xcr)) $(eval $(call gb_Library_Library,xmlscript))
$(eval $(call gb_Library_use_package,xcr,xmlscript_inc)) $(eval $(call gb_Library_use_package,xmlscript,xmlscript_inc))
$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr)) $(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript))
$(eval $(call gb_Library_use_sdk_api,xcr)) $(eval $(call gb_Library_use_sdk_api,xmlscript))
$(eval $(call gb_Library_use_libraries,xcr,\ $(eval $(call gb_Library_use_libraries,xmlscript,\
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
@@ -23,18 +23,18 @@ $(eval $(call gb_Library_use_libraries,xcr,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_set_include,xcr,\ $(eval $(call gb_Library_set_include,xmlscript,\
-I$(SRCDIR)/xmlscript/source/inc \ -I$(SRCDIR)/xmlscript/source/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_defs,xcr,\ $(eval $(call gb_Library_add_defs,xmlscript,\
-DXCR_DLLIMPLEMENTATION \ -DXMLSCRIPT_DLLIMPLEMENTATION \
)) ))
$(eval $(call gb_Library_add_exception_objects,xcr,\ $(eval $(call gb_Library_add_exception_objects,xmlscript,\
xmlscript/source/misc/unoservices \ xmlscript/source/misc/unoservices \
xmlscript/source/xml_helper/xml_byteseq \ xmlscript/source/xml_helper/xml_byteseq \
xmlscript/source/xml_helper/xml_element \ xmlscript/source/xml_helper/xml_element \

2
xmlscript/Module_xmlscript.mk
View File

@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,xmlscript)) $(eval $(call gb_Module_Module,xmlscript))
$(eval $(call gb_Module_add_targets,xmlscript,\ $(eval $(call gb_Module_add_targets,xmlscript,\
Library_xcr \ Library_xmlscript \
Package_inc \ Package_inc \
)) ))

2
xmlscript/Package_inc.mk
View File

@@ -10,7 +10,7 @@
$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript)) $(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
# headers # headers
$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xcrdllapi.h,inc/xmlscript/xcrdllapi.h)) $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlscriptdllapi.h,inc/xmlscript/xmlscriptdllapi.h))
$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx)) $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx))
$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx)) $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx))
$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,inc/xmlscript/xmllib_imexp.hxx)) $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,inc/xmlscript/xmllib_imexp.hxx))

42
xmlscript/inc/xmlscript/xcrdllapi.h
View File

@@ -1,42 +0,0 @@
/* -*- 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
*
* 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: */

10
xmlscript/inc/xmlscript/xml_helper.hxx
View File

@@ -35,7 +35,7 @@
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
#include "xmlscript/xcrdllapi.h" #include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript namespace xmlscript
{ {
@@ -47,7 +47,7 @@ namespace xmlscript
##################################################################################################*/ ##################################################################################################*/
//================================================================================================== //==================================================================================================
class XCR_DLLPUBLIC XMLElement class XMLSCRIPT_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList > : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
{ {
public: public:
@@ -131,14 +131,12 @@ protected:
##################################################################################################*/ ##################################################################################################*/
//================================================================================================== XMLSCRIPT_DLLPUBLIC ::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( SAL_CALL createInputStream(
::rtl::ByteSequence const & rInData ) ::rtl::ByteSequence const & rInData )
SAL_THROW(()); SAL_THROW(());
//================================================================================================== XMLSCRIPT_DLLPUBLIC ::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( SAL_CALL createOutputStream(
::rtl::ByteSequence * pOutData ) ::rtl::ByteSequence * pOutData )
SAL_THROW(()); SAL_THROW(());

14
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
View File

@@ -36,13 +36,12 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include "xmlscript/xmlns.h" #include "xmlscript/xmlns.h"
#include "xmlscript/xcrdllapi.h" #include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript namespace xmlscript
{ {
//============================================================================== XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel(
XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
@@ -51,8 +50,7 @@ XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::frame::XModel > const & xDocument ) ::com::sun::star::frame::XModel > const & xDocument )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
//============================================================================== XMLSCRIPT_DLLPUBLIC ::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( SAL_CALL importDialogModel(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel, ::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -64,8 +62,7 @@ SAL_CALL importDialogModel(
// additional functions for convenience // additional functions for convenience
//============================================================================== XMLSCRIPT_DLLPUBLIC ::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( SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel, ::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -75,8 +72,7 @@ SAL_CALL exportDialogModel(
::com::sun::star::frame::XModel > const & xDocument ) ::com::sun::star::frame::XModel > const & xDocument )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
//============================================================================== XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel(
XCR_DLLPUBLIC void SAL_CALL importDialogModel(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > const & xInput, ::com::sun::star::io::XInputStream > const & xInput,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<

14
xmlscript/inc/xmlscript/xmllib_imexp.hxx
View File

@@ -32,7 +32,7 @@
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include "xmlscript/xmlns.h" #include "xmlscript/xmlns.h"
#include "xmlscript/xcrdllapi.h" #include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript namespace xmlscript
{ {
@@ -42,7 +42,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container // HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML // itself should do the export/import and use exportet XML
// functionality from xmlscript // functionality from xmlscript
struct XCR_DLLPUBLIC LibDescriptor struct XMLSCRIPT_DLLPUBLIC LibDescriptor
{ {
::rtl::OUString aName; ::rtl::OUString aName;
::rtl::OUString aStorageURL; ::rtl::OUString aStorageURL;
@@ -53,7 +53,7 @@ struct XCR_DLLPUBLIC LibDescriptor
sal_Bool bPreload; sal_Bool bPreload;
}; };
struct XCR_DLLPUBLIC LibDescriptorArray struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray
{ {
LibDescriptor* mpLibs; LibDescriptor* mpLibs;
sal_Int32 mnLibCount; sal_Int32 mnLibCount;
@@ -65,27 +65,27 @@ struct XCR_DLLPUBLIC LibDescriptorArray
}; };
XCR_DLLPUBLIC void XMLSCRIPT_DLLPUBLIC void
SAL_CALL exportLibraryContainer( SAL_CALL exportLibraryContainer(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptorArray* pLibArray ) const LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
XCR_DLLPUBLIC ::com::sun::star::uno::Reference< XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
XCR_DLLPUBLIC void XMLSCRIPT_DLLPUBLIC void
SAL_CALL exportLibrary( SAL_CALL exportLibrary(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptor& rLib ) const LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
XCR_DLLPUBLIC ::com::sun::star::uno::Reference< XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibrary( LibDescriptor& rLib ) SAL_CALL importLibrary( LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );

8
xmlscript/inc/xmlscript/xmlmod_imexp.hxx
View File

@@ -31,7 +31,7 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <xmlscript/xmlns.h> #include <xmlscript/xmlns.h>
#include "xmlscript/xcrdllapi.h" #include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript namespace xmlscript
{ {
@@ -41,7 +41,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container // HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML // itself should do the export/import and use exportet XML
// functionality from xmlscript // functionality from xmlscript
struct XCR_DLLPUBLIC ModuleDescriptor struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor
{ {
::rtl::OUString aName; ::rtl::OUString aName;
::rtl::OUString aLanguage; ::rtl::OUString aLanguage;
@@ -49,14 +49,14 @@ struct XCR_DLLPUBLIC ModuleDescriptor
::rtl::OUString aModuleType; // VBA ::rtl::OUString aModuleType; // VBA
}; };
XCR_DLLPUBLIC void XMLSCRIPT_DLLPUBLIC void
SAL_CALL exportScriptModule( SAL_CALL exportScriptModule(
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const ModuleDescriptor& rMod ) const ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );
XCR_DLLPUBLIC ::com::sun::star::uno::Reference< XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importScriptModule( ModuleDescriptor& rMod ) SAL_CALL importScriptModule( ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) ); SAL_THROW( (::com::sun::star::uno::Exception) );

33
xmlscript/inc/xmlscript/xmlscriptdllapi.h Normal file
View File

@@ -0,0 +1,33 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_XMLSCRIPT_DLL_API_H
#define INCLUDED_XMLSCRIPT_DLL_API_H
#include <sal/types.h>
#if defined(XMLSCRIPT_DLLIMPLEMENTATION)
#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define XMLSCRIPT_DLLPRIVATE SAL_DLLPRIVATE
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
xmlscript/source/inc/xml_import.hxx
View File

@@ -28,6 +28,12 @@
#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_ #if ! defined _XMLSCRIPT_XML_IMPORT_HXX_
#define _XMLSCRIPT_XML_IMPORT_HXX_ #define _XMLSCRIPT_XML_IMPORT_HXX_
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/processfactory.hxx>
#include "com/sun/star/xml/input/XRoot.hpp" #include "com/sun/star/xml/input/XRoot.hpp"
#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp" #include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"

2
xmlscript/source/misc/unoservices.cxx
View File

@@ -104,7 +104,7 @@ namespace xmlscript
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL xcr_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlscript_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(

2
xmlscript/util/xcr.component → xmlscript/util/xmlscript.component
View File

@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="xcr" <component loader="com.sun.star.loader.SharedLibrary" prefix="xmlscript"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler"> <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
<service name="com.sun.star.xml.input.SaxDocumentHandler"/> <service name="com.sun.star.xml.input.SaxDocumentHandler"/>