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>
254 lines
8.9 KiB
C++
254 lines
8.9 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 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <svx/sdr/properties/defaultproperties.hxx>
|
|
#include <sdr/properties/itemsettools.hxx>
|
|
#include <svl/itempool.hxx>
|
|
#include <svl/itemset.hxx>
|
|
#include <svl/whiter.hxx>
|
|
#include <vector>
|
|
#include <svx/svdobj.hxx>
|
|
#include <libxml/xmlwriter.h>
|
|
#include <svx/svdmodel.hxx>
|
|
#include <svx/svdtrans.hxx>
|
|
#include <svx/xbtmpit.hxx>
|
|
#include <vcl/vectorgraphicdata.hxx>
|
|
|
|
namespace sdr::properties
|
|
{
|
|
SfxItemSet DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
|
|
{
|
|
// Basic implementation; Basic object has NO attributes
|
|
return SfxItemSet(rPool);
|
|
}
|
|
|
|
DefaultProperties::DefaultProperties(SdrObject& rObj)
|
|
: BaseProperties(rObj)
|
|
, m_itemPoolHolder(&rObj.getSdrModelFromSdrObject().GetItemPool())
|
|
{
|
|
}
|
|
|
|
DefaultProperties::DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj)
|
|
: BaseProperties(rObj)
|
|
, m_itemPoolHolder(&rObj.getSdrModelFromSdrObject().GetItemPool())
|
|
{
|
|
if(!rProps.moItemSet)
|
|
return;
|
|
|
|
// Clone may be to another model and thus another ItemPool.
|
|
// SfxItemSet supports that thus we are able to Clone all
|
|
// SfxItemState::SET items to the target pool.
|
|
moItemSet.emplace(rProps.moItemSet->CloneAsValue(
|
|
true,
|
|
&rObj.getSdrModelFromSdrObject().GetItemPool()));
|
|
|
|
// React on ModelChange: If metric has changed, scale items.
|
|
// As seen above, clone is supported, but scale is not included,
|
|
// thus: TTTT maybe add scale to SfxItemSet::Clone() (?)
|
|
// tdf#117707 correct ModelChange detection
|
|
const bool bModelChange(&rObj.getSdrModelFromSdrObject() != &rProps.GetSdrObject().getSdrModelFromSdrObject());
|
|
|
|
if(bModelChange)
|
|
{
|
|
const MapUnit aOldUnit(rProps.GetSdrObject().getSdrModelFromSdrObject().GetScaleUnit());
|
|
const MapUnit aNewUnit(rObj.getSdrModelFromSdrObject().GetScaleUnit());
|
|
const bool bScaleUnitChanged(aNewUnit != aOldUnit);
|
|
|
|
if(bScaleUnitChanged)
|
|
{
|
|
const double fMetricFactor(GetMapFactor(aOldUnit, aNewUnit).X());
|
|
|
|
ScaleItemSet(*moItemSet, fMetricFactor);
|
|
}
|
|
}
|
|
|
|
// do not keep parent info, this may be changed by later constructors.
|
|
// This class just copies the ItemSet, ignore parent.
|
|
if(moItemSet && moItemSet->GetParent())
|
|
{
|
|
moItemSet->SetParent(nullptr);
|
|
}
|
|
}
|
|
|
|
std::unique_ptr<BaseProperties> DefaultProperties::implCloneProperties(SdrObject& rObj) const
|
|
{
|
|
return std::unique_ptr<BaseProperties>(new DefaultProperties(*this, rObj));
|
|
}
|
|
|
|
DefaultProperties::~DefaultProperties() {}
|
|
|
|
const SfxItemSet& DefaultProperties::GetObjectItemSet() const
|
|
{
|
|
if(!moItemSet)
|
|
{
|
|
moItemSet.emplace(const_cast<DefaultProperties*>(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
|
|
const_cast<DefaultProperties*>(this)->ForceDefaultAttributes();
|
|
}
|
|
|
|
assert(moItemSet && "Could not create an SfxItemSet(!)");
|
|
|
|
return *moItemSet;
|
|
}
|
|
|
|
void DefaultProperties::SetObjectItem(const SfxPoolItem& rItem)
|
|
{
|
|
const sal_uInt16 nWhichID(rItem.Which());
|
|
|
|
if(!AllowItemChange(nWhichID, &rItem))
|
|
return;
|
|
|
|
ItemChange(nWhichID, &rItem);
|
|
PostItemChange(nWhichID);
|
|
|
|
const SfxPoolItem* pItem = &rItem;
|
|
ItemSetChanged( {&pItem, 1}, 0);
|
|
}
|
|
|
|
void DefaultProperties::SetObjectItemDirect(const SfxPoolItem& rItem)
|
|
{
|
|
const sal_uInt16 nWhichID(rItem.Which());
|
|
|
|
if(AllowItemChange(nWhichID, &rItem))
|
|
{
|
|
ItemChange(nWhichID, &rItem);
|
|
}
|
|
}
|
|
|
|
void DefaultProperties::ClearObjectItem(const sal_uInt16 nWhich)
|
|
{
|
|
if(!AllowItemChange(nWhich))
|
|
return;
|
|
|
|
ItemChange(nWhich);
|
|
PostItemChange(nWhich);
|
|
|
|
if(nWhich)
|
|
{
|
|
ItemSetChanged({}, nWhich);
|
|
}
|
|
}
|
|
|
|
void DefaultProperties::ClearObjectItemDirect(const sal_uInt16 nWhich)
|
|
{
|
|
if(AllowItemChange(nWhich))
|
|
{
|
|
ItemChange(nWhich);
|
|
}
|
|
}
|
|
|
|
void DefaultProperties::SetObjectItemSet(const SfxItemSet& rSet, bool bAdjustTextFrameWidthAndHeight)
|
|
{
|
|
if (rSet.HasItem(XATTR_FILLBITMAP))
|
|
{
|
|
const XFillBitmapItem* pItem = rSet.GetItem(XATTR_FILLBITMAP);
|
|
const std::shared_ptr<VectorGraphicData>& pVectorData
|
|
= pItem->GetGraphicObject().GetGraphic().getVectorGraphicData();
|
|
if (pVectorData)
|
|
{
|
|
// Shape is filled by a vector graphic: tell it our size as a hint.
|
|
basegfx::B2DTuple aSizeHint;
|
|
aSizeHint.setX(GetSdrObject().GetSnapRect().getOpenWidth());
|
|
aSizeHint.setY(GetSdrObject().GetSnapRect().getOpenHeight());
|
|
pVectorData->setSizeHint(aSizeHint);
|
|
}
|
|
}
|
|
|
|
SfxWhichIter aWhichIter(rSet);
|
|
sal_uInt16 nWhich(aWhichIter.FirstWhich());
|
|
std::vector< const SfxPoolItem * > aPostItemChangeList;
|
|
// give a hint to STL_Vector
|
|
aPostItemChangeList.reserve(rSet.Count());
|
|
|
|
while(nWhich)
|
|
{
|
|
const SfxPoolItem* pPoolItem;
|
|
if(SfxItemState::SET == aWhichIter.GetItemState(false, &pPoolItem))
|
|
{
|
|
if(AllowItemChange(nWhich, pPoolItem))
|
|
{
|
|
ItemChange(nWhich, pPoolItem);
|
|
aPostItemChangeList.emplace_back( pPoolItem );
|
|
}
|
|
}
|
|
|
|
nWhich = aWhichIter.NextWhich();
|
|
}
|
|
|
|
if(!aPostItemChangeList.empty())
|
|
{
|
|
for (const auto& rItem : aPostItemChangeList)
|
|
{
|
|
PostItemChange(rItem->Which());
|
|
}
|
|
|
|
ItemSetChanged(aPostItemChangeList, 0, bAdjustTextFrameWidthAndHeight);
|
|
}
|
|
}
|
|
|
|
void DefaultProperties::ItemSetChanged(std::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/, bool /*bAdjustTextFrameWidthAndHeight*/)
|
|
{
|
|
}
|
|
|
|
bool DefaultProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void DefaultProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
|
|
{
|
|
}
|
|
|
|
void DefaultProperties::PostItemChange(const sal_uInt16 nWhich )
|
|
{
|
|
if( (nWhich == XATTR_FILLSTYLE) && moItemSet )
|
|
CleanupFillProperties(*moItemSet);
|
|
}
|
|
|
|
void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/,
|
|
bool /*bBroadcast*/, bool /*bAdjustTextFrameWidthAndHeight*/)
|
|
{
|
|
// no StyleSheet in DefaultProperties
|
|
}
|
|
|
|
SfxStyleSheet* DefaultProperties::GetStyleSheet() const
|
|
{
|
|
// no StyleSheet in DefaultProperties
|
|
return nullptr;
|
|
}
|
|
|
|
void DefaultProperties::ForceDefaultAttributes()
|
|
{
|
|
}
|
|
|
|
void DefaultProperties::dumpAsXml(xmlTextWriterPtr pWriter) const
|
|
{
|
|
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
|
|
BaseProperties::dumpAsXml(pWriter);
|
|
if (moItemSet)
|
|
{
|
|
moItemSet->dumpAsXml(pWriter);
|
|
}
|
|
(void)xmlTextWriterEndElement(pWriter);
|
|
}
|
|
} // end of namespace
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|