[Libreoffice-commits] core.git: 2 commits - desktop/Library_sofficeapp.mk desktop/source include/formula
Stephan Bergmann
sbergman at redhat.com
Mon Jun 15 09:31:35 PDT 2015
desktop/Library_sofficeapp.mk | 1
desktop/source/app/app.cxx | 15 ---
desktop/source/app/configinit.cxx | 160 --------------------------------------
desktop/source/app/configinit.hxx | 66 ---------------
include/formula/tokenarray.hxx | 12 +-
5 files changed, 6 insertions(+), 248 deletions(-)
New commits:
commit dbd093176ee8d2185205e7d29fcd0949c074dc85
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 15 18:30:52 2015 +0200
Make ReplaceMode accessible from ScCompiler::CompileString
Change-Id: If25443f27ff09aca8b38d00ab80ecfdc00ab2642
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index d06d3e1a..991621d 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -123,12 +123,6 @@ protected:
/// Also used by the compiler. The token MUST had been allocated with new!
FormulaToken* Add( FormulaToken* );
- enum ReplaceMode
- {
- BACKWARD_CODE_ONLY, ///< offset goes backward, replacement only in pCode
- FORWARD_CODE_AND_RPN ///< offset goes forward, replacement in pCode and RPN
- };
-
/** Also used by the compiler. The token MUST had been allocated with new!
@param nOffset
If eMode==BACKWARD_CODE_ONLY negative offset of token, 0==last,
@@ -156,6 +150,12 @@ protected:
{ nMode = GetCombinedBitsRecalcMode() | nBits; }
public:
+ enum ReplaceMode
+ {
+ BACKWARD_CODE_ONLY, ///< offset goes backward, replacement only in pCode
+ FORWARD_CODE_AND_RPN ///< offset goes forward, replacement in pCode and RPN
+ };
+
FormulaTokenArray();
/// Assignment with references to FormulaToken entries (not copied!)
FormulaTokenArray( const FormulaTokenArray& );
commit 86bbb304db54befcd3b5b64b112b2a849f9273ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 15 15:29:50 2015 +0200
Dead code
...originally introduced with 5fff0372bee0794a9b220f419d4b4e6975dd3941 and
2b34e17de3ce984402dcaf8e356a0d3118ddda35 "INTEGRATION: CWS
cfgruggedised: #i28654#,#i29838# Add InteractionHandler support to
configuration," but unused ever since 47692bfc1275bfa24a7fb2627cc263142549d29d
"sb111: #i101955# moved configmgr2/ to configmgr/" re-wrote configmgr from
scratch.
Change-Id: Ibe18748f7d637e09194ca7b8e7ff5955c4b212c7
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index d3ca8d0..b1d9d21 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -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 \
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5c775ca..43cb227 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -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
}
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
deleted file mode 100644
index c3a4703..0000000
--- a/desktop/source/app/configinit.cxx
+++ /dev/null
@@ -1,160 +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 "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: */
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
deleted file mode 100644
index 8719bc3..0000000
--- a/desktop/source/app/configinit.hxx
+++ /dev/null
@@ -1,66 +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 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: */
More information about the Libreoffice-commits
mailing list