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

12 files changed, 72 insertions, 81 deletions

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"/>