[Libreoffice-commits] .: Branch 'libreoffice-3-4' - embeddedobj/source fpicker/prj framework/source

[Michael Meeks]

 embeddedobj/source/msole/oleregister.cxx |   36 -------------------------------
 fpicker/prj/d.lst                        |    8 ------
 framework/source/lomenubar/exports.cxx   |   25 ---------------------
 3 files changed, 1 insertion(+), 68 deletions(-)

New commits:
commit a68c2e840eefd250fa495dba359e833e3c57c977
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Apr 1 22:33:13 2011 +0100

    remove obsolete component_writeInfo methods

diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 72616c3..184f31c 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -84,42 +84,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
     return pRet;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
-                                        OleEmbeddedObjectFactory::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-            uno::Sequence< ::rtl::OUString > rServices = OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-                xNewKey->createKey( rServices.getConstArray()[ind] );
-
-#ifdef WNT
-        // the following service makes sence only on windows
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
-                                        MSOLEDialogObjectCreator::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-            rServices = MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-                xNewKey->createKey( rServices.getConstArray()[ind] );
-#endif
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_FAIL( "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 } // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index f16a913..ca6317e 100644
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -10,10 +10,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 
 ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
-..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
-..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
-..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
-..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
-..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
-..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
+..\%__SRC%\misc\*.component %_DEST%\xml%_EXT%\*.component
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index 6782167..ea93339 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -53,37 +53,12 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >&
 
 extern "C"
 {
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
                                                                                  uno_Environment** /*ppEnv*/        )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*pServiceManager*/,
-                                                            void* pRegistryKey   )
-{
-    if (!pRegistryKey)
-        return sal_False;
-
-    try
-    {
-        css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
-        writeInfo( xKey, DESKTOPJOB_IMPLEMENTATION_NAME, DESKTOPJOB_SERVICE_NAME);
-        writeInfo( xKey, FRAMEJOB_IMPLEMENTATION_NAME, FRAMEJOB_SERVICE_NAME);
-        
-        return sal_True;
-    }
-    catch(const css::registry::InvalidRegistryException&)
-        { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-
-    return sal_False;
-}
-
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName      ,
                                                                 void*     pServiceManager,
                                                                 void*     /*pRegistryKey*/  )