diff options
-rw-r--r-- | compilerplugins/clang/staticmethods.cxx | 1 | ||||
-rw-r--r-- | compilerplugins/clang/unusedvarsglobal.untouched.results | 2 | ||||
-rw-r--r-- | desktop/source/lib/init.cxx | 2 | ||||
-rw-r--r-- | include/svtools/slidesorterbaropt.hxx | 62 | ||||
-rw-r--r-- | solenv/clang-format/excludelist | 2 | ||||
-rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
-rw-r--r-- | svtools/source/config/slidesorterbaropt.cxx | 425 |
7 files changed, 0 insertions, 495 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 38180c1daa2c..a28d605b3af3 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -137,7 +137,6 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) || cdc.Class("SvtOptionsDrawinglayer").GlobalNamespace() || cdc.Class("SvtMenuOptions").GlobalNamespace() || cdc.Class("SvtToolPanelOptions").GlobalNamespace() - || cdc.Class("SvtSlideSorterBarOptions").GlobalNamespace() || (cdc.Class("SharedResources").Namespace("connectivity") .GlobalNamespace()) || (cdc.Class("OParseContextClient").Namespace("svxform") diff --git a/compilerplugins/clang/unusedvarsglobal.untouched.results b/compilerplugins/clang/unusedvarsglobal.untouched.results index 4fcb089e21b3..8f96ddf92ab3 100644 --- a/compilerplugins/clang/unusedvarsglobal.untouched.results +++ b/compilerplugins/clang/unusedvarsglobal.untouched.results @@ -26,8 +26,6 @@ desktop/source/lib/init.cxx:7379 svtools::ColorConfig aColorConfig desktop/source/lib/init.cxx:7380 SvtMiscOptions aSvtMiscOptions -desktop/source/lib/init.cxx:7381 - SvtSlideSorterBarOptions aSvtSlideSorterBarOptions desktop/source/lib/init.cxx:7382 SvtCommandOptions aSvtCommandOptions desktop/source/lib/init.cxx:7383 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index a54ebc6e469f..01ee10facc71 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -220,7 +220,6 @@ #include <svl/ctloptions.hxx> #include <svtools/colorcfg.hxx> #include <svtools/miscopt.hxx> -#include <svtools/slidesorterbaropt.hxx> #include <unotools/cmdoptions.hxx> #include <unotools/compatibility.hxx> #include <unotools/fltrcfg.hxx> @@ -7522,7 +7521,6 @@ static void preloadData() static SvtCTLOptions aSvtCTLOptions; static svtools::ColorConfig aColorConfig; static SvtMiscOptions aSvtMiscOptions; - static SvtSlideSorterBarOptions aSvtSlideSorterBarOptions; static SvtCommandOptions aSvtCommandOptions; static SvtCompatibilityOptions aSvtCompatibilityOptions; static SvtFilterOptions aSvtFilterOptions; diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx deleted file mode 100644 index 9250838fafff..000000000000 --- a/include/svtools/slidesorterbaropt.hxx +++ /dev/null @@ -1,62 +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 . - */ - -#pragma once - -#include <svtools/svtdllapi.h> -#include <unotools/options.hxx> -#include <memory> - -/** forward declaration to our private date container implementation - - 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 SvtSlideSorterBarOptions_Impl; - -/** collect information about sidebar group - - \attention This class is partially threadsafe. -*/ -class SVT_DLLPUBLIC SvtSlideSorterBarOptions final : public utl::detail::Options -{ - public: - SvtSlideSorterBarOptions(); - virtual ~SvtSlideSorterBarOptions() override; - - bool GetVisibleImpressView() const; - void SetVisibleImpressView( bool bVisible ); - bool GetVisibleOutlineView() const; - void SetVisibleOutlineView( bool bVisible ); - bool GetVisibleNotesView() const; - void SetVisibleNotesView( bool bVisible ); - bool GetVisibleHandoutView() const; - void SetVisibleHandoutView( bool bVisible ); - bool GetVisibleSlideSorterView() const; - void SetVisibleSlideSorterView( bool bVisible ); - bool GetVisibleDrawView() const; - void SetVisibleDrawView( bool bVisible ); - - - private: - std::shared_ptr<SvtSlideSorterBarOptions_Impl> m_pImpl; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 6f472b55d07a..2c194863e730 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5719,7 +5719,6 @@ include/svtools/rtftoken.h include/svtools/ruler.hxx include/svtools/scriptedtext.hxx include/svtools/sfxecode.hxx -include/svtools/slidesorterbaropt.hxx include/svtools/soerr.hxx include/svtools/statusbarcontroller.hxx include/svtools/stringtransfer.hxx @@ -11082,7 +11081,6 @@ svtools/source/config/itemholder2.hxx svtools/source/config/miscopt.cxx svtools/source/config/optionsdrawinglayer.cxx svtools/source/config/printoptions.cxx -svtools/source/config/slidesorterbaropt.cxx svtools/source/config/test/test.cxx svtools/source/control/accessibleruler.cxx svtools/source/control/accessibleruler.hxx diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 1b353f90d265..14658bbe9ea3 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/config/htmlcfg \ svtools/source/config/itemholder2 \ svtools/source/config/miscopt \ - svtools/source/config/slidesorterbaropt \ svtools/source/config/optionsdrawinglayer \ svtools/source/config/printoptions \ svtools/source/contnr/querydelete \ diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx deleted file mode 100644 index 4001c2de9e08..000000000000 --- a/svtools/source/config/slidesorterbaropt.cxx +++ /dev/null @@ -1,425 +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 <svtools/slidesorterbaropt.hxx> -#include <unotools/configitem.hxx> -#include <tools/debug.hxx> -#include <osl/diagnose.h> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Sequence.hxx> - -#include <comphelper/lok.hxx> -#include <comphelper/sequence.hxx> -#include <mutex> - -using namespace ::utl; -using namespace ::osl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star; - -constexpr OUStringLiteral ROOTNODE_SLIDESORTERBAR = u"Office.Impress/MultiPaneGUI/SlideSorterBar/Visible"; - -constexpr OUString PROPERTYNAME_VISIBLE_IMPRESSVIEW = u"ImpressView"_ustr; -#define PROPERTYHANDLE_VISIBLE_IMPRESSVIEW 0 -constexpr OUString PROPERTYNAME_VISIBLE_OUTLINEVIEW = u"OutlineView"_ustr; -#define PROPERTYHANDLE_VISIBLE_OUTLINEVIEW 1 -constexpr OUString PROPERTYNAME_VISIBLE_NOTESVIEW = u"NotesView"_ustr; -#define PROPERTYHANDLE_VISIBLE_NOTESVIEW 2 -constexpr OUString PROPERTYNAME_VISIBLE_HANDOUTVIEW = u"HandoutView"_ustr; -#define PROPERTYHANDLE_VISIBLE_HANDOUTVIEW 3 -constexpr OUString PROPERTYNAME_VISIBLE_SLIDESORTERVIEW = u"SlideSorterView"_ustr; -#define PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW 4 -constexpr OUString PROPERTYNAME_VISIBLE_DRAWVIEW = u"DrawView"_ustr; -#define PROPERTYHANDLE_VISIBLE_DRAWVIEW 5 - -static std::mutex & GetInitMutex() -{ - static std::mutex theSvtSlideSorterBarOptionsMutex; - return theSvtSlideSorterBarOptionsMutex; -} - - -class SvtSlideSorterBarOptions_Impl : public ConfigItem -{ - Sequence< OUString > m_seqPropertyNames; - - public: - - SvtSlideSorterBarOptions_Impl(); - ~SvtSlideSorterBarOptions_Impl() override; - - /** called for notify of configmanager - - 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. - - \sa baseclass ConfigItem - \param[in,out] seqPropertyNames is the list of properties which should be updated. - */ - virtual void Notify( const Sequence< OUString >& seqPropertyNames ) override; - - /** - loads required data from the configuration. It's called in the constructor to - read all entries and form ::Notify to re-read changed setting - */ - void Load( const Sequence< OUString >& rPropertyNames ); - - // public interface - bool m_bVisibleImpressView; - bool m_bVisibleOutlineView; - bool m_bVisibleNotesView; - bool m_bVisibleHandoutView; - bool m_bVisibleSlideSorterView; - bool m_bVisibleDrawView; - - private: - virtual void ImplCommit() final override; - - /** return list of key names of our configuration management which represent our module tree - - This method returns a static const list of key names. We need it to get needed values from - configuration management. - - \return A list of needed configuration keys is returned. - */ - static Sequence< OUString > GetPropertyNames(); - - void SetVisibleViewImpl( bool& bVisibleView, bool bVisible ); - - public: - void SetVisibleImpressView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleImpressView, bVisible ); } - - void SetVisibleOutlineView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleOutlineView, bVisible ); } - - void SetVisibleNotesView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleNotesView, bVisible ); } - - void SetVisibleHandoutView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleHandoutView, bVisible ); } - - void SetVisibleSlideSorterView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleSlideSorterView, bVisible ); } - - void SetVisibleDrawView( bool bVisible) - { SetVisibleViewImpl( m_bVisibleDrawView, bVisible ); } - -}; - -SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl() - // Init baseclasses first - : ConfigItem( ROOTNODE_SLIDESORTERBAR ) - , m_seqPropertyNames(GetPropertyNames()) - , m_bVisibleImpressView( false ) - , m_bVisibleOutlineView( false ) - , m_bVisibleNotesView( false ) - , m_bVisibleHandoutView( false ) - , m_bVisibleSlideSorterView( false ) - , m_bVisibleDrawView( false ) - -{ - // Use our static list of configuration keys to get his values. - Sequence< Any > seqValues = GetProperties( m_seqPropertyNames ); - - // 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( !(m_seqPropertyNames.getLength()!=seqValues.getLength()), - "SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()\nI miss some values of configuration keys!\n" ); - - // Copy values from list in right order to our internal member. - for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty ) - { - if (!seqValues[nProperty].hasValue()) - continue; - switch( nProperty ) - { - case PROPERTYHANDLE_VISIBLE_IMPRESSVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleImpressView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleImpressView\"!" ); - break; - } - case PROPERTYHANDLE_VISIBLE_OUTLINEVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleOutlineView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleOutlineView\"!" ); - break; - } - case PROPERTYHANDLE_VISIBLE_NOTESVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleNotesView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleNotesView\"!" ); - break; - } - case PROPERTYHANDLE_VISIBLE_HANDOUTVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleHandoutView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleHandoutView\"!" ); - break; - } - case PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleSlideSorterView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleSlideSorterView\"!" ); - break; - } - case PROPERTYHANDLE_VISIBLE_DRAWVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleDrawView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleDrawView\"!" ); - break; - } - } - } - - // Enable notification mechanism of our baseclass. - // We need it to get information about changes outside these class on our used configuration keys! - EnableNotification( m_seqPropertyNames ); -} - -SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl() -{ - if (IsModified()) - Commit(); -} - -void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) -{ - const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); - Sequence< Any > seqValues = GetProperties( rPropertyNames ); - - // 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( !(rPropertyNames.getLength()!=seqValues.getLength()), - "SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()\nI miss some values of configuration keys!\n" ); - - // Copy values from list in right order to our internal member. - for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty ) - { - if (!seqValues[nProperty].hasValue()) - continue; - switch( comphelper::findValue(aInternalPropertyNames, rPropertyNames[nProperty]) ) - { - case PROPERTYHANDLE_VISIBLE_IMPRESSVIEW: - { - if( !(seqValues[nProperty] >>= m_bVisibleImpressView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleImpressView\"!" ); - } - break; - case PROPERTYHANDLE_VISIBLE_OUTLINEVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleOutlineView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleOutlineView\"!" ); - } - break; - case PROPERTYHANDLE_VISIBLE_NOTESVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleNotesView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleNotesView\"!" ); - } - break; - case PROPERTYHANDLE_VISIBLE_HANDOUTVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleHandoutView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleHandoutView\"!" ); - } - break; - case PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleSlideSorterView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleSlideSorterView\"!" ); - } - break; - - case PROPERTYHANDLE_VISIBLE_DRAWVIEW : - { - if( !(seqValues[nProperty] >>= m_bVisibleDrawView) ) - OSL_FAIL("Wrong type of \"SlideSorterBar\\VisibleDrawView\"!" ); - } - break; - } - } -} - -void SvtSlideSorterBarOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) -{ - Load( rPropertyNames ); -} - -void SvtSlideSorterBarOptions_Impl::ImplCommit() -{ - // Get names of supported properties, create a list for values and copy current values to it. - sal_Int32 nCount = m_seqPropertyNames.getLength(); - Sequence< Any > seqValues ( nCount ); - auto seqValuesRange = asNonConstRange(seqValues); - for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) - { - switch( nProperty ) - { - case PROPERTYHANDLE_VISIBLE_IMPRESSVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleImpressView; - break; - } - case PROPERTYHANDLE_VISIBLE_OUTLINEVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleOutlineView; - break; - } - case PROPERTYHANDLE_VISIBLE_NOTESVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleNotesView; - break; - } - case PROPERTYHANDLE_VISIBLE_HANDOUTVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleHandoutView; - break; - } - case PROPERTYHANDLE_VISIBLE_SLIDESORTERVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleSlideSorterView; - break; - } - case PROPERTYHANDLE_VISIBLE_DRAWVIEW: - { - seqValuesRange[nProperty] <<= m_bVisibleDrawView; - break; - } - - } - } - // Set properties in configuration. - PutProperties( m_seqPropertyNames, seqValues ); -} - -Sequence< OUString > SvtSlideSorterBarOptions_Impl::GetPropertyNames() -{ - // Build list of configuration key names. - return - { - PROPERTYNAME_VISIBLE_IMPRESSVIEW, - PROPERTYNAME_VISIBLE_OUTLINEVIEW, - PROPERTYNAME_VISIBLE_NOTESVIEW, - PROPERTYNAME_VISIBLE_HANDOUTVIEW, - PROPERTYNAME_VISIBLE_SLIDESORTERVIEW, - PROPERTYNAME_VISIBLE_DRAWVIEW, - }; -} - -void SvtSlideSorterBarOptions_Impl::SetVisibleViewImpl( bool& bVisibleView, bool bVisible ) -{ - if( bVisibleView != bVisible ) - { - bVisibleView = bVisible; - SetModified(); - } -} - -namespace { - std::weak_ptr<SvtSlideSorterBarOptions_Impl> g_pSlideSorterBarOptions; -} - -SvtSlideSorterBarOptions::SvtSlideSorterBarOptions() -{ - // Global access, must be guarded (multithreading!). - std::unique_lock aGuard( GetInitMutex() ); - - m_pImpl = g_pSlideSorterBarOptions.lock(); - if( !m_pImpl ) - { - m_pImpl = std::make_shared<SvtSlideSorterBarOptions_Impl>(); - g_pSlideSorterBarOptions = m_pImpl; - } -} - -SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions() -{ - // Global access, must be guarded (multithreading!) - std::unique_lock aGuard( GetInitMutex() ); - - m_pImpl.reset(); -} - -bool SvtSlideSorterBarOptions::GetVisibleImpressView() const -{ - static const bool bRunningUnitTest = getenv("LO_TESTNAME"); - return m_pImpl->m_bVisibleImpressView && (!bRunningUnitTest || !comphelper::LibreOfficeKit::isActive()); -} - -void SvtSlideSorterBarOptions::SetVisibleImpressView(bool bVisible) -{ - m_pImpl->SetVisibleImpressView( bVisible ); -} - -bool SvtSlideSorterBarOptions::GetVisibleOutlineView() const -{ - return m_pImpl->m_bVisibleOutlineView; -} - -void SvtSlideSorterBarOptions::SetVisibleOutlineView(bool bVisible) -{ - m_pImpl->SetVisibleOutlineView( bVisible ); -} - -bool SvtSlideSorterBarOptions::GetVisibleNotesView() const -{ - return m_pImpl->m_bVisibleNotesView; -} - -void SvtSlideSorterBarOptions::SetVisibleNotesView(bool bVisible) -{ - m_pImpl->SetVisibleNotesView( bVisible ); -} - -bool SvtSlideSorterBarOptions::GetVisibleHandoutView() const -{ - return m_pImpl->m_bVisibleHandoutView; -} - -void SvtSlideSorterBarOptions::SetVisibleHandoutView(bool bVisible) -{ - m_pImpl->SetVisibleHandoutView( bVisible ); -} - -bool SvtSlideSorterBarOptions::GetVisibleSlideSorterView() const -{ - return m_pImpl->m_bVisibleSlideSorterView && !comphelper::LibreOfficeKit::isActive(); -} - -void SvtSlideSorterBarOptions::SetVisibleSlideSorterView(bool bVisible) -{ - m_pImpl->SetVisibleSlideSorterView( bVisible ); -} - -bool SvtSlideSorterBarOptions::GetVisibleDrawView() const -{ - return m_pImpl->m_bVisibleDrawView; -} - -void SvtSlideSorterBarOptions::SetVisibleDrawView(bool bVisible) -{ - m_pImpl->SetVisibleDrawView( bVisible ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |