summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-21 09:59:25 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-21 11:07:21 +0000
commite0b71d8e5ac24b3a51ec7d9e4738de7c6367cbe9 (patch)
treefd633485465da4cf2c7eda0c99e3a0aa8f3b8be7 /sfx2
parentc6797f77635e543ad82ba30115bdd80535d52620 (diff)
remove newly unused SfxImageManager
Change-Id: If68637fe49b5d252ad4ec5d63d56261113be6a7c
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/Library_sfx.mk1
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx1
-rw-r--r--sfx2/source/appl/imagemgr.cxx1
-rw-r--r--sfx2/source/appl/newhelp.cxx1
-rw-r--r--sfx2/source/dialog/templdlg.cxx1
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx316
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx1
7 files changed, 0 insertions, 322 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 647078f5f500..642e96031230 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -293,7 +293,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/sidebar/UnoSidebar \
sfx2/source/statbar/stbitem \
sfx2/source/styles/StyleManager \
- sfx2/source/toolbox/imgmgr \
sfx2/source/toolbox/tbxitem \
sfx2/source/uitest/sfx_uiobject \
sfx2/source/view/classificationcontroller \
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index d80b88a71aea..9dd2e27ebfa8 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -462,7 +462,6 @@
#include <sfx2/frmdescr.hxx>
#include <sfx2/hintpost.hxx>
#include <sfx2/imagemgr.hxx>
-#include <sfx2/imgmgr.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/ipclient.hxx>
#include <sfx2/linkmgr.hxx>
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 56862e94e601..ad59dccc7a3a 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -31,7 +31,6 @@
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.hxx>
-#include <sfx2/imgmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/unoctitm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 6979b5ddfd5e..ce07b60f20eb 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -27,7 +27,6 @@
#include <sfx2/app.hxx>
#include "sfxtypes.hxx"
#include "panelist.hxx"
-#include <sfx2/imgmgr.hxx>
#include "srchdlg.hxx"
#include <sfx2/sfxhelp.hxx>
#include <svtools/treelistentry.hxx>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2d8d527b763d..fb562750e857 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -56,7 +56,6 @@
#include <sfx2/docfac.hxx>
#include <sfx2/doctempl.hxx>
#include <sfx2/module.hxx>
-#include <sfx2/imgmgr.hxx>
#include "helpid.hrc"
#include "appdata.hxx"
#include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
deleted file mode 100644
index 8b3d40113711..000000000000
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ /dev/null
@@ -1,316 +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 <memory>
-
-#include <sfx2/imgmgr.hxx>
-#include <sfx2/sfx.hrc>
-#include <sfx2/app.hxx>
-#include <sfx2/sfxresid.hxx>
-#include <sfx2/bindings.hxx>
-#include "statcach.hxx"
-#include <sfx2/module.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/toolbox.hxx>
-
-#include <tools/rcid.h>
-#include <tools/link.hxx>
-#include <svtools/miscopt.hxx>
-#include <osl/mutex.hxx>
-#include <rtl/instance.hxx>
-
-#include <comphelper/processfactory.hxx>
-
-#include <unordered_map>
-
-const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
-
-struct ToolBoxInf_Impl
-{
- VclPtr<ToolBox> pToolBox;
- SfxToolboxFlags nFlags;
-};
-
-class SfxImageManager_Impl
-{
-public:
- SvtMiscOptions m_aOpt;
- std::vector< ToolBoxInf_Impl* > m_aToolBoxes;
- sal_Int16 m_nSymbolsSize;
- ImageList* m_pImageList[IMAGELIST_COUNT];
- SfxModule& m_rModule;
- bool m_bAppEventListener;
-
- ImageList* GetImageList( bool bBig );
- Image GetImage( sal_uInt16 nId, bool bBig );
- void SetSymbolsSize_Impl( sal_Int16 );
-
- DECL_LINK( OptionsChanged_Impl, LinkParamNone*, void );
- DECL_LINK( SettingsChanged_Impl, VclSimpleEvent&, void );
-
- explicit SfxImageManager_Impl(SfxModule& rModule);
- ~SfxImageManager_Impl();
-};
-
-namespace
-{
- typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
-
- class theImageManagerImplMap :
- public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {};
-}
-
-static SfxImageManager_Impl* GetImageManager(SfxModule& rModule)
-{
- SolarMutexGuard aGuard;
-
- SfxImageManagerImplMap &rImageManager_ImplMap =
- theImageManagerImplMap::get();
- SfxImageManager_Impl* pImpl( nullptr );
- SfxModule* pModule(&rModule);
- SfxImageManagerImplMap::const_iterator pIter = rImageManager_ImplMap.find(pModule);
- if ( pIter != rImageManager_ImplMap.end() )
- pImpl = pIter->second.get();
- else
- {
- rImageManager_ImplMap[pModule].reset(new SfxImageManager_Impl(rModule));
- pImpl = rImageManager_ImplMap[pModule].get();
- }
- return pImpl;
-}
-
-static sal_Int16 impl_convertBools( bool bLarge )
-{
- sal_Int16 nIndex( 0 );
- if ( bLarge )
- nIndex += 1;
- return nIndex;
-}
-
-SfxImageManager_Impl::SfxImageManager_Impl(SfxModule& rModule)
- : m_rModule(rModule)
- , m_bAppEventListener(false)
-{
- m_nSymbolsSize = m_aOpt.GetCurrentSymbolsSize();
-
- for (ImageList* & rp : m_pImageList)
- rp = nullptr;
-
- m_aOpt.AddListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
- Application::AddEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
- m_bAppEventListener = true;
-}
-
-
-SfxImageManager_Impl::~SfxImageManager_Impl()
-{
- m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
- if (m_bAppEventListener)
- Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
- for (ToolBoxInf_Impl* p : m_aToolBoxes)
- delete p;
-}
-
-
-ImageList* SfxImageManager_Impl::GetImageList( bool bBig )
-{
- sal_Int32 nIndex = impl_convertBools( bBig );
- if ( !m_pImageList[nIndex] )
- {
- m_pImageList[nIndex] = m_rModule.GetImageList_Impl( bBig );
- }
-
- return m_pImageList[nIndex];
-}
-
-
-Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig )
-{
- ImageList* pImageList = GetImageList( bBig );
- if ( pImageList )
- return pImageList->GetImage( nId );
- return Image();
-}
-
-
-void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
-{
- SolarMutexGuard aGuard;
-
- if ( nNewSymbolsSize != m_nSymbolsSize )
- {
- m_nSymbolsSize = nNewSymbolsSize;
- bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
-
- for (ToolBoxInf_Impl* pInf : m_aToolBoxes)
- {
- if ( pInf->nFlags & SfxToolboxFlags::CHANGESYMBOLSET )
- {
- ToolBox *pBox = pInf->pToolBox;
- sal_uInt16 nCount = pBox->GetItemCount();
- for ( sal_uInt16 nPos=0; nPos<nCount; nPos++ )
- {
- sal_uInt16 nId = pBox->GetItemId( nPos );
- if ( pBox->GetItemType(nPos) == ToolBoxItemType::BUTTON )
- {
- pBox->SetItemImage( nId, GetImage( nId, bLarge ) );
- SfxStateCache *pCache = SfxViewFrame::Current()->GetBindings().GetStateCache( nId );
- if ( pCache )
- pCache->SetCachedState(false);
- }
- }
-
- if ( !pBox->IsFloatingMode() )
- {
- Size aActSize( pBox->GetSizePixel() );
- Size aSize( pBox->CalcWindowSizePixel() );
- if ( pBox->IsHorizontal() )
- aSize.Width() = aActSize.Width();
- else
- aSize.Height() = aActSize.Height();
-
- pBox->SetSizePixel( aSize );
- }
- }
- }
- }
-}
-
-
-IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void)
-{
- SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() );
-}
-
-
-IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void)
-{
- switch (rEvent.GetId())
- {
- case VclEventId::ObjectDying:
- if (m_bAppEventListener)
- {
- Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
- m_bAppEventListener = false;
- }
- break;
- case VclEventId::ApplicationDataChanged:
- // Check if toolbar button size have changed and we have to use system settings
- {
- sal_Int16 nSymbolsSize = m_aOpt.GetCurrentSymbolsSize();
- if (m_nSymbolsSize != nSymbolsSize)
- SetSymbolsSize_Impl(nSymbolsSize);
- }
- break;
- default:
- break;
- }
-}
-
-SfxImageManager::SfxImageManager(SfxModule& rModule)
-{
- pImp = ::GetImageManager(rModule);
-}
-
-SfxImageManager::~SfxImageManager()
-{
-}
-
-namespace
-{
- typedef std::unordered_map< SfxModule*, std::shared_ptr<SfxImageManager> > SfxImageManagerMap;
-
- class theImageManagerMap :
- public rtl::Static<SfxImageManagerMap, theImageManagerMap> {};
-}
-
-SfxImageManager* SfxImageManager::GetImageManager(SfxModule& rModule)
-{
- SolarMutexGuard aGuard;
- SfxImageManager* pSfxImageManager(nullptr);
-
- SfxImageManagerMap &rImageManagerMap = theImageManagerMap::get();
- SfxModule* pModule = &rModule;
- SfxImageManagerMap::const_iterator pIter = rImageManagerMap.find(pModule);
- if ( pIter != rImageManagerMap.end() )
- pSfxImageManager = pIter->second.get();
- else
- {
- rImageManagerMap[pModule].reset(new SfxImageManager(rModule));
- pSfxImageManager = rImageManagerMap[pModule].get();
- }
- return pSfxImageManager;
-}
-
-Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
-{
- ImageList* pImageList = pImp->GetImageList( bBig );
- if ( pImageList && pImageList->HasImageAtPos( nId ) )
- return pImageList->GetImage( nId );
- return Image();
-}
-
-Image SfxImageManager::GetImage( sal_uInt16 nId ) const
-{
- bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- return GetImage( nId, bLarge );
-}
-
-Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const
-{
- ImageList* pImageList = pImp->GetImageList( bBig );
- if (pImageList && pImageList->HasImageAtPos(nId))
- return pImageList->GetImage( nId );
- return Image();
-}
-
-Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
-{
- bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- return SeekImage( nId, bLarge );
-}
-
-void SfxImageManager::RegisterToolBox( ToolBox *pBox, SfxToolboxFlags nFlags )
-{
- SolarMutexGuard aGuard;
-
- ToolBoxInf_Impl* pInf = new ToolBoxInf_Impl;
- pInf->pToolBox = pBox;
- pInf->nFlags = nFlags;
- pImp->m_aToolBoxes.push_back( pInf );
-}
-
-
-void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
-{
- SolarMutexGuard aGuard;
-
- for ( size_t n=0; n < pImp->m_aToolBoxes.size(); n++ )
- {
- if ((pImp->m_aToolBoxes[n])->pToolBox == pBox )
- {
- delete pImp->m_aToolBoxes[n];
- pImp->m_aToolBoxes.erase( pImp->m_aToolBoxes.begin() + n );
- return;
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index be206c88de7c..ab32b9267313 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -87,7 +87,6 @@
#include <sfx2/unoctitm.hxx>
#include "helpid.hrc"
#include "workwin.hxx"
-#include <sfx2/imgmgr.hxx>
#include <sfx2/imagemgr.hxx>
#include <ctrlfactoryimpl.hxx>