summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-07-06 21:28:03 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-07-09 14:23:26 +0100
commitae7534f616523bbe5588d98ef2fe4f421ffed728 (patch)
tree9e162ab54bb23bb374dfd8eedf884231f6677e6b
parent0c8190999b5d85d28ded9f1be9613f11427034d2 (diff)
targetted rename xcr -> xmlscript to match includes and module name
-rw-r--r--Repository.mk2
-rw-r--r--basctl/Library_basctl.mk2
-rw-r--r--basic/CppunitTest_basic_enable.mk2
-rw-r--r--basic/CppunitTest_basic_nested_struct.mk2
-rw-r--r--basic/CppunitTest_basic_scanner.mk2
-rw-r--r--basic/Library_sb.mk2
-rw-r--r--dbaccess/Library_dbmm.mk2
-rw-r--r--desktop/Library_deployment.mk2
-rw-r--r--desktop/Library_deploymentmisc.mk2
-rw-r--r--desktop/Pagein_common.mk2
-rw-r--r--filter/Library_msfilter.mk2
-rw-r--r--ios/qa/sc/Makefile2
-rw-r--r--oox/Library_oox.mk2
-rw-r--r--postprocess/packcomponents/makefile.mk2
-rw-r--r--scp2/source/ooo/file_library_ooo.scp4
-rw-r--r--scripting/Library_dlgprov.mk2
-rw-r--r--scripting/source/dlgprov/dlgprov.xml2
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
-rw-r--r--solenv/inc/libs.mk4
-rw-r--r--svx/Library_svx.mk2
-rw-r--r--xmlscript/Library_xmlscript.mk (renamed from xmlscript/Library_xcr.mk)18
-rw-r--r--xmlscript/Module_xmlscript.mk2
-rw-r--r--xmlscript/Package_inc.mk2
-rw-r--r--xmlscript/inc/xmlscript/xcrdllapi.h42
-rw-r--r--xmlscript/inc/xmlscript/xml_helper.hxx10
-rw-r--r--xmlscript/inc/xmlscript/xmldlg_imexp.hxx14
-rw-r--r--xmlscript/inc/xmlscript/xmllib_imexp.hxx14
-rw-r--r--xmlscript/inc/xmlscript/xmlmod_imexp.hxx8
-rw-r--r--xmlscript/inc/xmlscript/xmlscriptdllapi.h33
-rw-r--r--xmlscript/source/inc/xml_import.hxx6
-rw-r--r--xmlscript/source/misc/unoservices.cxx2
-rw-r--r--xmlscript/util/xmlscript.component (renamed from xmlscript/util/xcr.component)2
32 files changed, 94 insertions, 103 deletions
diff --git a/Repository.mk b/Repository.mk
index c897be736cad..3d6f4238b55f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -377,7 +377,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
wpftdraw \
wpftwriter \
writerfilter \
- xcr \
+ xmlscript \
xmlfa \
xmlfd \
xo \
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index fc1e077671c6..c2d23f6dd3de 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
utl \
ucbhelper \
vcl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index e6379c5b209f..5487930dbf55 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
tl \
utl \
vcl \
- xcr \
+ xmlscript \
test \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index 904e666a442d..c8922e824f28 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
tl \
utl \
vcl \
- xcr \
+ xmlscript \
test \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index 21e1a826c73e..e98f1137a453 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
tl \
utl \
vcl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 71c0090c6c4f..2da9870d514c 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
tl \
utl \
vcl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index bb45c275f3d9..393349f93364 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
ucbhelper \
utl \
vcl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 2cde4bae0ce9..3910fb910757 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
tl \
ucbhelper \
utl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 551c6392c918..72ac02bd7c2a 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
tl \
ucbhelper \
utl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 65a2e9427f95..9a82a1c36ac3 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Pagein_add_objects,common,\
$(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \
basegfx \
sot \
- xcr \
+ xmlscript \
sb \
stocservices \
bootstrap \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index ceb7d0a1f5d9..a592fbf9ffeb 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,msfilter,\
vcl \
svl \
sot \
- xcr \
+ xmlscript \
utl \
tl \
comphelper \
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index a554da896810..cab1650e13bb 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
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
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 8a48bdca2efb..5fba3f2ef531 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -73,7 +73,7 @@ $(eval $(call gb_Library_use_libraries,oox,\
utl \
vcl \
xo \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 463fd4b4305d..b70211801a66 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -126,7 +126,7 @@ my_components = \
component/uui/util/uui \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
- component/xmlscript/util/xcr \
+ component/xmlscript/util/xmlscript \
component/xmlsecurity/util/xmlsecurity \
component/xmlsecurity/util/xsec_fw \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 4b9ecb6b6603..ae6692122251 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1407,8 +1407,8 @@ File gid_File_Lib_Vcl
Dir = SCP2_OOO_BIN_DIR;
End
-STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
-STD_LIB_FILE( gid_File_Lib_Xof , xof)
+STD_LIB_FILE( gid_File_Lib_Xcr, xmlscript)
+STD_LIB_FILE( gid_File_Lib_Xof, xof)
File gid_File_Lib_Xo
Name = LIBNAME(xo);
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 93cd94183da0..7e91ed87d391 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\
ucbhelper \
vbahelper \
vcl \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/scripting/source/dlgprov/dlgprov.xml b/scripting/source/dlgprov/dlgprov.xml
index 5175d8f8fb08..4a825427709f 100644
--- a/scripting/source/dlgprov/dlgprov.xml
+++ b/scripting/source/dlgprov/dlgprov.xml
@@ -67,7 +67,7 @@
<project-build-dependency>sal</project-build-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>cppu3</runtime-module-dependency>
<runtime-module-dependency>sal3</runtime-module-dependency>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3bcab1a7debc..7bbf6992316d 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -55,7 +55,7 @@ gb_MERGEDLIBS := \
ucb1 \
ucpfile1 \
uui \
- xcr \
+ xmlscript \
xo \
endif
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 0ea1cc3bee2f..1610786a4064 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -64,7 +64,7 @@ I18NUTILLIB=-li18nutil$(COMID)
I18NISOLANGLIB=-li18nisolang1$(COMID)
I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION)
-XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
+XMLSCRIPTLIB =-lxmlscript$(DLLPOSTFIX)
COMPHELPERLIB=-lcomphelp$(COMID)
CONNECTIVITYLIB=-lconnectivity
LDAPBERLIB=-lldapber
@@ -385,7 +385,7 @@ I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib
I18NREGEXPLIB=ii18nregexp.lib
SALHELPERLIB=isalhelper.lib
-XMLSCRIPTLIB=ixcr.lib
+XMLSCRIPTLIB=ixmlscript.lib
COMPHELPERLIB=icomphelp.lib
CONNECTIVITYLIB=connectivity.lib
LDAPBERLIB=ldapber.lib
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index c84f4d490ddd..0a65c1d15c91 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
utl \
vcl \
xo \
- xcr \
+ xmlscript \
$(gb_STDLIBS) \
))
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xmlscript.mk
index 7bdcf4827ffc..b2f9db46fc87 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -7,15 +7,15 @@
# 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 \
cppu \
cppuhelper \
@@ -23,18 +23,18 @@ $(eval $(call gb_Library_use_libraries,xcr,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_set_include,xcr,\
+$(eval $(call gb_Library_set_include,xmlscript,\
-I$(SRCDIR)/xmlscript/source/inc \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_defs,xcr,\
- -DXCR_DLLIMPLEMENTATION \
+$(eval $(call gb_Library_add_defs,xmlscript,\
+ -DXMLSCRIPT_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_exception_objects,xcr,\
+$(eval $(call gb_Library_add_exception_objects,xmlscript,\
xmlscript/source/misc/unoservices \
xmlscript/source/xml_helper/xml_byteseq \
xmlscript/source/xml_helper/xml_element \
diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
index d1072c73212b..5c74712c5232 100644
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,xmlscript))
$(eval $(call gb_Module_add_targets,xmlscript,\
- Library_xcr \
+ Library_xmlscript \
Package_inc \
))
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
index bb4419c4c615..3be4832f615c 100644
--- a/xmlscript/Package_inc.mk
+++ b/xmlscript/Package_inc.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
# 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/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))
diff --git a/xmlscript/inc/xmlscript/xcrdllapi.h b/xmlscript/inc/xmlscript/xcrdllapi.h
deleted file mode 100644
index 52b71ef5a82e..000000000000
--- a/xmlscript/inc/xmlscript/xcrdllapi.h
+++ /dev/null
@@ -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: */
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 14a6bfae7455..a9374ddcae19 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include "xmlscript/xcrdllapi.h"
+#include "xmlscript/xmlscriptdllapi.h"
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:
@@ -131,14 +131,12 @@ protected:
##################################################################################################*/
-//==================================================================================================
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL createInputStream(
::rtl::ByteSequence const & rInData )
SAL_THROW(());
-//==================================================================================================
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
SAL_CALL createOutputStream(
::rtl::ByteSequence * pOutData )
SAL_THROW(());
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 86b98c13406b..07a22432ce94 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -36,13 +36,12 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include "xmlscript/xmlns.h"
-#include "xmlscript/xcrdllapi.h"
+#include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript
{
-//==============================================================================
-XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
+XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
::com::sun::star::uno::Reference<
@@ -51,8 +50,7 @@ XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::frame::XModel > const & xDocument )
SAL_THROW( (::com::sun::star::uno::Exception) );
-//==============================================================================
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+XMLSCRIPT_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,
@@ -64,8 +62,7 @@ SAL_CALL importDialogModel(
// additional functions for convenience
-//==============================================================================
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
+XMLSCRIPT_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,
@@ -75,8 +72,7 @@ SAL_CALL exportDialogModel(
::com::sun::star::frame::XModel > const & xDocument )
SAL_THROW( (::com::sun::star::uno::Exception) );
-//==============================================================================
-XCR_DLLPUBLIC void SAL_CALL importDialogModel(
+XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > const & xInput,
::com::sun::star::uno::Reference<
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index 9b5aad1318cc..b29f07a5a250 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "xmlscript/xmlns.h"
-#include "xmlscript/xcrdllapi.h"
+#include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript
{
@@ -42,7 +42,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct XCR_DLLPUBLIC LibDescriptor
+struct XMLSCRIPT_DLLPUBLIC LibDescriptor
{
::rtl::OUString aName;
::rtl::OUString aStorageURL;
@@ -53,7 +53,7 @@ struct XCR_DLLPUBLIC LibDescriptor
sal_Bool bPreload;
};
-struct XCR_DLLPUBLIC LibDescriptorArray
+struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray
{
LibDescriptor* mpLibs;
sal_Int32 mnLibCount;
@@ -65,27 +65,27 @@ struct XCR_DLLPUBLIC LibDescriptorArray
};
-XCR_DLLPUBLIC void
+XMLSCRIPT_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) );
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
+XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) );
-XCR_DLLPUBLIC void
+XMLSCRIPT_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) );
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
+XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibrary( LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) );
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index fd2faf14586a..5729e0c2e634 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <xmlscript/xmlns.h>
-#include "xmlscript/xcrdllapi.h"
+#include "xmlscript/xmlscriptdllapi.h"
namespace xmlscript
{
@@ -41,7 +41,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct XCR_DLLPUBLIC ModuleDescriptor
+struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor
{
::rtl::OUString aName;
::rtl::OUString aLanguage;
@@ -49,14 +49,14 @@ struct XCR_DLLPUBLIC ModuleDescriptor
::rtl::OUString aModuleType; // VBA
};
-XCR_DLLPUBLIC void
+XMLSCRIPT_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) );
-XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
+XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importScriptModule( ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) );
diff --git a/xmlscript/inc/xmlscript/xmlscriptdllapi.h b/xmlscript/inc/xmlscript/xmlscriptdllapi.h
new file mode 100644
index 000000000000..b9634d57ee36
--- /dev/null
+++ b/xmlscript/inc/xmlscript/xmlscriptdllapi.h
@@ -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: */
diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx
index f6df8b297e0b..0244201868b6 100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -28,6 +28,12 @@
#if ! defined _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/sax/XExtendedDocumentHandler.hpp"
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 15b20dcea26f..05eaed2eb00e 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -104,7 +104,7 @@ namespace xmlscript
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 )
{
return ::cppu::component_getFactoryHelper(
diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xmlscript.component
index b85d5d7b63d4..f4998464698d 100644
--- a/xmlscript/util/xcr.component
+++ b/xmlscript/util/xmlscript.component
@@ -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">
<implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
<service name="com.sun.star.xml.input.SaxDocumentHandler"/>