diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-29 10:06:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-29 16:48:42 +0200 |
commit | 2d2497dd3cea9ad01f7ade0b2bf4129083cd5875 (patch) | |
tree | 3c99f83a9b43cb68eabbfec5daabefca551e5f85 /unotools | |
parent | 917fadedee4459ff75e78e1b746ba320503301e0 (diff) |
replace and drop MiscCfg
Change-Id: I5ea9e3663fc5d30d725cf18757badb9b9802da18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99675
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/Library_utl.mk | 1 | ||||
-rw-r--r-- | unotools/source/config/itemholder1.cxx | 5 | ||||
-rw-r--r-- | unotools/source/config/misccfg.cxx | 249 |
3 files changed, 0 insertions, 255 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 5db591fa2ff5..4838371364f8 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/config/historyoptions \ unotools/source/config/itemholder1 \ unotools/source/config/lingucfg \ - unotools/source/config/misccfg \ unotools/source/config/moduleoptions \ unotools/source/config/options \ unotools/source/config/optionsdlg \ diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 4bb1f23ec623..90d1690ac6ef 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <unotools/misccfg.hxx> #include <unotools/useroptions.hxx> #include <unotools/cmdoptions.hxx> #include <unotools/compatibility.hxx> @@ -163,10 +162,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) rItem.pItem.reset( new SvtPathOptions() ); break; - case EItem::MiscConfig : - rItem.pItem.reset( new ::utl::MiscCfg() ); - break; - case EItem::SecurityOptions : rItem.pItem.reset( new SvtSecurityOptions() ); break; diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx deleted file mode 100644 index 4941773afb65..000000000000 --- a/unotools/source/config/misccfg.cxx +++ /dev/null @@ -1,249 +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 <sal/config.h> - -#include <o3tl/any.hxx> -#include <unotools/misccfg.hxx> -#include <rtl/instance.hxx> -#include <unotools/configitem.hxx> -#include <tools/debug.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <osl/mutex.hxx> -#include "itemholder1.hxx" - -using namespace com::sun::star::uno; - -namespace utl -{ -class SfxMiscCfg; - -static std::weak_ptr<SfxMiscCfg> g_pOptions; - -class SfxMiscCfg : public utl::ConfigItem -{ -private: - bool bPaperSize; // printer warnings - bool bPaperOrientation; - bool bNotFound; - sal_Int32 nYear2000; // two digit year representation - - static css::uno::Sequence<OUString> GetPropertyNames(); - void Load(); - - virtual void ImplCommit() final override; - -public: - SfxMiscCfg( ); - virtual ~SfxMiscCfg( ) override; - - virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; - - bool IsNotFoundWarning() const {return bNotFound;} - void SetNotFoundWarning( bool bSet); - - bool IsPaperSizeWarning() const {return bPaperSize;} - void SetPaperSizeWarning(bool bSet); - - bool IsPaperOrientationWarning() const {return bPaperOrientation;} - void SetPaperOrientationWarning( bool bSet); - - // 0 ... 99 - sal_Int32 GetYear2000() const { return nYear2000; } - void SetYear2000( sal_Int32 nSet ); - -}; - -SfxMiscCfg::SfxMiscCfg() : - ConfigItem( "Office.Common" ), - bPaperSize(false), - bPaperOrientation (false), - bNotFound (false), - nYear2000( 1930 ) -{ - Load(); -} - -SfxMiscCfg::~SfxMiscCfg() -{ - if ( IsModified() ) - Commit(); -} - -void SfxMiscCfg::SetNotFoundWarning( bool bSet) -{ - if(bNotFound != bSet) - SetModified(); - bNotFound = bSet; -} - -void SfxMiscCfg::SetPaperSizeWarning( bool bSet) -{ - if(bPaperSize != bSet) - SetModified(); - bPaperSize = bSet; -} - -void SfxMiscCfg::SetPaperOrientationWarning( bool bSet) -{ - if(bPaperOrientation != bSet) - SetModified(); - bPaperOrientation = bSet; -} - -void SfxMiscCfg::SetYear2000( sal_Int32 nSet ) -{ - if(nYear2000 != nSet) - SetModified(); - nYear2000 = nSet; -} - -Sequence<OUString> SfxMiscCfg::GetPropertyNames() -{ - return - { - OUString("Print/Warning/PaperSize"), - OUString("Print/Warning/PaperOrientation"), - OUString("Print/Warning/NotFound"), - OUString("DateFormat/TwoDigitYear") - }; -} - -void SfxMiscCfg::Load() -{ - const Sequence<OUString>& rNames = GetPropertyNames(); - Sequence<Any> aValues = GetProperties(rNames); - EnableNotification(rNames); - const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed"); - if(aValues.getLength() == rNames.getLength()) - { - for(int nProp = 0; nProp < rNames.getLength(); nProp++) - { - if(pValues[nProp].hasValue()) - { - switch(nProp) - { - case 0: bPaperSize = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Print/Warning/PaperSize", - case 1: bPaperOrientation = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Print/Warning/PaperOrientation", - case 2: bNotFound = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Print/Warning/NotFound", - case 3: pValues[nProp] >>= nYear2000;break; //"DateFormat/TwoDigitYear", - } - } - } - } -} - -void SfxMiscCfg::Notify( const css::uno::Sequence<OUString>& ) -{ - Load(); -} - -void SfxMiscCfg::ImplCommit() -{ - const Sequence<OUString>& rNames = GetPropertyNames(); - Sequence<Any> aValues(rNames.getLength()); - Any* pValues = aValues.getArray(); - - for(int nProp = 0; nProp < rNames.getLength(); nProp++) - { - switch(nProp) - { - case 0: pValues[nProp] <<= bPaperSize;break; //"Print/Warning/PaperSize", - case 1: pValues[nProp] <<= bPaperOrientation;break; //"Print/Warning/PaperOrientation", - case 2: pValues[nProp] <<= bNotFound;break; //"Print/Warning/NotFound", - case 3: pValues[nProp] <<= nYear2000;break; //"DateFormat/TwoDigitYear", - } - } - PutProperties(rNames, aValues); -} - -namespace -{ - class LocalSingleton : public rtl::Static< osl::Mutex, LocalSingleton > - { - }; -} - -MiscCfg::MiscCfg( ) -{ - // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( LocalSingleton::get() ); - m_pImpl = g_pOptions.lock(); - if ( !m_pImpl ) - { - m_pImpl = std::make_shared<SfxMiscCfg>(); - g_pOptions = m_pImpl; - ItemHolder1::holdConfigItem(EItem::MiscConfig); - } - - m_pImpl->AddListener(this); -} - -MiscCfg::~MiscCfg( ) -{ - // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( LocalSingleton::get() ); - m_pImpl->RemoveListener(this); - m_pImpl.reset(); -} - -bool MiscCfg::IsNotFoundWarning() const -{ - return m_pImpl->IsNotFoundWarning(); -} - -void MiscCfg::SetNotFoundWarning( bool bSet) -{ - m_pImpl->SetNotFoundWarning( bSet ); -} - -bool MiscCfg::IsPaperSizeWarning() const -{ - return m_pImpl->IsPaperSizeWarning(); -} - -void MiscCfg::SetPaperSizeWarning(bool bSet) -{ - m_pImpl->SetPaperSizeWarning( bSet ); -} - -bool MiscCfg::IsPaperOrientationWarning() const -{ - return m_pImpl->IsPaperOrientationWarning(); -} - -void MiscCfg::SetPaperOrientationWarning( bool bSet) -{ - m_pImpl->SetPaperOrientationWarning( bSet ); -} - -sal_Int32 MiscCfg::GetYear2000() const -{ - return m_pImpl->GetYear2000(); -} - -void MiscCfg::SetYear2000( sal_Int32 nSet ) -{ - m_pImpl->SetYear2000( nSet ); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |