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>
100 lines
4.2 KiB
C++
100 lines
4.2 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_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
|
|
#define INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
|
|
|
|
#include <svl/lstner.hxx>
|
|
#include <svl/stylesheetuser.hxx>
|
|
#include <svx/sdr/properties/defaultproperties.hxx>
|
|
|
|
|
|
namespace sdr::properties
|
|
{
|
|
class AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
|
|
{
|
|
// Clone() operator, normally just calls the local copy constructor
|
|
virtual std::unique_ptr<BaseProperties> implCloneProperties(SdrObject& rObj) const override;
|
|
|
|
// Regulates Styles/Items between models
|
|
virtual void postProcessAfterCloneToDifferentModel(const SdrObject& rSrcObj) override;
|
|
|
|
// core to set parent at SfxItemSet and to execute the hard attribute computations
|
|
void ImpSetParentAtSfxItemSet(bool bDontRemoveHardAttr);
|
|
|
|
// add style sheet, do all the necessary handling
|
|
void ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
|
|
|
|
// remove StyleSheet, do all the necessary handling
|
|
void ImpRemoveStyleSheet();
|
|
|
|
protected:
|
|
// create a new itemset
|
|
virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& pPool) override;
|
|
|
|
// Do the ItemChange, may do special handling
|
|
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override;
|
|
|
|
// react on ItemSet changes
|
|
virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich, bool bAdjustTextFrameWidthAndHeight = true) override;
|
|
|
|
// apply the correct SfyStyleSheet from SdrObject's SdrModel
|
|
virtual void applyDefaultStyleSheetFromSdrModel();
|
|
|
|
// basic constructor
|
|
explicit AttributeProperties(SdrObject& rObj);
|
|
|
|
// constructor for copying, but using new object
|
|
AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj);
|
|
|
|
public:
|
|
// Get the local ItemSet. This directly returns the local ItemSet of the object. No
|
|
// merging of ItemSets is done for e.g. Group objects.
|
|
virtual const SfxItemSet& GetObjectItemSet() const override final;
|
|
|
|
// destructor
|
|
virtual ~AttributeProperties() override;
|
|
|
|
// set a new StyleSheet and broadcast
|
|
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr,
|
|
bool bBroadcast, bool bAdjustTextFrameWidthAndHeight = true) override;
|
|
|
|
// get the installed 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;
|
|
|
|
// This is the Notify(...) from 2nd base class SfxListener
|
|
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
|
|
|
|
virtual bool isUsedByModel() const override;
|
|
private:
|
|
// the StyleSheet of this object
|
|
SfxStyleSheet* mpStyleSheet;
|
|
};
|
|
|
|
} // end of namespace sdr::properties
|
|
|
|
|
|
#endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|