Skip to content

C
core
Kaydet (Commit) 86bbb304 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Dead code 

...originally introduced with 5fff0372 and
2b34e17d "INTEGRATION: CWS
cfgruggedised: #i28654#,#i29838# Add InteractionHandler support to
configuration," but unused ever since 47692bfc
"sb111: #i101955# moved configmgr2/ to configmgr/" re-wrote configmgr from
scratch.

Change-Id: Ibe18748f7d637e09194ca7b8e7ff5955c4b212c7
üst 1a038dc8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 242 deletions
desktop/Library_sofficeapp.mk
Dosyayı görüntüle @ 86bbb304
......@@ -75,7 +75,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/app/check_ext_deps \
desktop/source/app/cmdlineargs \
desktop/source/app/cmdlinehelp \
desktop/source/app/configinit \
desktop/source/app/desktopcontext \
desktop/source/app/desktopresid \
desktop/source/app/dispatchwatcher \
......
desktop/source/app/app.cxx
Dosyayı görüntüle @ 86bbb304
......@@ -29,7 +29,6 @@
#include "cmdlineargs.hxx"
#include "cmdlinehelp.hxx"
#include "dispatchwatcher.hxx"
#include "configinit.hxx"
#include "lockfile.hxx"
#include "userinstall.hxx"
#include "desktopcontext.hxx"
......@@ -438,13 +437,6 @@ void FatalError(const OUString& sMessage)
_exit(EXITHELPER_FATAL_ERROR);
}
static bool ShouldSuppressUI(const CommandLineArgs& rCmdLine)
{
return rCmdLine.IsInvisible() ||
rCmdLine.IsHeadless() ||
rCmdLine.IsQuickstart();
}
struct theCommandLineArgs : public rtl::Static< CommandLineArgs, theCommandLineArgs > {};
}
......@@ -1321,10 +1313,6 @@ int Desktop::Main()
return EXIT_SUCCESS;
}
#endif
// setup configuration error handling
ConfigurationErrorHandler aConfigErrHandler;
if (!ShouldSuppressUI(rCmdLineArgs))
aConfigErrHandler.activate();
ResMgr::SetReadStringHook( ReplaceStringHookProc );
......@@ -1578,9 +1566,6 @@ int Desktop::Main()
// Post event to enable acceptors
Application::PostUserEvent( LINK( this, Desktop, EnableAcceptors_Impl) );
// The configuration error handler currently is only for startup
aConfigErrHandler.deactivate();
// Acquire solar mutex just before we enter our message loop
}
......
desktop/source/app/configinit.cxx deleted 100644 → 0
Dosyayı görüntüle @ 1a038dc8
/* -*- 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 "configinit.hxx"
#include "desktop.hrc"
#include "app.hxx"
#include <comphelper/processfactory.hxx>
#include <uno/current_context.hxx>
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <stdio.h>
#include <com/sun/star/task/InteractionHandler.hpp>
namespace uno = ::com::sun::star::uno;
namespace lang = ::com::sun::star::lang;
using uno::UNO_QUERY;
static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler";
// ConfigurationErrorHandler
namespace
{
typedef uno::Reference< uno::XCurrentContext > CurrentContext;
class SimpleCurrentContext : public cppu::WeakImplHelper1< uno::XCurrentContext >
{
CurrentContext m_xChainedContext;
public:
explicit
SimpleCurrentContext(const CurrentContext & xChainedContext)
: m_xChainedContext(xChainedContext)
{}
void install() { uno::setCurrentContext(this); }
void deinstall() { uno::setCurrentContext(m_xChainedContext); }
uno::Any getChainedValueByName( OUString const & aName) const
{
return m_xChainedContext.is()
? m_xChainedContext->getValueByName(aName)
: uno::Any();
}
// XCurrentContext
virtual uno::Any SAL_CALL
getValueByName( OUString const & aName)
throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
uno::Any SAL_CALL
SimpleCurrentContext::getValueByName( OUString const & aName)
throw (uno::RuntimeException, std::exception)
{
return getChainedValueByName(aName);
}
}
class ConfigurationErrorHandler::Context : public SimpleCurrentContext
{
public:
Context()
: SimpleCurrentContext( uno::getCurrentContext() )
{
}
virtual ~Context()
{
}
// XCurrentContext
virtual uno::Any SAL_CALL
getValueByName( OUString const & aName)
throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
InteractionHandler m_xHandler;
};
uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
throw (uno::RuntimeException, std::exception)
{
if ( aName == CONFIG_ERROR_HANDLER )
{
if ( !m_xHandler.is() )
m_xHandler = ConfigurationErrorHandler::getDefaultInteractionHandler();
return uno::Any( m_xHandler );
}
return SimpleCurrentContext::getValueByName( aName );
}
ConfigurationErrorHandler::~ConfigurationErrorHandler()
{
deactivate();
}
/// installs the handler into the current context
void ConfigurationErrorHandler::activate()
{
if (!m_pContext)
{
m_pContext = new Context;
m_pContext->acquire();
}
m_pContext->install();
}
/// deinstalls the handler from the current context, restoring the previous context
void ConfigurationErrorHandler::deactivate()
{
if (m_pContext)
{
m_pContext->deinstall();
m_pContext->release();
m_pContext = 0;
}
}
ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler()
{
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY );
return xHandler;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
desktop/source/app/configinit.hxx deleted 100644 → 0
Dosyayı görüntüle @ 1a038dc8
/* -*- 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_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
#define INCLUDED_DESKTOP_SOURCE_APP_CONFIGINIT_HXX
#include <sal/config.h>
#include <com/sun/star/task/XInteractionHandler.hpp>
/**
sets an InteractionHandler for configuration errors in the current context.
*/
class ConfigurationErrorHandler
{
public:
typedef com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > InteractionHandler;
/// Constructor: Uses the default interaction handler
ConfigurationErrorHandler()
: m_pContext(0), m_xHandler()
{}
/// Constructor: Uses an externally provided interaction handler
ConfigurationErrorHandler(const InteractionHandler & xHandler)
: m_pContext(0), m_xHandler( xHandler )
{}
~ConfigurationErrorHandler();
static InteractionHandler getDefaultInteractionHandler();
/// installs the handler into the current context
void activate();
/// deinstalls the handler from the current context, restoring the previous context
void deactivate();
private:
class Context;
Context * m_pContext;
InteractionHandler m_xHandler;
private:
ConfigurationErrorHandler(const ConfigurationErrorHandler&) SAL_DELETED_FUNCTION;
void operator=(const ConfigurationErrorHandler&) SAL_DELETED_FUNCTION;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment