diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2023-11-30 17:58:45 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-12-01 07:16:16 +0100 |
commit | facd5e4ef617f1adc1322dc17ce1ca15b7807d4f (patch) | |
tree | e8fb1518cb0aea79321ec565eba1524b97d89bfe /svl | |
parent | 963de9feb37105560fde14b44d992e47f341bb5b (diff) |
move the SfxItemPoolCache to sc/
and rename it to ScItemPoolCache,
since its only use is to handle ScPatternAttr objects
Change-Id: I68a2dd5f47fcf902f9df552e1a1767d5061d85d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160162
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/Library_svl.mk | 1 | ||||
-rw-r--r-- | svl/source/items/poolcach.cxx | 111 |
2 files changed, 0 insertions, 112 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 56923d712ced..04abb8c6cf3a 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -132,7 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/items/lckbitem \ svl/source/items/legacyitem \ svl/source/items/macitem \ - svl/source/items/poolcach \ svl/source/items/poolitem \ svl/source/items/ptitem \ svl/source/items/rectitem \ diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx deleted file mode 100644 index 957f9a37edb1..000000000000 --- a/svl/source/items/poolcach.cxx +++ /dev/null @@ -1,111 +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 <svl/itempool.hxx> -#include <svl/itemset.hxx> -#include <svl/setitem.hxx> -#include <svl/poolcach.hxx> -#include <tools/debug.hxx> - -SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, - const SfxPoolItem *pPutItem ): - pPool(pItemPool), - pSetToPut( nullptr ), - pItemToPut( &pItemPool->DirectPutItemInPool(*pPutItem) ) -{ - DBG_ASSERT(pItemPool, "No Pool provided"); -} - - -SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, - const SfxItemSet *pPutSet ): - pPool(pItemPool), - pSetToPut( pPutSet ), - pItemToPut( nullptr ) -{ - DBG_ASSERT(pItemPool, "No Pool provided"); -} - - -SfxItemPoolCache::~SfxItemPoolCache() -{ - for (const SfxItemModifyImpl & rImpl : m_aCache) { - pPool->DirectRemoveItemFromPool( *rImpl.pPoolItem ); - pPool->DirectRemoveItemFromPool( *rImpl.pOrigItem ); - } - - if ( pItemToPut ) - pPool->DirectRemoveItemFromPool( *pItemToPut ); -} - - -const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem ) -{ - DBG_ASSERT( pPool == rOrigItem.GetItemSet().GetPool(), "invalid Pool" ); - DBG_ASSERT( IsDefaultItem( &rOrigItem ) || IsPooledItem( &rOrigItem ), - "original not in pool" ); - - // Find whether this Transformations ever occurred - for (const SfxItemModifyImpl & rMapEntry : m_aCache) - { - // use Item PtrCompare OK - if ( areSfxPoolItemPtrsEqual(rMapEntry.pOrigItem, &rOrigItem) ) - { - // Did anything change at all? use Item PtrCompare OK - if ( !areSfxPoolItemPtrsEqual(rMapEntry.pPoolItem, &rOrigItem) ) - { - rMapEntry.pPoolItem->AddRef(2); // One for the cache - pPool->DirectPutItemInPool( rOrigItem ); //FIXME: AddRef? - } - return *rMapEntry.pPoolItem; - } - } - - // Insert the new attributes in a new Set - std::unique_ptr<SfxSetItem> pNewItem(rOrigItem.Clone()); - if ( pItemToPut ) - { - pNewItem->GetItemSet().Put( *pItemToPut ); - DBG_ASSERT( areSfxPoolItemPtrsEqual(&pNewItem->GetItemSet().Get( pItemToPut->Which() ), pItemToPut), - "wrong item in temporary set" ); - } - else - pNewItem->GetItemSet().Put( *pSetToPut ); - const SfxSetItem* pNewPoolItem = &pPool->DirectPutItemInPool( std::move(pNewItem) ); - - // Adapt refcount; one each for the cache - pNewPoolItem->AddRef( !areSfxPoolItemPtrsEqual(pNewPoolItem, &rOrigItem) ? 2 : 1 ); - pPool->DirectPutItemInPool( rOrigItem ); //FIXME: AddRef? - - // Add the transformation to the cache - SfxItemModifyImpl aModify; - aModify.pOrigItem = &rOrigItem; - aModify.pPoolItem = const_cast<SfxSetItem*>(pNewPoolItem); - m_aCache.push_back( aModify ); - - DBG_ASSERT( !pItemToPut || - areSfxPoolItemPtrsEqual(&pNewPoolItem->GetItemSet().Get( pItemToPut->Which() ), pItemToPut), - "wrong item in resulting set" ); - - return *pNewPoolItem; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |