codemaker/source/cppumaker/cpputype.cxx | 31 ++---------------------
include/osl/detail/component-defines.h | 42 --------------------------------
2 files changed, 3 insertions(+), 70 deletions(-)
New commits:
commit e382caf3c9cf72d6fda41ef0e29975fc92b9abd7
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jan 8 11:44:23 2014 +0200
Revert "WIP: Direct service ctor calls at least on Android/iOS"
This reverts commit 15abebbde560e17413f17b16b8b2e9c1f31f01a5.
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 4bd7a98..c0065d0 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3408,17 +3408,6 @@ void ServiceType::dumpHxxFile(
OUString headerDefine(dumpHeaderDefine(o, "HPP"));
o << "\n";
includes.dump(o, 0);
- if (!entity_->getConstructors().empty()) {
- o << ("\n#if defined ANDROID || defined IOS //TODO\n"
- "#include <osl/detail/component-defines.h>\n#endif\n\n"
- "#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_")
- << name_.replaceAll(".", "_dot_")
- << " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
- << name_.replaceAll(".", "_dot_") << ") && defined LO_URE_CTOR_FUN_"
- << name_.replaceAll(".", "_dot_")
- << "\nextern \"C\" void * SAL_CALL LO_URE_CTOR_FUN_"
- << name_.replaceAll(".", "_dot_") << "(void *, void *);\n#endif\n";
- }
o << "\n";
if (codemaker::cppumaker::dumpNamespaceOpen(o, name_, false)) {
o << "\n";
@@ -3447,28 +3436,14 @@ void ServiceType::dumpHxxFile(
<< "::css::uno::Reference< " << scopedBaseName
<< " > the_instance;\n" << indent() << "try {\n";
inc();
- o << ("#if defined LO_URE_CURRENT_ENV && defined "
- "LO_URE_CTOR_ENV_")
- << name_.replaceAll(".", "_dot_")
- << " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
- << name_.replaceAll(".", "_dot_")
- << ") && defined LO_URE_CTOR_FUN_"
- << name_.replaceAll(".", "_dot_") << "\n" << indent()
- << "the_instance = ::css::uno::Reference< " << scopedBaseName
- << (" >(::css::uno::Reference< ::css::uno::XInterface >("
- "static_cast< ::css::uno::XInterface * >((*"
- "LO_URE_CTOR_FUN_")
- << name_.replaceAll(".", "_dot_")
- << (")(the_context.get(), ::css::uno::Sequence<"
- " ::css::uno::Any >().get())), ::SAL_NO_ACQUIRE),"
- " ::css::uno::UNO_QUERY);\n#else\n")
- << indent() << "the_instance = ::css::uno::Reference< "
+ o << indent()
+ << "the_instance = ::css::uno::Reference< "
<< scopedBaseName
<< (" >(the_context->getServiceManager()->"
"createInstanceWithContext(::rtl::OUString("
" \"")
<< name_
- << "\" ), the_context), ::css::uno::UNO_QUERY);\n#endif\n";
+ << "\" ), the_context), ::css::uno::UNO_QUERY);\n";
dec();
o << indent()
<< "} catch (const ::css::uno::RuntimeException &) {\n";
diff --git a/include/osl/detail/component-defines.h
b/include/osl/detail/component-defines.h
deleted file mode 100644
index 63893ea..0000000
--- a/include/osl/detail/component-defines.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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/.
- */
-
-#ifndef INCLUDED_OSL_DETAIL_COMPONENT_DEFINES_H
-#define INCLUDED_OSL_DETAIL_COMPONENT_DEFINES_H
-
-/* Experimental direct constructor calls, under construction */
-
-#define LO_URE_CURRENT_ENV 1 /*TODO*/
-
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
com_sun_star_comp_extensions_xml_sax_FastParser
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
com_sun_star_comp_extensions_xml_sax_ParserExpat
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 1
/*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader
com_sun_star_comp_stoc_DLLComponentLoader
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
com_sun_star_comp_stoc_ImplementationRegistration
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry 1
/*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry
com_sun_star_comp_stoc_NestedRegistry
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
com_sun_star_comp_stoc_ORegistryServiceManager
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager 1
/*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager
com_sun_star_comp_stoc_OServiceManager
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
com_sun_star_comp_stoc_OServiceManagerWrapper
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry 1
/*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry
com_sun_star_comp_stoc_SimpleRegistry
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer
com_sun_star_extensions_xml_sax_Writer
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
com_sun_star_security_comp_stoc_AccessController
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
com_sun_star_security_comp_stoc_FilePolicy
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bf49675de8d1aa56ef09b7b0335f7bd04c455075
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jan 8 11:43:50 2014 +0200
Revert "Thinko: The macros must be based on service instead of
implementation names"
This reverts commit be58acfe2b8bc453b1b8b10bd6349599730d0d78.
diff --git a/include/osl/detail/component-defines.h
b/include/osl/detail/component-defines.h
index da6856f..63893ea 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -14,28 +14,30 @@
#define LO_URE_CURRENT_ENV 1 /*TODO*/
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_lang_dot_RegistryServiceManager 1
/*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_lang_dot_RegistryServiceManager
com_sun_star_comp_stoc_ORegistryServiceManager
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_lang_dot_ServiceManager 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_lang_dot_ServiceManager
com_sun_star_comp_stoc_OServiceManager
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_loader_dot_SharedLibrary 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_loader_dot_SharedLibrary
com_sun_star_comp_stoc_DLLComponentLoader
-#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_ImplementationRegistration
1 /*TODO*/
-#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_ImplementationRegistration
com_sun_star_comp_stoc_ImplementationRegistration
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_NestedRegistry 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_NestedRegistry
com_sun_star_comp_stoc_NestedRegistry
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_registry_dot_SimpleRegistry 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_registry_dot_SimpleRegistry
com_sun_star_comp_stoc_SimpleRegistry
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_AccessController
1 /*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_AccessController
com_sun_star_security_comp_stoc_AccessController
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_Policy 1 /*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_Policy
com_sun_star_security_comp_stoc_FilePolicy
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser
com_sun_star_comp_extensions_xml_sax_FastParser
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser
com_sun_star_comp_extensions_xml_sax_ParserExpat
-#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Writer 1
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Writer
com_sun_star_extensions_xml_sax_Writer
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_FastParser
com_sun_star_comp_extensions_xml_sax_FastParser
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_extensions_dot_xml_dot_sax_dot_ParserExpat
com_sun_star_comp_extensions_xml_sax_ParserExpat
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader 1
/*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_DLLComponentLoader
com_sun_star_comp_stoc_DLLComponentLoader
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ImplementationRegistration
com_sun_star_comp_stoc_ImplementationRegistration
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry 1
/*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_NestedRegistry
com_sun_star_comp_stoc_NestedRegistry
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_ORegistryServiceManager
com_sun_star_comp_stoc_ORegistryServiceManager
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager 1
/*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManager
com_sun_star_comp_stoc_OServiceManager
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_OServiceManagerWrapper
com_sun_star_comp_stoc_OServiceManagerWrapper
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry 1
/*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_comp_dot_stoc_dot_SimpleRegistry
com_sun_star_comp_stoc_SimpleRegistry
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_extensions_dot_xml_dot_sax_dot_Writer
com_sun_star_extensions_xml_sax_Writer
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_AccessController
com_sun_star_security_comp_stoc_AccessController
+#define
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
1 /*TODO*/
+#define
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_security_dot_comp_dot_stoc_dot_FilePolicy
com_sun_star_security_comp_stoc_FilePolicy
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
