Author: arielch
Date: Wed Apr 24 20:08:34 2013
New Revision: 1471626
URL: http://svn.apache.org/r1471626
Log:
i121873 - Modify service and implementation names to prevent name clashes with
the extension
Modified:
openoffice/trunk/main/sdext/source/presenter/Jobs.xcu
openoffice/trunk/main/sdext/source/presenter/PresenterProtocolHandler.cxx
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component
openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx
openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu
Modified: openoffice/trunk/main/sdext/source/presenter/Jobs.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/Jobs.xcu?rev=1471626&r1=1471625&r2=1471626&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/Jobs.xcu (original)
+++ openoffice/trunk/main/sdext/source/presenter/Jobs.xcu Wed Apr 24 20:08:34
2013
@@ -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>
Modified:
openoffice/trunk/main/sdext/source/presenter/PresenterProtocolHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterProtocolHandler.cxx?rev=1471626&r1=1471625&r2=1471626&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterProtocolHandler.cxx
(original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterProtocolHandler.cxx
Wed Apr 24 20:08:34 2013
@@ -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");
}
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component?rev=1471626&r1=1471625&r2=1471626&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component
(original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.component Wed
Apr 24 20:08:34 2013
@@ -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>
Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx?rev=1471626&r1=1471625&r2=1471626&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx (original)
+++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx Wed Apr 24
20:08:34 2013
@@ -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::getImplemen
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);
}
Modified: openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu?rev=1471626&r1=1471625&r2=1471626&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu (original)
+++ openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu Wed Apr 24
20:08:34 2013
@@ -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>
