mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove odd service names (that duplicate type names)

Browse Source 
Looks like no code instantiated these via those odd service names (except for
ProgressMonitor/StatusIndicator instantiating ProgressBar via odd
"com.sun.star.awt.XProgressBar" service name until that got cleaned up in the
previous commit).

Also looks like no code instantiates them via their implementation names either
(in which case ProgressBar/ProgressMonitor/StatusIndicator would be dead code),
but maybe there is code that dynamically constructs those implemenation names
and calls creeateInstance on them?  So best leave the implementations in for
now...

Change-Id: I20b92345e343b1f776387f63d9b02a5b0a47fe21
This commit is contained in:
Stephan Bergmann
2013-12-19 17:55:49 +01:00
parent f8db395a8a
commit 2dde51e172
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UnoControls/source/controls/progressbar.cxx
View File

@@ -339,9 +339,7 @@ Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeExcept
const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames( 1 );
seqServiceNames[0] = "com.sun.star.awt.XProgressBar";
return seqServiceNames ;
return css::uno::Sequence<OUString>();
}
//____________________________________________________________________________________________________________

4
UnoControls/source/controls/progressmonitor.cxx
View File

@@ -628,9 +628,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames( 1 );
seqServiceNames[0] = "com.sun.star.awt.XProgressMonitor";
return seqServiceNames ;
return css::uno::Sequence<OUString>();
}
//____________________________________________________________________________________________________________

4
UnoControls/source/controls/statusindicator.cxx
View File

@@ -400,9 +400,7 @@ void SAL_CALL StatusIndicator::setPosSize (
const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames( 1 );
seqServiceNames[0] = "com.sun.star.task.XStatusIndicator";
return seqServiceNames ;
return css::uno::Sequence<OUString>();
}
//____________________________________________________________________________________________________________

12
UnoControls/util/ctl.component
View File

@@ -22,13 +22,7 @@
<implementation name="stardiv.UnoControls.FrameControl">
<service name="com.sun.star.frame.FrameControl"/>
</implementation>
<implementation name="stardiv.UnoControls.ProgressBar">
<service name="com.sun.star.awt.XProgressBar"/>
</implementation>
<implementation name="stardiv.UnoControls.ProgressMonitor">
<service name="com.sun.star.awt.XProgressMonitor"/>
</implementation>
<implementation name="stardiv.UnoControls.StatusIndicator">
<service name="com.sun.star.task.XStatusIndicator"/>
</implementation>
<implementation name="stardiv.UnoControls.ProgressBar"/>
<implementation name="stardiv.UnoControls.ProgressMonitor"/>
<implementation name="stardiv.UnoControls.StatusIndicator"/>
</component>