From e74a98528352b408420c1aa518e9b583529c02db Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 28 Jul 2020 19:57:18 +0100 Subject: drop newly unused SvtFontOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaab664770d96a7d197354949bbe6d82c248f1037 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99648 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- unotools/Library_utl.mk | 1 - unotools/source/config/fontoptions.cxx | 302 --------------------------------- unotools/source/config/itemholder1.cxx | 5 - 3 files changed, 308 deletions(-) delete mode 100644 unotools/source/config/fontoptions.cxx (limited to 'unotools') diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index a452df6192a1..b1bb21e129ba 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/config/extendedsecurityoptions \ unotools/source/config/fltrcfg \ unotools/source/config/fontcfg \ - unotools/source/config/fontoptions \ unotools/source/config/historyoptions \ unotools/source/config/itemholder1 \ unotools/source/config/lingucfg \ diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx deleted file mode 100644 index c9fa6ec48f94..000000000000 --- a/unotools/source/config/fontoptions.cxx +++ /dev/null @@ -1,302 +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_FONT "Office.Common/Font" - -#define PROPERTYNAME_REPLACEMENTTABLE "Substitution/Replacement" -#define PROPERTYNAME_FONTHISTORY "View/History" -#define PROPERTYNAME_FONTWYSIWYG "View/ShowFontBoxWYSIWYG" - -#define PROPERTYHANDLE_REPLACEMENTTABLE 0 -#define PROPERTYHANDLE_FONTHISTORY 1 -#define PROPERTYHANDLE_FONTWYSIWYG 2 - -class SvtFontOptions_Impl : public ConfigItem -{ - public: - - SvtFontOptions_Impl(); - virtual ~SvtFontOptions_Impl() override; - - /*-**************************************************************************************************** - @short called for notify of configmanager - @descr This method is called from the ConfigManager before the 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 IsFontHistoryEnabled ( ) const { return m_bFontHistory;} - - bool IsFontWYSIWYGEnabled ( ) const { return m_bFontWYSIWYG;} - void EnableFontWYSIWYG ( bool bState ); - - private: - - virtual void ImplCommit() override; - - /*-**************************************************************************************************** - @short return list of key names of our configuration management which represent our module tree - @descr This method returns 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 > impl_GetPropertyNames(); - - private: - - bool m_bReplacementTable; - bool m_bFontHistory; - bool m_bFontWYSIWYG; -}; - -// constructor - -SvtFontOptions_Impl::SvtFontOptions_Impl() - // Init baseclasses first - : ConfigItem ( ROOTNODE_FONT ) - // Init member then. - , m_bReplacementTable ( false ) - , m_bFontHistory ( false ) - , m_bFontWYSIWYG ( false ) -{ - // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = impl_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()), "SvtFontOptions_Impl::SvtFontOptions_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_bReplacementTable; - } - break; - case PROPERTYHANDLE_FONTHISTORY : { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\History\"?" ); - seqValues[nProperty] >>= m_bFontHistory; - } - break; - case PROPERTYHANDLE_FONTWYSIWYG : { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\ShowFontBoxWYSIWYG\"?" ); - seqValues[nProperty] >>= m_bFontWYSIWYG; - } - 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 - -SvtFontOptions_Impl::~SvtFontOptions_Impl() -{ - assert(!IsModified()); // should have been committed -} - -// public method - -void SvtFontOptions_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()), "SvtFontOptions_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_bReplacementTable; - } - else - if( seqPropertyNames[nProperty] == PROPERTYNAME_FONTHISTORY ) - { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\Font\\View\\History\"?" ); - seqValues[nProperty] >>= m_bFontHistory; - } - else - if( seqPropertyNames[nProperty] == PROPERTYNAME_FONTWYSIWYG ) - { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\Font\\View\\ShowFontBoxWYSIWYG\"?" ); - seqValues[nProperty] >>= m_bFontWYSIWYG; - } -#if OSL_DEBUG_LEVEL > 0 - else assert(false && "Unknown property detected ... I can't handle these!"); -#endif - } -} - -// public method - -void SvtFontOptions_Impl::ImplCommit() -{ - // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); - for( sal_Int32 nProperty=0; nProperty SvtFontOptions_Impl::impl_GetPropertyNames() -{ - return Sequence< OUString > - { - PROPERTYNAME_REPLACEMENTTABLE , - PROPERTYNAME_FONTHISTORY , - PROPERTYNAME_FONTWYSIWYG , - }; -} - -namespace { - -std::weak_ptr g_pFontOptions; - -} - -SvtFontOptions::SvtFontOptions() -{ - // Global access, must be guarded (multithreading!). - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - - m_pImpl = g_pFontOptions.lock(); - if( !m_pImpl ) - { - m_pImpl = std::make_shared(); - g_pFontOptions = m_pImpl; - ItemHolder1::holdConfigItem(EItem::FontOptions); - } -} - -SvtFontOptions::~SvtFontOptions() -{ - // Global access, must be guarded (multithreading!) - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - - m_pImpl.reset(); -} - -// public method - -bool SvtFontOptions::IsFontHistoryEnabled() const -{ - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pImpl->IsFontHistoryEnabled(); -} - -// public method - -bool SvtFontOptions::IsFontWYSIWYGEnabled() const -{ - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pImpl->IsFontWYSIWYGEnabled(); -} - -// public method - -void SvtFontOptions::EnableFontWYSIWYG( bool bState ) -{ - MutexGuard aGuard( impl_GetOwnStaticMutex() ); - m_pImpl->EnableFontWYSIWYG( bState ); -} - -namespace -{ - class theFontOptionsMutex : public rtl::Static {}; -} - -// private method - -Mutex& SvtFontOptions::impl_GetOwnStaticMutex() -{ - return theFontOptionsMutex::get(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index e9b82997602c..cdb7084981fb 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -145,10 +144,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) rItem.pItem.reset( new SvtExtendedSecurityOptions() ); break; - case EItem::FontOptions : - rItem.pItem.reset( new SvtFontOptions() ); - break; - case EItem::HistoryOptions : rItem.pItem.reset( new SvtHistoryOptions() ); break; -- cgit