drop newly unused SvtFontOptions

Change-Id: Iaab664770d96a7d197354949bbe6d82c248f1037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99648
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 0 insertions, 400 deletions

diff --git a/compilerplugins/clang/unusedvariablemore.cxx b/compilerplugins/clang/unusedvariablemore.cxx
index 38e3bbe81fe0..cc166ab0eb2e 100644
--- a/compilerplugins/clang/unusedvariablemore.cxx
+++ b/compilerplugins/clang/unusedvariablemore.cxx
@@ -171,8 +171,6 @@ bool UnusedVariableMore::VisitVarDecl(VarDecl const* var)
         return true;
     if (dc.Class("SvtUserOptions").GlobalNamespace())
         return true;
-    if (dc.Class("SvtFontOptions").GlobalNamespace())
-        return true;
     if (dc.Class("SvtMenuOptions").GlobalNamespace())
         return true;
     if (dc.Class("SvtPathOptions").GlobalNamespace())
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
deleted file mode 100644
index 96fff5327def..000000000000
--- a/include/unotools/fontoptions.hxx
+++ /dev/null
@@ -1,86 +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_FONTOPTIONS_HXX
-#define INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
-
-#include <unotools/unotoolsdllapi.h>
-#include <sal/types.h>
-#include <unotools/options.hxx>
-#include <memory>
-
-namespace osl { class Mutex; }
-
-/*-************************************************************************************************************
-    @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 SvtFontOptions_Impl;
-
-/*-************************************************************************************************************
-    @short          collect information about font features
-    @devstatus      ready to use
-*//*-*************************************************************************************************************/
-
-class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtFontOptions final : public utl::detail::Options
-{
-    public:
-         SvtFontOptions();
-        virtual ~SvtFontOptions() override;
-
-        /*-****************************************************************************************************
-            @short      interface methods to get and set value of config key "org.openoffice.Office.Common/Font"
-            @descr      These values defines different states of font handling.
-
-                        ..ReplacementTable..()  =>  Determines if the list of font replacements is applied or not.
-
-                        ..FontHistory..()       =>  The last 5 fonts will be shown and the last one will be the
-                                                    first name on the list. These will be displayed in the Font name
-                                                    combo box on the Object bar.
-
-                        ..FontWYSIWYG..()       =>  With this option the names of the selectable fonts
-                                                    (for example, the fonts in the Font field in the object bar)
-                                                    will be formatted as the current font.
-            @onerror    No error should occur!
-        *//*-*****************************************************************************************************/
-
-        bool        IsFontHistoryEnabled        (                   ) const;
-
-        bool        IsFontWYSIWYGEnabled        (                   ) const;
-        void        EnableFontWYSIWYG           ( bool bState   );
-    private:
-
-        /*-****************************************************************************************************
-            @short      return a reference to a static mutex
-            @descr      These class use his own static mutex to be threadsafe.
-                        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& impl_GetOwnStaticMutex();
-    private:
-        std::shared_ptr<SvtFontOptions_Impl> m_pImpl;
-
-};      // class SvtFontOptions
-
-#endif // INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 857eb34808b1..776d3ca9aed7 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -45,8 +45,6 @@ enum class EItem
     EventConfig                   ,
     ExtendedSecurityOptions       ,
 
-    FontOptions                   ,
-
     HelpOptions                   ,   // 2
     HistoryOptions                ,
 
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index edb9818f4d48..2431d37a0d48 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7234,7 +7234,6 @@ include/unotools/fltrcfg.hxx
 include/unotools/fontcfg.hxx
 include/unotools/fontcvt.hxx
 include/unotools/fontdefs.hxx
-include/unotools/fontoptions.hxx
 include/unotools/historyoptions.hxx
 include/unotools/intlwrapper.hxx
 include/unotools/itemholderbase.hxx
@@ -16272,7 +16271,6 @@ unotools/source/config/eventcfg.cxx
 unotools/source/config/extendedsecurityoptions.cxx
 unotools/source/config/fltrcfg.cxx
 unotools/source/config/fontcfg.cxx
-unotools/source/config/fontoptions.cxx
 unotools/source/config/historyoptions.cxx
 unotools/source/config/itemholder1.cxx
 unotools/source/config/itemholder1.hxx
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 <unotools/fontoptions.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <rtl/instance.hxx>
-#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<nPropertyCount; ++nProperty )
-    {
-        // Safe impossible cases.
-        // Check any for valid value.
-        DBG_ASSERT( seqValues[nProperty].hasValue(), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nInvalid property value detected!\n" );
-        switch( nProperty )
-        {
-            case PROPERTYHANDLE_REPLACEMENTTABLE    :   {
-                                                            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\Substitution\\Replacement\"?" );
-                                                            seqValues[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<nCount; ++nProperty )
-    {
-        if( seqPropertyNames[nProperty] == PROPERTYNAME_REPLACEMENTTABLE )
-        {
-            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\Font\\Substitution\\Replacement\"?" );
-            seqValues[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<nCount; ++nProperty )
-    {
-        switch( nProperty )
-        {
-            case PROPERTYHANDLE_REPLACEMENTTABLE    :   {
-                                                            seqValues[nProperty] <<= m_bReplacementTable;
-                                                        }
-                                                        break;
-            case PROPERTYHANDLE_FONTHISTORY         :   {
-                                                            seqValues[nProperty] <<= m_bFontHistory;
-                                                        }
-                                                        break;
-            case PROPERTYHANDLE_FONTWYSIWYG         :   {
-                                                            seqValues[nProperty] <<= m_bFontWYSIWYG;
-                                                        }
-                                                        break;
-        }
-    }
-    // Set properties in configuration.
-    PutProperties( seqNames, seqValues );
-}
-
-//  public method
-
-void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState )
-{
-    m_bFontWYSIWYG = bState;
-    SetModified();
-}
-
-//  private method
-
-Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
-{
-    return Sequence< OUString >
-    {
-        PROPERTYNAME_REPLACEMENTTABLE   ,
-        PROPERTYNAME_FONTHISTORY        ,
-        PROPERTYNAME_FONTWYSIWYG        ,
-    };
-}
-
-namespace {
-
-std::weak_ptr<SvtFontOptions_Impl> 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<SvtFontOptions_Impl>();
-        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<osl::Mutex, theFontOptionsMutex> {};
-}
-
-//  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 <unotools/defaultoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
-#include <unotools/fontoptions.hxx>
 #include <unotools/historyoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -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;