summaryrefslogtreecommitdiff
path: root/UnoControls
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls')
-rw-r--r--UnoControls/inc/basecontrol.hxx8
-rw-r--r--UnoControls/inc/multiplexer.hxx2
-rw-r--r--UnoControls/source/base/basecontrol.cxx25
-rw-r--r--UnoControls/source/base/multiplexer.cxx7
-rw-r--r--UnoControls/source/controls/OConnectionPointContainerHelper.cxx10
-rw-r--r--UnoControls/source/inc/OConnectionPointContainerHelper.hxx18
6 files changed, 10 insertions, 60 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 19eaa52e97e4..303508597304 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -515,17 +515,17 @@ protected:
/**_______________________________________________________________________________________________________
*/
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > impl_getComponentContext();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > impl_getComponentContext() { return m_xComponentContext;}
/**_______________________________________________________________________________________________________
*/
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow() { return m_xPeerWindow;}
/**_______________________________________________________________________________________________________
*/
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer();
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer() { return m_xGraphicsPeer;}
/**_______________________________________________________________________________________________________
*/
@@ -559,7 +559,7 @@ protected:
/**_______________________________________________________________________________________________________
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator();
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator() { return m_xDelegator;}
// private methods
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 79414840a160..90e53ef67880 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -133,7 +133,7 @@ public:
/**_______________________________________________________________________________________________________
*/
- operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const;
+ operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const { return ((OWeakObject*)this);}
/**_______________________________________________________________________________________________________
*/
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 2503b1f41a9d..0a6cb89f05f4 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -716,27 +716,6 @@ const OUString BaseControl::impl_getStaticImplementationName()
// protected method
-const Reference< XComponentContext > BaseControl::impl_getComponentContext()
-{
- return m_xComponentContext;
-}
-
-// protected method
-
-const Reference< XWindow > BaseControl::impl_getPeerWindow()
-{
- return m_xPeerWindow;
-}
-
-// protected method
-
-const Reference< XGraphics > BaseControl::impl_getGraphicsPeer()
-{
- return m_xGraphicsPeer;
-}
-
-// protected method
-
WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
{
// - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
@@ -776,10 +755,6 @@ void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
// protected method
-Reference< XInterface > BaseControl::impl_getDelegator()
-{
- return m_xDelegator;
-}
// private method
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 86e551ad3673..902428017f3b 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -144,13 +144,6 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
OWeakObject::release();
}
-// operator
-
-OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
-{
- return ((OWeakObject*)this);
-}
-
// container method
void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index d18ed4bc7452..a952c9543cd4 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -135,16 +135,6 @@ void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type&
m_aMultiTypeContainer.removeInterface( aType, xListener );
}
-// public but impl method!
-// Is necessary to get container member at OConnectionPoint-instance.
-
-OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer()
-{
- // Impl methods are not threadsafe!
- // "Parent" function must do this.
- return m_aMultiTypeContainer;
-}
-
} // namespace unocontrols
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 3abb4f846e97..ec2154c3c8c3 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -178,20 +178,12 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- /**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ // public but impl method!
+ // Is necessary to get container member at OConnectionPoint-instance.
+ // Impl methods are not threadsafe!
+ // "Parent" function must do this.
+ ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer() { return m_aMultiTypeContainer; }
- ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
// private variables