[Libreoffice-commits] core.git: 2 commits - scripting/source sfx2/source
Stephan Bergmann
sbergman at redhat.com
Thu Feb 27 02:10:19 PST 2014
scripting/source/provider/ProviderCache.hxx | 2
scripting/source/provider/ScriptingContext.cxx | 104 -------------------------
scripting/source/provider/ScriptingContext.hxx | 81 -------------------
sfx2/source/appl/newhelp.hxx | 23 -----
4 files changed, 210 deletions(-)
New commits:
commit 98b829562d37f156fefd23e5756044fc582829ce
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 11:08:37 2014 +0100
Remove unused OpenStatusListener_Impl
Unused since a7551a6a18fd46b4e287225c84807f9665db63ab "INTEGRATION: CWS fwk02ea
(1.93.78); FILE MERGED."
Change-Id: I090e8182a91c180bc8d875ba054ec3c94722d699
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 69f92bb..0786654 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -44,29 +44,6 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
#include "srchdlg.hxx"
-// class OpenStatusListener_Impl -----------------------------------------
-
-class OpenStatusListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatchResultListener >
-{
-private:
- sal_Bool m_bFinished;
- sal_Bool m_bSuccess;
- Link m_aOpenLink;
- OUString m_sURL;
-
-public:
- OpenStatusListener_Impl() : m_bFinished( sal_False ), m_bSuccess( sal_False ) {}
-
- virtual void SAL_CALL dispatchFinished( const ::com::sun::star::frame::DispatchResultEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
-
- inline sal_Bool IsFinished() const { return m_bFinished; }
- inline sal_Bool IsSuccessful() const { return m_bSuccess; }
- inline void SetURL( const OUString& rURL ) { m_sURL = rURL; }
- inline OUString GetURL() const { return m_sURL; }
- inline void SetOpenHdl( const Link& rLink ) { m_aOpenLink = rLink; }
-};
-
// ContentListBox_Impl ---------------------------------------------------
class ContentListBox_Impl : public SvTreeListBox
commit 5133b4460176fbf9f382753efe263f4832eee7b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 10:53:00 2014 +0100
Remove unused ScriptingContext
Unused and not even built since 11ddfdb8563901bf515fa2eb07fa27244cc58ced/
4516589f91e03fa5d8589a52ed8b72af8f9e4521 "INTEGRATION: CWS scriptingf2 (1.7.2);
FILE MERGED."
Change-Id: I06eec282877a91955b3f20109c3c1189b660f2da
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 2d15e88..6e48e71 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -33,8 +33,6 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
-#include "ScriptingContext.hxx"
-
namespace func_provider
{
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
deleted file mode 100644
index 1e02748..0000000
--- a/scripting/source/provider/ScriptingContext.cxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- 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 .
- */
-
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/factory.hxx>
-
-#include <util/scriptingconstants.hxx>
-
-#include "ScriptingContext.hxx"
-
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-#define DOC_REF_PROPID 1
-#define DOC_STORAGE_ID_PROPID 2
-#define DOC_URI_PROPID 3
-#define RESOLVED_STORAGE_ID_PROPID 4
-#define SCRIPT_INFO_PROPID 5
-#define SCRIPTINGCONTEXT_DEFAULT_ATTRIBS() beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::MAYBEVOID
-namespace func_provider
-{
-
-
-// XScriptingContext implementation
-
-
-ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xContext ) : //ScriptingContextImpl_BASE( GetMutex()),
- OPropertyContainer( GetBroadcastHelper() ),
- m_xContext( xContext, UNO_SET_THROW )
-{
- OSL_TRACE( "< ScriptingContext ctor called >" );
-
- Any nullAny;
-
- scripting_constants::ScriptingConstantsPool& scriptingConstantsPool =
- scripting_constants::ScriptingConstantsPool::instance();
- registerPropertyNoMember( scriptingConstantsPool.DOC_REF, DOC_REF_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(),::getCppuType( (const Reference< css::frame::XModel >* ) NULL ), NULL ) ;
- registerPropertyNoMember( scriptingConstantsPool.DOC_STORAGE_ID, DOC_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ) ;
- registerPropertyNoMember( scriptingConstantsPool.DOC_URI, DOC_URI_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const OUString* ) NULL ), NULL ) ;
- registerPropertyNoMember( scriptingConstantsPool.RESOLVED_STORAGE_ID, RESOLVED_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL );
- registerPropertyNoMember( scriptingConstantsPool.SCRIPT_INFO, SCRIPT_INFO_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL );
-}
-
-ScriptingContext::~ScriptingContext()
-{
- OSL_TRACE( "< ScriptingContext dtor called >" );
-}
-
-// OPropertySetHelper
-
-
-::cppu::IPropertyArrayHelper& ScriptingContext::getInfoHelper( )
-{
- return *getArrayHelper();
-}
-
-
-// OPropertyArrayUsageHelper
-
-
-::cppu::IPropertyArrayHelper* ScriptingContext::createArrayHelper( ) const
-{
- Sequence< beans::Property > aProps;
- describeProperties( aProps );
- return new ::cppu::OPropertyArrayHelper( aProps );
-}
-
-// XPropertySet
-
-
-Reference< beans::XPropertySetInfo > ScriptingContext::getPropertySetInfo( ) throw (RuntimeException)
-{
- Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
-}
-// -----------------------------------------------------------------------------// XTypeProvider
-
-IMPLEMENT_GET_IMPLEMENTATION_ID( ScriptingContext )
-
-css::uno::Sequence< css::uno::Type > SAL_CALL ScriptingContext::getTypes( ) throw (css::uno::RuntimeException)
-{
- return OPropertyContainer::getTypes();
-}
-} // namespace func_provider
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
deleted file mode 100644
index 731e16b..0000000
--- a/scripting/source/provider/ScriptingContext.hxx
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- 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 _FRAMEWORK_SCRIPT_PROTOCOLHANDLER_SCRIPTING_CONTEXT_HXX_
-#define _FRAMEWORK_SCRIPT_PROTOCOLHANDLER_SCRIPTING_CONTEXT_HXX_
-
-
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/broadcasthelper.hxx>
-
-namespace func_provider
-{
-
-//Typedefs
-
-//typedef ::cppu::WeakImplHelper1< css::beans::XPropertySet > ScriptingContextImpl_BASE;
-
-class ScriptingContext : public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer,
- public ::comphelper::OPropertyArrayUsageHelper< ScriptingContext >, public css::lang::XTypeProvider, public ::cppu::OWeakObject
-{
-
-public:
- ScriptingContext( const css::uno::Reference< css::uno::XComponentContext > & xContext );
- ~ScriptingContext();
- // XInterface
-
- css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
- throw( css::uno::RuntimeException, std::exception )
- {
- css::uno::Any aRet( OPropertySetHelper::queryInterface( rType ) );
- return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
- }
- void SAL_CALL acquire() throw() { ::cppu::OWeakObject::acquire(); }
- void SAL_CALL release() throw() { ::cppu::OWeakObject::release(); }
- // XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw ( css::uno::RuntimeException );
- //XTypeProvider
- DECLARE_XTYPEPROVIDER( )
-
-protected:
-
- // OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper( );
-
- // OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
-
-};
-} // func_provider
-#endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list