Author: arielch
Date: Wed Apr 24 20:08:24 2013
New Revision: 1471625
URL: http://svn.apache.org/r1471625
Log:
i121872 - Modify service and implementation names to prevent name clashes with
the extension
Modified:
openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component
openoffice/trunk/main/sdext/source/minimizer/basic.txt
openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx
Modified:
openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component?rev=1471625&r1=1471624&r2=1471625&view=diff
==============================================================================
---
openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component
(original)
+++
openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component
Wed Apr 24 20:08:24 2013
@@ -21,8 +21,8 @@
***********************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.PPPOptimizerImp">
- <service name="com.sun.star.comp.PPPOptimizer"/>
+ <implementation name="com.sun.star.comp.presentation.PresentationOptimizer">
+ <service name="com.sun.star.presentation.PresentationOptimizer"/>
</implementation>
<implementation
name="com.sun.star.comp.ui.dialogs.PresentationMinimizerDialog">
<service name="com.sun.star.ui.dialogs.PresentationMinimizerDialog"/>
Modified: openoffice/trunk/main/sdext/source/minimizer/basic.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/basic.txt?rev=1471625&r1=1471624&r2=1471625&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/basic.txt (original)
+++ openoffice/trunk/main/sdext/source/minimizer/basic.txt Wed Apr 24 20:08:24
2013
@@ -101,7 +101,7 @@ oDoc = oDesk.loadComponentFromURL( url,
Dim oInitialization( 0 ) as Object
oInitialization(0) = oDoc.getCurrentController.getFrame
-oPPPOptimizerDialog = createUNOservice("com.sun.star.comp.PPPOptimizerImp")
+oPPPOptimizerDialog =
createUNOservice("com.sun.star.comp.presentation.PresentationOptimizer")
oPPPOptimizerDialog.initialize( oInitialization )
oPPPOptimizerDialog.dispatch(oURL, oArg)
odoc.dispose
Modified: openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx?rev=1471625&r1=1471624&r2=1471625&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx Wed Apr 24
20:08:24 2013
@@ -632,11 +632,15 @@ void OptimizerDialog::actionPerformed( c
Sequence< Any > aArgs( 1 );
aArgs[ 0 ] <<= mxFrame;
- Reference < XDispatch > xDispatch(
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- OUString::createFromAscii(
"com.sun.star.comp.PPPOptimizer" ), aArgs, mxContext ), UNO_QUERY );
+ Reference < XDispatch > xDispatch(
+
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.presentation.PresentationOptimizer"
) ),
+ aArgs, mxContext ),
+ UNO_QUERY );
URL aURL;
- aURL.Protocol = OUString(
RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.PPPOptimizer:" ) );
+ aURL.Protocol = OUString(
RTL_CONSTASCII_USTRINGPARAM(
"vnd.com.sun.star.presentation.PresentationOptimizer:" ) );
aURL.Path = OUString(
RTL_CONSTASCII_USTRINGPARAM( "optimize" ) );
Sequence< PropertyValue > lArguments( 3 );
Modified: openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx?rev=1471625&r1=1471624&r2=1471625&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx Wed Apr 24
20:08:24 2013
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#define SERVICE_NAME "com.sun.star.comp.PPPOptimizer"
+#define SERVICE_NAME "com.sun.star.presentation.PresentationOptimizer"
using namespace ::com::sun::star::uno;
@@ -105,7 +105,8 @@ Reference< com::sun::star::frame::XDispa
const URL& aURL, const ::rtl::OUString& /* aTargetFrameName */,
sal_Int32 /* nSearchFlags */ ) throw( RuntimeException )
{
Reference < XDispatch > xRet;
- if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" )
== 0 )
+ if ( aURL.Protocol.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
+ "vnd.com.sun.star.presentation.PresentationOptimizer:" ) ) )
{
// if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
xRet = this;
@@ -136,9 +137,11 @@ void SAL_CALL PPPOptimizer::dispatch( co
throw( RuntimeException )
{
OSL_TRACE("PPPOptimizer::dispatch");
- if ( mxController.is() && ( rURL.Protocol.compareToAscii(
"vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 ) )
+ if ( mxController.is() && rURL.Protocol.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM(
+ "vnd.com.sun.star.presentation.PresentationOptimizer:" )))
{
- if ( rURL.Path.compareToAscii( "optimize" ) == 0 )
+ if ( rURL.Path.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("optimize") ) )
{
Reference< XModel > xModel( mxController->getModel() );
if ( xModel.is() )
@@ -193,7 +196,7 @@ sal_Int64 PPPOptimizer::GetFileSize( con
OUString PPPOptimizer_getImplementationName()
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM (
"com.sun.star.comp.PPPOptimizerImp" ) );
+ return OUString ( RTL_CONSTASCII_USTRINGPARAM (
"com.sun.star.comp.presentation.PresentationOptimizer" ) );
}
Sequence< OUString > PPPOptimizer_getSupportedServiceNames()
