convert presenter console to passive registration

3 files changed, 12 insertions, 38 deletions

diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index c95e82805e1f..515baf3648f9 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -42,42 +42,6 @@ using namespace ::com::sun::star::registry;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-        SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
-    {
-        if (pRegistryKey)
-        {
-            try
-            {
-                Reference< XRegistryKey >   xNewKey;
-                sal_Int32                   nPos;
-
-                xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizer_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-                const Sequence< OUString > & rSNL1 = PPPOptimizer_getSupportedServiceNames();
-                const OUString * pArray1 = rSNL1.getConstArray();
-                for ( nPos = rSNL1.getLength(); nPos--; )
-                    xNewKey->createKey( pArray1[nPos] );
-
-                xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-                const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames();
-                const OUString * pArray2 = rSNL2.getConstArray();
-                for ( nPos = rSNL2.getLength(); nPos--; )
-                    xNewKey->createKey( pArray2[nPos] );
-
-                return sal_True;
-            }
-            catch (InvalidRegistryException &)
-            {
-                OSL_FAIL( "### InvalidRegistryException!" );
-            }
-        }
-        return sal_False;
-    }
-
-    // -------------------------------------------------------------------------
-
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
         const sal_Char * pImplName, void * pServiceManager,
         SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
index e1d1e2bde90f..705ac2cdd0f5 100644
--- a/sdext/source/presenter/manifest.xml
+++ b/sdext/source/presenter/manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-    manifest:full-path="PresenterScreen.uno@SHARED_EXTENSION@"/>
+    <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+    manifest:full-path="components.rdb"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
     manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component
new file mode 100644
index 000000000000..4dfd7cc403e4
--- /dev/null
+++ b/sdext/source/presenter/presenter.component
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<component xmlns="http://openoffice.org/2010/uno-components"
+        loader="com.sun.star.loader.SharedLibrary">
+    <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob">
+        <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
+    </implementation>
+    <implementation name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler">
+        <service name="com.sun.star.frame.ProtocolHandler"/>
+    </implementation>
+</component>