Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi all,

So, this week I have removed all component_getImplementation methods
but one. I have also prefixed some component_getFactory methods but I
guess I can do that only in modules with gbuild, so there is a lot
more to be done. I have prepared more and hopefully I would be able to
push that in the near future.

Then I was playing with feature/gnumake4 branch. I have learned
something I will need.

I have also prepared some patches to convert modules to gbuild. I
guess I will be working on this next week.
What should I do with patches? Send for review to the list? maybe with [PATCH] ?
Or just push them myself.

Then in scaddins I found two idl files. Can they be addded to offapi
or udkapi? I don't know what's the difference.

And also when converting to new build system I still don't understand
some things. For example with libraries and RepositoryFixes.
And I found commit:
http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?id=f0d67eeeac0c615a928004082a0a7aadc5c03106
Using new build system we want to have libs declared with STD_LIB_FILE ?
I guess I will ask more next time.

About the linking optimization. The libraries we want to merge have to
be built in tail_build ?
If not, that's great and probably we could try to merge some next week ?
But if they have to be there it's not good because we have to convert
a lot of modules to get the right one there.

And Michael, could you please push attached diff ? I think it's last
thing not in master which should be there.

Best regards,
Matus
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index f86fd32..74eb3e8 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -834,7 +834,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
     OUString aActivatorUrl;
     OUString aActivatorName;
     OUString aLocation;
-    OUString aPrefix;
 
     Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
         OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
@@ -850,15 +849,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
             OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) );
         if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
             aLocation = xLocationKey->getAsciiValue();
-
-        Reference<XRegistryKey > xPrefixKey = xImplementationKey->openKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
-        if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
-        {
-            aPrefix = xPrefixKey->getAsciiValue();
-            if( aPrefix.getLength() != 0 )
-                aPrefix = aPrefix + OUSTR("_");
-        }
     }
     else
     {
@@ -893,17 +883,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
         Reference<XInterface > x = xSMgr->createInstance( aActivatorName );
         Reference<XImplementationLoader > xLoader( x, UNO_QUERY );
         Reference<XInterface > xMF;
-        if( aActivatorName == OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) )
-        {
-            try
-            {
-                return loadSharedLibComponentFactory( bootstrap_expandUri( aLocation ), 
OUString(),  aImplementationName, xSMgr, xImplementationKey, aPrefix );
-            }
-            catch ( IllegalArgumentException & e )
-            {
-                throw RuntimeException( e.Message, e.Context );
-            }
-        }
         if (xLoader.is())
         {
             xFactory = xLoader->activate( aImplementationName, aActivatorUrl, aLocation, 
xImplementationKey );
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 9c27a1f..34c79b1 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -209,7 +209,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
         if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
         {
-            Reference<XRegistryKey > xPrefixKey = xActivatorKey->openKey(
+            Reference<XRegistryKey > xPrefixKey = xKey->openKey(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
             if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
             {

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.