Armin Le Grand (collabora)
5519a3d407
Until now the 'local' StyleSheet got set, but that may not be the same as the original. It was/gets identified just by searching by name and type, not comparing content. What to do? We could... (a) the Style-Friendly way: - check if StyleSheet is identical - if not, create a new in-between StyleSheet hosting missing Items - if yes, use, done. (b) the pragmatic/practical way: - Just hard-attribute the Items that are detected as different similar to what BurnInStyleSheetAttributes does/did, but only for a view differing Items (b) is the most simple for now, but will lead to more hard attributes. The other possibilities will be better in the long term. For now, I will use (b). Note that there are more cases in that VERY complex and grown stuff emerging from SdDrawDocument::PasteBookmarkAsPage. More things will need to be fixed, see this as a 1st step. Needed to adapt postProcessAfterCloneToDifferentModel due to UT testTdf96206 failing, see comment there for details. That 1st implementation showed weaknesses with those Items critical and only on MasterPages, so decided to give up on that and implement ContentCompare to SdPage::Equals. That was easier than thought: No parameter needed, only used by InsertBookmarkAsPage_FindDuplicateLayouts::operator(). Thus, SdPage::Equals needs no change, just SdrObject::Equals. Due to still problems with Items corrected in Objects on MasterPages I will for now exclude this. Could now isolate remaining problems, these are defaults and/or PresObj things on MasterPages. Important is that I can completely correct all Items for all Objects in postProcessAfterCloneToDifferentModel. I can react to these false-positives in the ContentCompare in SdrObject::Equals. Signed-off-by: Armin Le Grand (collabora) <Armin.LeGrand@collabora.com> Change-Id: I10e17c8d6a893dbe92ab716182f07bafce1f3284 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/6595 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Armin Le Grand <armin.legrand@collabora.com> (cherry picked from commit 92ffaeac04c5c8586006b026f29ce12fba3674f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211729 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
99 lines
4.3 KiB
C++
99 lines
4.3 KiB
C++
/* -*- 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_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
|
|
#define INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
|
|
|
|
#include <svx/sdr/properties/properties.hxx>
|
|
#include <svl/itemset.hxx>
|
|
#include <optional>
|
|
|
|
namespace sdr::properties
|
|
{
|
|
class GroupProperties final : public BaseProperties
|
|
{
|
|
// Clone() operator, normally just calls the local copy constructor
|
|
virtual std::unique_ptr<BaseProperties> implCloneProperties(SdrObject& rObj) const override;
|
|
|
|
// the to be used ItemSet
|
|
mutable std::optional<SfxItemSet> moMergedItemSet;
|
|
|
|
public:
|
|
// basic constructor
|
|
explicit GroupProperties(SdrObject& rObj);
|
|
|
|
// destructor
|
|
virtual ~GroupProperties() override;
|
|
|
|
// create a new object specific itemset with object specific ranges.
|
|
virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& pPool) override;
|
|
|
|
// get itemset
|
|
virtual const SfxItemSet& GetObjectItemSet() const override;
|
|
|
|
// get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
|
|
// be overridden e.g for group objects to return a merged ItemSet of the object.
|
|
// When using this method the returned ItemSet may contain items in the state
|
|
// SfxItemState::INVALID which means there were several such items with different
|
|
// values.
|
|
virtual const SfxItemSet& GetMergedItemSet() const override;
|
|
|
|
// Set merged ItemSet. Normally, this maps to SetObjectItemSet().
|
|
virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false, bool bAdjustTextFrameWidthAndHeight = true) override;
|
|
|
|
// set single item
|
|
virtual void SetObjectItem(const SfxPoolItem& rItem) override;
|
|
|
|
// set single item direct, do not do any notifies or things like that
|
|
virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override;
|
|
|
|
// clear single item
|
|
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
|
|
|
|
// clear single item direct, do not do any notifies or things like that.
|
|
// Also supports complete deletion of items when default parameter 0 is used.
|
|
virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override;
|
|
|
|
// Set a single item, iterate over hierarchies if necessary.
|
|
virtual void SetMergedItem(const SfxPoolItem& rItem) override;
|
|
|
|
// Clear a single item, iterate over hierarchies if necessary.
|
|
virtual void ClearMergedItem(const sal_uInt16 nWhich) override;
|
|
|
|
// set complete item set
|
|
virtual void SetObjectItemSet(const SfxItemSet& rSet, bool bAdjustTextFrameWidthAndHeight = true) override;
|
|
|
|
// set a new StyleSheet
|
|
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr,
|
|
bool bBroadcast, bool bAdjustTextFrameWidthAndHeight = true) override;
|
|
|
|
// get the local StyleSheet
|
|
virtual SfxStyleSheet* GetStyleSheet() const override;
|
|
|
|
// force all attributes which come from styles to hard attributes
|
|
// to be able to live without the style.
|
|
virtual void ForceStyleToHardAttributes() override;
|
|
};
|
|
} // end of namespace sdr::properties
|
|
|
|
|
|
#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|