summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-12-19 17:55:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-12-19 18:00:36 +0100
commit2dde51e17288e7fecd4fad0d9a69fffc465f536b (patch)
tree85a3f840de814afbbb9904245e58afef9fc260de
parentf8db395a8a2ad89802a52c68c428a6d0d6bd5476 (diff)
Remove odd service names (that duplicate type names)
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
-rw-r--r--UnoControls/source/controls/progressbar.cxx4
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx4
-rw-r--r--UnoControls/source/controls/statusindicator.cxx4
-rw-r--r--UnoControls/util/ctl.component12
4 files changed, 6 insertions, 18 deletions
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 5b3695686b8a..aebf0f3e95a3 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -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>();
}
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index b87dba92ba5a..ae1c2b91d737 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -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>();
}
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index bc1ae5924ddb..03f0a3bd5985 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -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>();
}
//____________________________________________________________________________________________________________
diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component
index ce23fcea887b..3c0437d966b5 100644
--- a/UnoControls/util/ctl.component
+++ b/UnoControls/util/ctl.component
@@ -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>