mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ditch the application per-language IsAutoMnemonicEnabled setting

Browse Source 
Change-Id: I9734ada09edb6544a332893a7c5d31730b0d081d
This commit is contained in:
Caolán McNamara
2016-07-10 16:52:04 +01:00
parent 4bc99ab1ac
commit a97d67cd0b
13 changed files with 2 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editeng/source/editeng/editview.cxx
View File

@@ -838,11 +838,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
}
// ## Create mnemonics here
if ( Application::IsAutoMnemonicEnabled() )
{
aPopupMenu->CreateAutoMnemonics();
aPopupMenu->SetMenuFlags( aPopupMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics );
}
aPopupMenu->CreateAutoMnemonics();
aPopupMenu->SetMenuFlags(aPopupMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics);
// Replace suggestions...
Sequence< OUString > aAlt;

1
include/unotools/itemholderbase.hxx
View File

@@ -57,7 +57,6 @@ enum EItem
E_LANGUAGEOPTIONS , // 2
E_LINGUCFG ,
E_LOCALISATIONOPTIONS ,
E_MENUOPTIONS ,
E_MISCCFG , // 2

78
include/unotools/localisationoptions.hxx
View File

@@ -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 <sal/types.h>
#include <unotools/unotoolsdllapi.h>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
#include <memory>
/*-************************************************************************************************************
@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<SvtLocalisationOptions_Impl> m_pImpl;
}; // class SvtLocalisationOptions
#endif // INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

16
include/vcl/svapp.hxx
View File

@@ -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

2
l10ntools/source/gL10nMem.cxx
View File

@@ -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" &&

34
officecfg/registry/data/org/openoffice/Office/Common.xcu
View File

@@ -30,40 +30,6 @@
<value install:module="wnt">false</value>
</prop>
</node>
<node oor:name="Localisation">
<prop oor:name="AutoMnemonic">
<value xml:lang="x-no-translate">true</value>
<value xml:lang="en-US">true</value>
<value xml:lang="de">true</value>
<value xml:lang="ar">false</value>
<value xml:lang="ca">true</value>
<value xml:lang="cs">true</value>
<value xml:lang="da">true</value>
<value xml:lang="el">true</value>
<value xml:lang="es">true</value>
<value xml:lang="et">true</value>
<value xml:lang="fi">true</value>
<value xml:lang="fr">true</value>
<value xml:lang="he">true</value>
<value xml:lang="hi-IN">true</value>
<value xml:lang="hu">true</value>
<value xml:lang="it">true</value>
<value xml:lang="ja">true</value>
<value xml:lang="ko">true</value>
<value xml:lang="nl">true</value>
<value xml:lang="pl">true</value>
<value xml:lang="pt">true</value>
<value xml:lang="pt-BR">true</value>
<value xml:lang="ru">true</value>
<value xml:lang="sk">true</value>
<value xml:lang="sl">true</value>
<value xml:lang="sv">true</value>
<value xml:lang="th">true</value>
<value xml:lang="tr">true</value>
<value xml:lang="zh-CN">true</value>
<value xml:lang="zh-TW">true</value>
</prop>
</node>
</node>
<node oor:name="Help">
<node oor:name="StartCenter">

12
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -2758,18 +2758,6 @@
<value>1</value>
</prop>
</group>
<group oor:name="Localisation">
<info>
<desc>Contains localization specific settings.</desc>
</info>
<prop oor:name="AutoMnemonic" oor:type="xs:boolean" oor:localized="true">
<!-- OldPath: International/AutoMnemonic -->
<!-- OldLocation: soffice.ini -->
<info>
<desc>Specifies if shortcuts are assigned automatically.</desc>
</info>
</prop>
</group>
<group oor:name="Menu">
<info>
<desc>Contains menu view settings.</desc>

1
sfx2/source/appl/app.cxx
View File

@@ -92,7 +92,6 @@
#include <svtools/miscopt.hxx>
#include <unotools/useroptions.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/localisationoptions.hxx>
#include <unotools/fontoptions.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <unotools/syslocale.hxx>

7
sfx2/source/appl/appinit.cxx
View File

@@ -30,7 +30,6 @@
#include <svtools/svtools.hrc>
#include <unotools/configmgr.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/localisationoptions.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
@@ -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);

1
unotools/Library_utl.mk
View File

@@ -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 \

5
unotools/source/config/itemholder1.cxx
View File

@@ -35,7 +35,6 @@
#include <unotools/fontoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/localisationoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/printwarningoptions.hxx>
@@ -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;

245
unotools/source/config/localisationoptions.cxx
View File

@@ -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 <unotools/localisationoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <tools/debug.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#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<nPropertyCount; ++nProperty )
{
if (!seqValues[nProperty].hasValue())
continue;
switch( nProperty )
{
case PROPERTYHANDLE_AUTOMNEMONIC : {
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\AutoMnemonic\"?" );
seqValues[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<nCount; ++nProperty )
{
if( seqPropertyNames[nProperty] == PROPERTYNAME_AUTOMNEMONIC )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\AutoMnemonic\"?" );
seqValues[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<nCount; ++nProperty )
{
switch( nProperty )
{
case PROPERTYHANDLE_AUTOMNEMONIC : {
seqValues[nProperty] <<= m_bAutoMnemonic;
}
break;
}
}
// Set properties in configuration.
PutProperties( seqNames, seqValues );
}
// public method
Sequence< OUString > 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<SvtLocalisationOptions_Impl> 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<SvtLocalisationOptions_Impl>();
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<osl::Mutex, theLocalisationOptionsMutex>{};
}
// private method
Mutex& SvtLocalisationOptions::GetOwnStaticMutex()
{
return theLocalisationOptionsMutex::get();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

14
vcl/source/app/svapp.cxx
View File

@@ -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();