chart2/source/model/main/Wall.cxx | 13 -------------
chart2/source/model/main/Wall.hxx | 14 --------------
connectivity/source/commontools/paramwrapper.cxx | 17 ++++++++++++++++-
3 files changed, 16 insertions(+), 28 deletions(-)
New commits:
commit d7f3b1effb63aab91d993209784ef5678752fea8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 28 12:14:37 2014 +0100
chart::Wall is not a UNO service implementation
Change-Id: I6a5482f4d49e47d1a6289a29d1b573e25fa0b5c5
diff --git a/chart2/source/model/main/Wall.cxx
b/chart2/source/model/main/Wall.cxx
index 9b76ea8..d7eeeb2 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -46,8 +46,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Wall" );
-
struct StaticWallDefaults_Initializer
{
::chart::tPropertyValueMap* operator()()
@@ -217,17 +215,6 @@ void Wall::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast<
uno::XWeak* >( this )));
}
-uno::Sequence< OUString > Wall::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.chart2.Wall";
- aServices[ 1 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Wall, lcl_aServiceName );
-
using impl::Wall_Base;
IMPLEMENT_FORWARD_XINTERFACE2( Wall, Wall_Base, ::property::OPropertySet )
diff --git a/chart2/source/model/main/Wall.hxx
b/chart2/source/model/main/Wall.hxx
index 18dec38..c6a847e 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -52,20 +52,6 @@ public:
Wall();
virtual ~Wall();
- //TODO: are these actually used (given they are not SAL_OVERRIDE)?
- virtual OUString SAL_CALL
- getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
commit 01cc916fa45081bfb99933ca8f56d7e444a1ae82
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 28 12:13:46 2014 +0100
Forgot to extend queryInterface
...in 8b533d84f3ae211fdfafc2adc8d8567f366771d4 "Missing XTypeProvider base
class."
Change-Id: I477e47f2a383caab225f55ea1c46094946971b86
diff --git a/connectivity/source/commontools/paramwrapper.cxx
b/connectivity/source/commontools/paramwrapper.cxx
index 9c4af0e..60c3ef8 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -98,7 +98,22 @@ namespace param
}
- IMPLEMENT_FORWARD_XINTERFACE2( ParameterWrapper, UnoBase, PropertyBase )
+ IMPLEMENT_FORWARD_REFCOUNT( ParameterWrapper, UnoBase )
+
+ css::uno::Any ParameterWrapper::queryInterface(css::uno::Type const &
aType)
+ throw (css::uno::RuntimeException, std::exception)
+ {
+ css::uno::Any a(UnoBase::queryInterface(aType));
+ if (!a.hasValue()) {
+ a = PropertyBase::queryInterface(aType);
+ if (!a.hasValue()
+ && aType == cppu::UnoType<css::lang::XTypeProvider>::get())
+ {
+ a <<= css::uno::Reference<css::lang::XTypeProvider>(this);
+ }
+ }
+ return a;
+ }
Sequence< Type > SAL_CALL ParameterWrapper::getTypes( )
throw(RuntimeException, std::exception)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
