From a97d67cd0bf0819d4559fa79d5fcbcd86222fe6a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 10 Jul 2016 16:52:04 +0100 Subject: ditch the application per-language IsAutoMnemonicEnabled setting Change-Id: I9734ada09edb6544a332893a7c5d31730b0d081d --- editeng/source/editeng/editview.cxx | 7 +- include/unotools/itemholderbase.hxx | 1 - include/unotools/localisationoptions.hxx | 78 ------- include/vcl/svapp.hxx | 16 -- l10ntools/source/gL10nMem.cxx | 2 - .../registry/data/org/openoffice/Office/Common.xcu | 34 --- .../schema/org/openoffice/Office/Common.xcs | 12 - sfx2/source/appl/app.cxx | 1 - sfx2/source/appl/appinit.cxx | 7 - unotools/Library_utl.mk | 1 - unotools/source/config/itemholder1.cxx | 5 - unotools/source/config/localisationoptions.cxx | 245 --------------------- vcl/source/app/svapp.cxx | 14 -- 13 files changed, 2 insertions(+), 421 deletions(-) delete mode 100644 include/unotools/localisationoptions.hxx delete mode 100644 unotools/source/config/localisationoptions.cxx diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index df0692c443ee..85e708d5e682 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -838,11 +838,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, LinkCreateAutoMnemonics(); - aPopupMenu->SetMenuFlags( aPopupMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics ); - } + aPopupMenu->CreateAutoMnemonics(); + aPopupMenu->SetMenuFlags(aPopupMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics); // Replace suggestions... Sequence< OUString > aAlt; diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index 9dfc2388b4ed..7071e3c66658 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -57,7 +57,6 @@ enum EItem E_LANGUAGEOPTIONS , // 2 E_LINGUCFG , - E_LOCALISATIONOPTIONS , E_MENUOPTIONS , E_MISCCFG , // 2 diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx deleted file mode 100644 index f00728473942..000000000000 --- a/include/unotools/localisationoptions.hxx +++ /dev/null @@ -1,78 +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_UNOTOOLS_LOCALISATIONOPTIONS_HXX -#define INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX - -#include -#include -#include -#include -#include - -/*-************************************************************************************************************ - @short forward declaration to our private date container implementation - @descr We use these class as internal member to support small memory requirements. - You can create the container if it is necessary. The class which use these mechanism - is faster and smaller then a complete implementation! -*//*-*************************************************************************************************************/ - -class SvtLocalisationOptions_Impl; - -/*-************************************************************************************************************ - @short collect information about localisation features - @devstatus ready to use -*//*-*************************************************************************************************************/ - -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtLocalisationOptions : public utl::detail::Options -{ - public: - SvtLocalisationOptions(); - virtual ~SvtLocalisationOptions(); - - /*-**************************************************************************************************** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic" - @descr These value specifies if shortcuts should be assigned automatically. - @param "bState", new value to set it in configuration. - @return The value which represent current state of internal variable. - - @onerror No error should occur! - *//*-*****************************************************************************************************/ - - bool IsAutoMnemonic ( ) const; - - private: - - /*-**************************************************************************************************** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). - All access methods are'nt safe! - We create a static mutex only for one ime and use at different times. - @return A reference to a static mutex member. - *//*-*****************************************************************************************************/ - - UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - - private: - std::shared_ptr m_pImpl; - -}; // class SvtLocalisationOptions - -#endif // INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f4731e759e04..f91d38afbe0c 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1075,22 +1075,6 @@ public: */ static void RemoveAccel( Accelerator* pAccel ); - /** Enable auto-mnemonics - - @param bEnabled True enables auto-mnemonics, and false disables it - - @see IsAutoMnemonicEnabled - */ - static void EnableAutoMnemonic( bool bEnabled = true ); - - /** Determines if auto-mnemonics are enabled. - - @returns True if auto-mnemonics is enabled, false if not. - - @see EnableAutoMnemonic - */ - static bool IsAutoMnemonicEnabled(); - /** Get the number of reserved key codes used by the application. @returns number of reserved key codes diff --git a/l10ntools/source/gL10nMem.cxx b/l10ntools/source/gL10nMem.cxx index f303a138210a..0e71fcedd4bb 100644 --- a/l10ntools/source/gL10nMem.cxx +++ b/l10ntools/source/gL10nMem.cxx @@ -599,8 +599,6 @@ bool l10nMem::convFilterWarning(const string& sSourceFile, sKey == "WriterCommands.UserInterface.Commands..uno:FlipVertical.Label") || (sSourceFile == "registry/data/org/openoffice/Office/UI/WriterCommands.xcu" && sKey == "WriterCommands.UserInterface.Commands..uno:FlipHorizontal.Label") || - (sSourceFile == "registry/data/org/openoffice/Office/Common.xcu" && - sKey == "Common.View.Localisation.AutoMnemonic") || (sSourceFile == "registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu" && sKey == "ImpressWindowState.UIElements.States.private:resource/toolpanel/DrawingFramework/SlideTransitions.UIName") || (sSourceFile == "registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu" && diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index ab6ca9514b78..00ba109fe6fd 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -30,40 +30,6 @@ false - - - true - true - true - false - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index eb193dd04360..8d64602e1fca 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2758,18 +2758,6 @@ 1 - - - Contains localization specific settings. - - - - - - Specifies if shortcuts are assigned automatically. - - - Contains menu view settings. diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 55b2fc5dd68a..6dab36f4b8c1 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -92,7 +92,6 @@ #include #include #include -#include #include #include #include diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 35cfdc1a6c99..a1b63462f634 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -215,12 +214,6 @@ void SfxApplication::Initialize_Impl() Help::EnableContextHelp(); Help::EnableExtHelp(); - if (!utl::ConfigManager::IsAvoidConfig()) - { - SvtLocalisationOptions aLocalisation; - Application::EnableAutoMnemonic ( aLocalisation.IsAutoMnemonic() ); - } - pImpl->m_pToolsErrorHdl = new SfxErrorHandler( RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1); diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index bfecbd132cfb..fb0f19f93be7 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/config/historyoptions \ unotools/source/config/itemholder1 \ unotools/source/config/lingucfg \ - unotools/source/config/localisationoptions \ unotools/source/config/misccfg \ unotools/source/config/moduleoptions \ unotools/source/config/options \ diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 6f69b976ce16..43a239b7e1fd 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -175,10 +174,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtLinguConfig(); break; - case E_LOCALISATIONOPTIONS : - rItem.pItem = new SvtLocalisationOptions(); - break; - case E_MODULEOPTIONS : rItem.pItem = new SvtModuleOptions(); break; diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx deleted file mode 100644 index d93f8b3718ac..000000000000 --- a/unotools/source/config/localisationoptions.cxx +++ /dev/null @@ -1,245 +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 -#include -#include -#include -#include -#include - -#include "itemholder1.hxx" - -using namespace ::utl; -using namespace ::osl; -using namespace ::com::sun::star::uno; - -#define ROOTNODE_LOCALISATION OUString("Office.Common/View/Localisation") -#define DEFAULT_AUTOMNEMONIC false - -#define PROPERTYNAME_AUTOMNEMONIC "AutoMnemonic" - -#define PROPERTYHANDLE_AUTOMNEMONIC 0 - -#define PROPERTYCOUNT 1 - -class SvtLocalisationOptions_Impl : public ConfigItem -{ - public: - - SvtLocalisationOptions_Impl(); - virtual ~SvtLocalisationOptions_Impl(); - - /*-**************************************************************************************************** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the - PropertyChangeListener if the sub tree broadcasts changes. You must update your - internal values. - - @seealso baseclass ConfigItem - - @param "seqPropertyNames" is the list of properties which should be updated. - *//*-*****************************************************************************************************/ - - virtual void Notify( const Sequence< OUString >& seqPropertyNames ) override; - - /*-**************************************************************************************************** - @short access method to get internal values - @descr These method give us a chance to regulate access to our internal values. - It's not used in the moment - but it's possible for the feature! - *//*-*****************************************************************************************************/ - - bool IsAutoMnemonic ( ) const { return m_bAutoMnemonic;} - - private: - - virtual void ImplCommit() override; - - /*-**************************************************************************************************** - @short return list of key names of our configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our - configuration management. - @return A list of needed configuration keys is returned. - *//*-*****************************************************************************************************/ - - static Sequence< OUString > GetPropertyNames(); - - private: - - bool m_bAutoMnemonic; -}; - -// constructor - -SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() - // Init baseclasses first - : ConfigItem ( ROOTNODE_LOCALISATION ) - // Init member then. - , m_bAutoMnemonic ( DEFAULT_AUTOMNEMONIC ) -{ - // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = GetPropertyNames ( ); - Sequence< Any > seqValues = GetProperties ( seqNames ); - - // Safe impossible cases. - // We need values from ALL configuration keys. - // Follow assignment use order of values in relation to our list of key names! - DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nI miss some values of configuration keys!\n" ); - - // Copy values from list in right order to our internal member. - sal_Int32 nPropertyCount = seqValues.getLength(); - for( sal_Int32 nProperty=0; nProperty>= m_bAutoMnemonic; - } - break; - } - } - - // Enable notification mechanism of our baseclass. - // We need it to get information about changes outside these class on our used configuration keys! - EnableNotification( seqNames ); -} - -// destructor - -SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() -{ - assert(!IsModified()); // should have been committed -} - -// public method - -void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) -{ - // Use given list of updated properties to get his values from configuration directly! - Sequence< Any > seqValues = GetProperties( seqPropertyNames ); - // Safe impossible cases. - // We need values from ALL notified configuration keys. - DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtLocalisationOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); - // Step over list of property names and get right value from coreesponding value list to set it on internal members! - sal_Int32 nCount = seqPropertyNames.getLength(); - for( sal_Int32 nProperty=0; nProperty>= m_bAutoMnemonic; - } -#if OSL_DEBUG_LEVEL > 0 - else assert(false && "SvtLocalisationOptions_Impl::Notify()\nUnknown property detected ... I can't handle these!\n"); -#endif - } - - NotifyListeners(0); -} - -// public method - -void SvtLocalisationOptions_Impl::ImplCommit() -{ - // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = GetPropertyNames (); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); - for( sal_Int32 nProperty=0; nProperty SvtLocalisationOptions_Impl::GetPropertyNames() -{ - // Build static list of configuration key names. - const OUString aProperties[] = - { - OUString(PROPERTYNAME_AUTOMNEMONIC) , - }; - // Initialize return sequence with these list ... - Sequence< OUString > seqPropertyNames(aProperties, PROPERTYCOUNT); - // ... and return it. - return seqPropertyNames; -} - -namespace { - -std::weak_ptr g_pLocalisationOptions; - -} - -SvtLocalisationOptions::SvtLocalisationOptions() -{ - // Global access, must be guarded (multithreading!). - MutexGuard aGuard( GetOwnStaticMutex() ); - - m_pImpl = g_pLocalisationOptions.lock(); - if( !m_pImpl ) - { - m_pImpl = std::make_shared(); - g_pLocalisationOptions = m_pImpl; - ItemHolder1::holdConfigItem(E_LOCALISATIONOPTIONS); - } -} - -SvtLocalisationOptions::~SvtLocalisationOptions() -{ - // Global access, must be guarded (multithreading!) - MutexGuard aGuard( GetOwnStaticMutex() ); - - m_pImpl.reset(); -} - -// public method - -bool SvtLocalisationOptions::IsAutoMnemonic() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pImpl->IsAutoMnemonic(); -} - -namespace -{ - class theLocalisationOptionsMutex : public rtl::Static{}; -} - -// private method - -Mutex& SvtLocalisationOptions::GetOwnStaticMutex() -{ - return theLocalisationOptionsMutex::get(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 99ab7933e6d6..78c494d70405 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1399,20 +1399,6 @@ bool Application::IsAutoHelpIdEnabled() return ImplGetSVData()->maHelpData.mbAutoHelpId; } -void Application::EnableAutoMnemonic( bool bEnabled ) -{ - AllSettings aSettings = GetSettings(); - StyleSettings aStyle = aSettings.GetStyleSettings(); - aStyle.SetAutoMnemonic( bEnabled ); - aSettings.SetStyleSettings( aStyle ); - SetSettings( aSettings ); -} - -bool Application::IsAutoMnemonicEnabled() -{ - return GetSettings().GetStyleSettings().GetAutoMnemonic(); -} - OUString Application::GetToolkitName() { ImplSVData* pSVData = ImplGetSVData(); -- cgit v1.2.3