[Libreoffice-commits] core.git: scripting/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 14 06:52:22 PDT 2014
scripting/source/dlgprov/DialogModelProvider.cxx | 1
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 3
scripting/source/provider/MasterScriptProvider.cxx | 15 ---
scripting/source/provider/MasterScriptProvider.hxx | 15 +++
scripting/source/provider/MasterScriptProviderFactory.cxx | 1
scripting/source/vbaevents/eventhelper.cxx | 3
scripting/source/vbaevents/service.cxx | 45 ----------
scripting/source/vbaevents/service.hxx | 63 ++++++++++++++
8 files changed, 83 insertions(+), 63 deletions(-)
New commits:
commit 5e3c99315592191c1cb2bf787ac78889846fc453
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 14 15:51:37 2014 +0200
Clean up function declarations
Change-Id: Ie204bb9dc1fb4ded416087f5a3d962924b3dec82
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx
index 6e61692..3e7d889 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -38,7 +38,6 @@ using namespace beans;
// component and service helper functions:
OUString SAL_CALL _getImplementationName();
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context );
} // closing component helper namespace
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 8c938e4..156b387 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -37,6 +37,7 @@
#include <tools/diagnose_ex.h>
#include "BrowseNodeFactoryImpl.hxx"
+#include "MasterScriptProvider.hxx"
#include "ActiveMSPList.hxx"
#include <util/MiscUtils.hxx>
@@ -382,7 +383,6 @@ private:
Reference< XAggregation > m_xAggProxy;
Reference< XComponentContext > m_xCtx;
- DefaultBrowseNode();
public:
DefaultBrowseNode( const Reference< XComponentContext >& xCtx, const Reference< browse::XBrowseNode>& xNode ) : m_xWrappedBrowseNode( xNode ), m_xWrappedTypeProv( xNode, UNO_QUERY ), m_xCtx( xCtx )
{
@@ -538,7 +538,6 @@ private:
vXBrowseNodes m_vNodes;
OUString m_Name;
- DefaultRootBrowseNode();
public:
DefaultRootBrowseNode( const Reference< XComponentContext >& xCtx )
{
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 4b66cf8..850d45b 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -56,14 +56,6 @@ using namespace ::sf_misc;
namespace func_provider
{
-// Definitions for MasterScriptProviderFactory global methods.
-
-
-OUString SAL_CALL mspf_getImplementationName() ;
-Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext > const & xComponentContext );
-Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
-
-
bool endsWith( const OUString& target,
const OUString& item )
{
@@ -830,13 +822,6 @@ throw( RuntimeException, std::exception )
} // namespace func_provider
-namespace browsenodefactory
-{
-OUString SAL_CALL bnf_getImplementationName() ;
-Reference< XInterface > SAL_CALL bnf_create( Reference< XComponentContext > const & xComponentContext );
-Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
-}
-
namespace scripting_runtimemgr
{
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 2953463..e424c93 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -143,7 +143,20 @@ private:
osl::Mutex m_mutex;
OUString m_sCtxString;
};
-} // namespace func_provider
+
+OUString SAL_CALL mspf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > SAL_CALL mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
+
+}
+
+namespace browsenodefactory
+{
+OUString SAL_CALL bnf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > SAL_CALL bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
+}
+
#endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 3051bc8..547244a 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -24,6 +24,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
+#include "MasterScriptProvider.hxx"
#include "MasterScriptProviderFactory.hxx"
using namespace ::com::sun::star;
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 72ec5d7..48920fe 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -78,6 +78,9 @@
#include <list>
#include <boost/unordered_map.hpp>
+
+#include <service.hxx>
+
#define ASYNC 0
// primitive support for asynchronous handling of
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
index a628e37..ae9f27b 100644
--- a/scripting/source/vbaevents/service.cxx
+++ b/scripting/source/vbaevents/service.cxx
@@ -21,56 +21,13 @@
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/registry/XRegistryKey.hpp"
+#include <service.hxx>
// component exports
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace evtlstner
-{
-
- // component operations
-
-
- uno::Reference< XInterface > SAL_CALL create(
- Reference< XComponentContext > const & xContext )
- SAL_THROW(());
-
-
-
- OUString SAL_CALL getImplementationName();
-
- Sequence< OUString > SAL_CALL getSupportedServiceNames();
-
- Reference<XInterface> SAL_CALL create(
- Sequence<Any> const &, Reference<XComponentContext> const & );
-} // end evtlstner
-
-namespace ooevtdescgen
-{
-
- // component operations
-
-
- uno::Reference< XInterface > SAL_CALL create(
- Reference< XComponentContext > const & xContext )
- SAL_THROW(());
-
-
-
- OUString SAL_CALL getImplementationName();
-
- Sequence< OUString > SAL_CALL getSupportedServiceNames();
-
- Reference<XInterface> SAL_CALL create(
- Sequence<Any> const &, Reference<XComponentContext> const & );
-} // end ooevtdescgen
-
-
-
-
-
const ::cppu::ImplementationEntry s_component_entries [] =
{
{
diff --git a/scripting/source/vbaevents/service.hxx b/scripting/source/vbaevents/service.hxx
new file mode 100644
index 0000000..901e8be
--- /dev/null
+++ b/scripting/source/vbaevents/service.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#ifndef INCLUDED_SCRIPTING_SOURCE_VBAEVENTS_SERVICE_HXX
+#define INCLUDED_SCRIPTING_SOURCE_VBAEVENTS_SERVICE_HXX
+
+#include <sal/config.h>
+
+namespace evtlstner
+{
+
+ // component operations
+
+
+ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
+ css::uno::Reference< css::uno::XComponentContext > const & xContext )
+ SAL_THROW(());
+
+
+
+ OUString SAL_CALL getImplementationName();
+
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames();
+
+} // end evtlstner
+
+namespace ooevtdescgen
+{
+
+ // component operations
+
+
+ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
+ css::uno::Reference< css::uno::XComponentContext > const & xContext )
+ SAL_THROW(());
+
+
+
+ OUString SAL_CALL getImplementationName();
+
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames();
+
+} // end ooevtdescgen
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list