[Libreoffice-commits] core.git: extensions/source
Caolán McNamara
caolanm at redhat.com
Thu Apr 30 07:56:35 PDT 2015
extensions/source/dbpilots/unoautopilot.hxx | 83 +++++++++++++++----
extensions/source/dbpilots/unoautopilot.inl | 119 ----------------------------
2 files changed, 65 insertions(+), 137 deletions(-)
New commits:
commit b12c5d06889538c9b49e18a96fb541171670b17e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 30 15:54:22 2015 +0100
reorg this template to see if coverity can parse then
Change-Id: Iaa6f353fb4819bc238f2a914303feb162e7f4eba
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 0e669ef..a7678c1 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -31,9 +31,6 @@
namespace dbp
{
-
-
-
//= IServiceInfo
/** interface for the SERVICEINFO template parameter of the OUnoAutoPilot class
@@ -56,7 +53,11 @@ namespace dbp
,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > >
,public OModuleResourceClient
{
- OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
+ OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB)
+ : OUnoAutoPilot_Base(_rxORB)
+ {
+ }
+
protected:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
@@ -64,34 +65,80 @@ namespace dbp
public:
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ return css::uno::Sequence<sal_Int8>();
+ }
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ return getImplementationName_Static();
+ }
+
+ virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ return getSupportedServiceNames_Static();
+ }
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException );
- static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException )
+ {
+ return SERVICEINFO().getServiceNames();
+ }
+
+ static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException )
+ {
+ return SERVICEINFO().getImplementationName();
+ }
+
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);
+ SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
+ {
+ return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) ));
+ }
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+ return xInfo;
+ }
+
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE
+ {
+ return *const_cast<OUnoAutoPilot*>(this)->getArrayHelper();
+ }
// OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE
+ {
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps;
+ describeProperties(aProps);
+ return new ::cppu::OPropertyArrayHelper(aProps);
+ }
protected:
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
- virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
+ virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE
+ {
+ return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext);
+ }
+
+ virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE
+ {
+ ::com::sun::star::beans::PropertyValue aArgument;
+ if (_rValue >>= aArgument)
+ if (aArgument.Name == "ObjectModel")
+ {
+ aArgument.Value >>= m_xObjectModel;
+ return;
+ }
+
+ OUnoAutoPilot_Base::implInitialize(_rValue);
+ }
};
-#include "unoautopilot.inl"
-
-
} // namespace dbp
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
deleted file mode 100644
index c49a788..0000000
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// no include protection
-// this file is included from unoautopilot.hxx directly
-
-
-//= OUnoAutoPilot
-
-template <class TYPE, class SERVICEINFO>
-OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB)
- :OUnoAutoPilot_Base(_rxORB)
-{
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
-{
- return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::rtl::OUString SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
- return getImplementationName_Static();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::rtl::OUString OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationName_Static() throw(::com::sun::star::uno::RuntimeException)
-{
- return SERVICEINFO().getImplementationName();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::comphelper::StringSequence SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
- return getSupportedServiceNames_Static();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::comphelper::StringSequence OUnoAutoPilot<TYPE, SERVICEINFO>::getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException)
-{
- return SERVICEINFO().getServiceNames();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::cppu::IPropertyArrayHelper& OUnoAutoPilot<TYPE, SERVICEINFO>::getInfoHelper()
-{
- return *const_cast<OUnoAutoPilot*>(this)->getArrayHelper();
-}
-
-
-template <class TYPE, class SERVICEINFO>
-::cppu::IPropertyArrayHelper* OUnoAutoPilot<TYPE, SERVICEINFO>::createArrayHelper( ) const
-{
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps;
- describeProperties(aProps);
- return new ::cppu::OPropertyArrayHelper(aProps);
-}
-
-
-template <class TYPE, class SERVICEINFO>
-VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(vcl::Window* _pParent)
-{
- return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext);
-}
-
-
-template <class TYPE, class SERVICEINFO>
-void OUnoAutoPilot<TYPE, SERVICEINFO>::implInitialize(const com::sun::star::uno::Any& _rValue)
-{
- ::com::sun::star::beans::PropertyValue aArgument;
- if (_rValue >>= aArgument)
- if (aArgument.Name == "ObjectModel")
- {
- aArgument.Value >>= m_xObjectModel;
- return;
- }
-
- OUnoAutoPilot_Base::implInitialize(_rValue);
-}
-
-
More information about the Libreoffice-commits
mailing list