i121873 - Modify service and implementation names to prevent name clashes with the extension

5 files changed, 12 insertions, 12 deletions

diff --git a/sdext/source/presenter/Jobs.xcu b/sdext/source/presenter/Jobs.xcu
index 99c830bc53cc..8bdf0ff22a9b 100644
--- a/sdext/source/presenter/Jobs.xcu
+++ b/sdext/source/presenter/Jobs.xcu
@@ -22,9 +22,9 @@
 
 <oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <node oor:name="Jobs">
-        <node oor:name="onDocumentOpenedJob" oor:op="replace">
+        <node oor:name="com.sun.star.presentation.PresenterScreenJob" oor:op="replace">
             <prop oor:name="Service">
-                <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
+                <value>com.sun.star.comp.presentation.PresenterScreenJob</value>
             </prop>
             <prop oor:name="Context">
                 <value>com.sun.star.presentation.PresentationDocument</value>
@@ -34,7 +34,7 @@
     <node oor:name="Events">
         <node oor:name="onDocumentOpened" oor:op="fuse">
             <node oor:name="JobList">
-                <node oor:name="onDocumentOpenedJob" oor:op="replace"/>
+                <node oor:name="com.sun.star.presentation.PresenterScreenJob" oor:op="replace"/>
             </node>
         </node>
     </node>
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index f069d95a98e1..a3c851cbba19 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -56,7 +56,7 @@ using ::rtl::OUString;
 namespace sdext { namespace presenter {
 
 namespace {
-    const static OUString gsProtocol (A2S("vnd.com.sun.star.comp.PresenterScreen:"));
+    const static OUString gsProtocol (A2S("vnd.com.sun.star.presentation.PresenterScreen:"));
 
     class Command
     {
@@ -249,7 +249,7 @@ private:
 
 OUString PresenterProtocolHandler::getImplementationName_static (void)
 {
-    return A2S("vnd.sun.star.sdext.presenter.PresenterProtocolHandler");
+    return A2S("com.sun.star.comp.presentation.PresenterProtocolHandler");
 }
 
 
diff --git a/sdext/source/presenter/PresenterScreen.component b/sdext/source/presenter/PresenterScreen.component
index ce058818c6fd..c7e08cf087e9 100644
--- a/sdext/source/presenter/PresenterScreen.component
+++ b/sdext/source/presenter/PresenterScreen.component
@@ -21,10 +21,10 @@
  ***********************************************************-->
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob">
-    <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
+  <implementation name="com.sun.star.comp.presentation.PresenterScreenJob">
+    <service name="com.sun.star.presentation.PresenterScreenJob"/>
   </implementation>
-  <implementation name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler">
+  <implementation name="com.sun.star.comp.presentation.PresenterProtocolHandler">
     <service name="com.sun.star.frame.ProtocolHandler"/>
   </implementation>
 </component>
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index ebdd2daf53e9..d4f13d76f289 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -104,7 +104,7 @@ namespace {
 
 OUString PresenterScreenJob::getImplementationName_static (void)
 {
-    return A2S("com.sun.star.comp.Draw.framework.PresenterScreenJob");
+    return A2S("com.sun.star.comp.presentation.PresenterScreenJob");
 }
 
 
@@ -113,7 +113,7 @@ OUString PresenterScreenJob::getImplementationName_static (void)
 Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void)
 {
     static const ::rtl::OUString sServiceName(
-        A2S("com.sun.star.drawing.framework.PresenterScreenJob"));
+        A2S("com.sun.star.presentation.PresenterScreenJob"));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sdext/source/presenter/ProtocolHandler.xcu b/sdext/source/presenter/ProtocolHandler.xcu
index 6b9ca6c25b90..82b85ba3023c 100644
--- a/sdext/source/presenter/ProtocolHandler.xcu
+++ b/sdext/source/presenter/ProtocolHandler.xcu
@@ -22,9 +22,9 @@
 
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ProtocolHandler" oor:package="org.openoffice.Office">
   <node oor:name="HandlerSet">
-    <node oor:name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler" oor:op="replace">
+    <node oor:name="com.sun.star.comp.presentation.PresenterProtocolHandler" oor:op="replace">
       <prop oor:name="Protocols">
-        <value>vnd.com.sun.star.comp.PresenterScreen:*</value>
+        <value>vnd.com.sun.star.presentation.PresenterScreen:*</value>
       </prop>
     </node>
   </node>