[Libreoffice-commits] core.git: 3 commits - include/sal ure/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 29 06:09:12 PDT 2013
include/sal/log-areas.dox | 1
ure/source/uretest/Makefile | 2 -
ure/source/uretest/Makefile.pln | 2 -
ure/source/uretest/cppmain.cc | 79 +++++++++++++++++++++++++++-------------
4 files changed, 56 insertions(+), 28 deletions(-)
New commits:
commit 99e94cdd6566c8235a389463cd0113b388183ab8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 29 15:07:20 2013 +0200
Use new-style service ctors where possible
Change-Id: I36c62fc677de70c08d0d59e45debc6a86375d3b7
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index bf200e2..e7bd38b 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -142,7 +142,7 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \
out.sdk/cpputypes.cppumaker.flag: | out.sdk
$(CPPUMAKER) -O./out.sdk/include/cpputypes \
- "-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander" \
+ "-Tcom.sun.star.beans.Introspection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.DeploymentException;com.sun.star.un
o.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander" \
"$(URE_TYPES)"
touch $@
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index ac11d2a..3c4a3ab 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -122,7 +122,7 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
- '-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander' \
+ '-Tcom.sun.star.beans.Introspection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.DeploymentException;com.sun.star.un
o.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \
$(URE_HOME)/share/misc/types.rdb
touch $@
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 4de525e..2759356 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -23,13 +23,35 @@
#include <memory>
#include <new>
+#include "com/sun/star/beans/Introspection.hpp"
+#include "com/sun/star/bridge/BridgeFactory.hpp"
+#include "com/sun/star/bridge/UnoUrlResolver.hpp"
+#include "com/sun/star/connection/Acceptor.hpp"
+#include "com/sun/star/connection/Connector.hpp"
+#include "com/sun/star/io/Pipe.hpp"
+#include "com/sun/star/io/TextInputStream.hpp"
+#include "com/sun/star/io/TextOutputStream.hpp"
+#include "com/sun/star/java/JavaVirtualMachine.hpp"
#include "com/sun/star/lang/XMain.hpp"
+#include "com/sun/star/loader/Java.hpp"
+#include "com/sun/star/loader/SharedLibrary.hpp"
+#include "com/sun/star/reflection/ProxyFactory.hpp"
+#include "com/sun/star/registry/ImplementationRegistration.hpp"
+#include "com/sun/star/registry/SimpleRegistry.hpp"
+#include "com/sun/star/script/Converter.hpp"
+#include "com/sun/star/script/Invocation.hpp"
+#include "com/sun/star/security/AccessController.hpp"
+#include "com/sun/star/security/Policy.hpp"
#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/NamingService.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uri/ExternalUriReferenceTranslator.hpp"
+#include "com/sun/star/uri/UriReferenceFactory.hpp"
+#include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
#include "com/sun/star/util/theMacroExpander.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
@@ -88,42 +110,19 @@ private:
std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(rtl::OUString()));
} catch (rtl::MalformedUriException &) {}
static char const * const services[] = {
- "com.sun.star.beans.Introspection",
- "com.sun.star.bridge.BridgeFactory",
- "com.sun.star.bridge.UnoUrlResolver",
- "com.sun.star.connection.Acceptor",
- "com.sun.star.connection.Connector",
"com.sun.star.io.DataInputStream",
"com.sun.star.io.DataOutputStream",
"com.sun.star.io.MarkableInputStream",
"com.sun.star.io.MarkableOutputStream",
"com.sun.star.io.ObjectInputStream",
"com.sun.star.io.ObjectOutputStream",
- "com.sun.star.io.Pipe",
"com.sun.star.io.Pump",
- "com.sun.star.io.TextInputStream",
- "com.sun.star.io.TextOutputStream",
- "com.sun.star.java.JavaVirtualMachine",
"com.sun.star.lang.RegistryServiceManager",
"com.sun.star.lang.ServiceManager",
- "com.sun.star.loader.Java",
- "com.sun.star.loader.Java2",
- "com.sun.star.loader.SharedLibrary",
"com.sun.star.reflection.CoreReflection",
- "com.sun.star.reflection.ProxyFactory",
- "com.sun.star.registry.ImplementationRegistration",
"com.sun.star.registry.NestedRegistry",
- "com.sun.star.registry.SimpleRegistry",
- "com.sun.star.script.Converter",
- "com.sun.star.script.Invocation",
"com.sun.star.script.InvocationAdapterFactory",
- "com.sun.star.security.AccessController",
- "com.sun.star.security.Policy",
- "com.sun.star.uno.NamingService",
- "com.sun.star.uri.ExternalUriReferenceTranslator",
- "com.sun.star.uri.UriReferenceFactory",
- "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript",
- "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"
+ "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"
};
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
@@ -144,6 +143,28 @@ private:
static_cast< ::cppu::OWeakObject * >(this));
}
}
+ css::beans::Introspection::create(context_);
+ css::bridge::BridgeFactory::create(context_);
+ css::bridge::UnoUrlResolver::create(context_);
+ css::connection::Acceptor::create(context_);
+ css::connection::Connector::create(context_);
+ css::io::Pipe::create(context_);
+ css::io::TextInputStream::create(context_);
+ css::io::TextOutputStream::create(context_);
+ css::java::JavaVirtualMachine::create(context_);
+ css::loader::Java::create(context_);
+ css::loader::SharedLibrary::create(context_);
+ css::reflection::ProxyFactory::create(context_);
+ css::registry::ImplementationRegistration::create(context_);
+ css::registry::SimpleRegistry::create(context_);
+ css::script::Converter::create(context_);
+ css::script::Invocation::create(context_);
+ css::security::AccessController::create(context_);
+ css::security::Policy::create(context_);
+ css::uno::NamingService::create(context_);
+ css::uri::ExternalUriReferenceTranslator::create(context_);
+ css::uri::UriReferenceFactory::create(context_);
+ css::uri::VndSunStarPkgUrlReferenceFactory::create(context_);
static char const * const singletons[] = {
"com.sun.star.reflection.theTypeDescriptionManager"
};
commit 01c934acbe89859b57302c8036147ca31b268610
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 29 14:42:13 2013 +0200
Check for theTypeDescriptionManager singleton
...rather than a TypeDescriptionManager service that is no longer available.
Change-Id: I1054ab0a658597a60d11e2f9aa0960df25d14bc4
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 331598e..4de525e 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -111,7 +111,6 @@ private:
"com.sun.star.loader.SharedLibrary",
"com.sun.star.reflection.CoreReflection",
"com.sun.star.reflection.ProxyFactory",
- "com.sun.star.reflection.TypeDescriptionManager",
"com.sun.star.registry.ImplementationRegistration",
"com.sun.star.registry.NestedRegistry",
"com.sun.star.registry.SimpleRegistry",
@@ -145,6 +144,15 @@ private:
static_cast< ::cppu::OWeakObject * >(this));
}
}
+ static char const * const singletons[] = {
+ "com.sun.star.reflection.theTypeDescriptionManager"
+ };
+ for (std::size_t i = 0; i != SAL_N_ELEMENTS(singletons); ++i) {
+ css::uno::Reference< css::uno::XInterface > instance(
+ context_->getValueByName(
+ "/singletons/" + rtl::OUString::createFromAscii(singletons[i])),
+ css::uno::UNO_QUERY_THROW);
+ }
css::util::theMacroExpander::get(context_);
test(
::test::types::CppTest::create(context_),
commit ae7fd476ea12bd78dd0ad16649d538aa0543bf56
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 29 14:34:06 2013 +0200
stoc.tdmanager is gone
Change-Id: I7c750debaeee5d9804be378e0f65bec13ac296eb
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d21f143..44549e7 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -247,7 +247,6 @@ certain functionality.
@section stoc
@li @c stoc.corerefl - CoreReflection
- at li @c stoc.tdmanager - TypeDescriptionManager
@section svl
More information about the Libreoffice-commits
mailing list