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>
287 lines
11 KiB
C++
287 lines
11 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 <sdr/properties/e3dsceneproperties.hxx>
|
|
#include <svl/itemset.hxx>
|
|
#include <svl/whiter.hxx>
|
|
#include <svx/svddef.hxx>
|
|
#include <svx/scene3d.hxx>
|
|
#include <osl/diagnose.h>
|
|
#include <memory>
|
|
|
|
|
|
namespace sdr::properties
|
|
{
|
|
E3dSceneProperties::E3dSceneProperties(SdrObject& rObj)
|
|
: E3dProperties(rObj)
|
|
{
|
|
}
|
|
|
|
E3dSceneProperties::E3dSceneProperties(const E3dSceneProperties& rProps, SdrObject& rObj)
|
|
: E3dProperties(rProps, rObj)
|
|
{
|
|
}
|
|
|
|
E3dSceneProperties::~E3dSceneProperties()
|
|
{
|
|
}
|
|
|
|
std::unique_ptr<BaseProperties> E3dSceneProperties::implCloneProperties(SdrObject& rObj) const
|
|
{
|
|
return std::unique_ptr<BaseProperties>(new E3dSceneProperties(*this, rObj));
|
|
}
|
|
|
|
const SfxItemSet& E3dSceneProperties::GetMergedItemSet() const
|
|
{
|
|
// prepare ItemSet
|
|
if(moItemSet)
|
|
{
|
|
// filter for SDRATTR_3DSCENE_ items, only keep those items
|
|
SfxItemSet aNew(SfxItemSet::makeFixedSfxItemSet<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>(*moItemSet->GetPool()));
|
|
aNew.Put(*moItemSet);
|
|
moItemSet->ClearItem();
|
|
moItemSet->Put(aNew);
|
|
}
|
|
else
|
|
{
|
|
// No ItemSet yet, force local ItemSet
|
|
GetObjectItemSet();
|
|
}
|
|
|
|
// collect all ItemSets of contained 3d objects
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
|
|
if (pSub)
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
{
|
|
if(dynamic_cast<const E3dCompoundObject* >(pObj.get()))
|
|
{
|
|
const SfxItemSet& rSet = pObj->GetMergedItemSet();
|
|
SfxWhichIter aIter(rSet);
|
|
sal_uInt16 nWhich(aIter.FirstWhich());
|
|
|
|
while(nWhich)
|
|
{
|
|
// Leave out the SDRATTR_3DSCENE_ range, this would only be double
|
|
// and always equal.
|
|
if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
|
|
{
|
|
if(SfxItemState::INVALID == aIter.GetItemState(false))
|
|
{
|
|
moItemSet->InvalidateItem(nWhich);
|
|
}
|
|
else
|
|
{
|
|
moItemSet->MergeValue(rSet.Get(nWhich));
|
|
}
|
|
}
|
|
|
|
nWhich = aIter.NextWhich();
|
|
}
|
|
}
|
|
}
|
|
|
|
// call parent
|
|
return E3dProperties::GetMergedItemSet();
|
|
}
|
|
|
|
void E3dSceneProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems, bool bAdjustTextFrameWidthAndHeight)
|
|
{
|
|
// Set SDRATTR_3DOBJ_ range at contained objects.
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
const size_t nCount(nullptr == pSub ? 0 : pSub->GetObjCount());
|
|
|
|
if(nCount)
|
|
{
|
|
// Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
|
|
// #i50808# Leak fix, Clone produces a new instance and we get ownership here
|
|
std::unique_ptr<SfxItemSet> xNewSet(rSet.Clone());
|
|
|
|
for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
|
|
{
|
|
xNewSet->ClearItem(b);
|
|
}
|
|
|
|
if(xNewSet->Count())
|
|
{
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
{
|
|
if(dynamic_cast<const E3dCompoundObject* >(pObj.get()))
|
|
{
|
|
// set merged ItemSet at contained 3d object.
|
|
pObj->SetMergedItemSet(*xNewSet, bClearAllItems, bAdjustTextFrameWidthAndHeight);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// call parent. This will set items on local object, too.
|
|
E3dProperties::SetMergedItemSet(rSet, bClearAllItems, bAdjustTextFrameWidthAndHeight);
|
|
}
|
|
|
|
void E3dSceneProperties::SetMergedItem(const SfxPoolItem& rItem)
|
|
{
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
if (pSub)
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
pObj->SetMergedItem(rItem);
|
|
|
|
// #i43809# call parent. This will set items on local object, too.
|
|
E3dProperties::SetMergedItem(rItem);
|
|
}
|
|
|
|
void E3dSceneProperties::ClearMergedItem(const sal_uInt16 nWhich)
|
|
{
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
if (pSub)
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
pObj->ClearMergedItem(nWhich);
|
|
|
|
// #i43809# call parent. This will clear items on local object, too.
|
|
E3dProperties::ClearMergedItem(nWhich);
|
|
}
|
|
|
|
void E3dSceneProperties::PostItemChange(const sal_uInt16 nWhich)
|
|
{
|
|
// call parent
|
|
E3dProperties::PostItemChange(nWhich);
|
|
|
|
// local changes
|
|
E3dScene& rObj = static_cast<E3dScene&>(GetSdrObject());
|
|
rObj.StructureChanged();
|
|
|
|
switch(nWhich)
|
|
{
|
|
case SDRATTR_3DSCENE_PERSPECTIVE :
|
|
case SDRATTR_3DSCENE_DISTANCE :
|
|
case SDRATTR_3DSCENE_FOCAL_LENGTH :
|
|
{
|
|
// #83387#, #83391#
|
|
// one common function for the camera attributes
|
|
// since SetCamera() sets all three back to the ItemSet
|
|
Camera3D aSceneCam(rObj.GetCamera());
|
|
bool bChange(false);
|
|
|
|
// for SDRATTR_3DSCENE_PERSPECTIVE:
|
|
if(aSceneCam.GetProjection() != rObj.GetPerspective())
|
|
{
|
|
aSceneCam.SetProjection(rObj.GetPerspective());
|
|
bChange = true;
|
|
}
|
|
|
|
// for SDRATTR_3DSCENE_DISTANCE:
|
|
basegfx::B3DPoint aActualPosition(aSceneCam.GetPosition());
|
|
double fNew = rObj.GetDistance();
|
|
|
|
if(fNew != aActualPosition.getZ())
|
|
{
|
|
aSceneCam.SetPosition(basegfx::B3DPoint(aActualPosition.getX(), aActualPosition.getY(), fNew));
|
|
bChange = true;
|
|
}
|
|
|
|
// for SDRATTR_3DSCENE_FOCAL_LENGTH:
|
|
fNew = rObj.GetFocalLength() / 100.0;
|
|
|
|
if(aSceneCam.GetFocalLength() != fNew)
|
|
{
|
|
aSceneCam.SetFocalLength(fNew);
|
|
bChange = true;
|
|
}
|
|
|
|
// for all
|
|
if(bChange)
|
|
{
|
|
rObj.SetCamera(aSceneCam);
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void E3dSceneProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr,
|
|
bool bBroadcast, bool bAdjustTextFrameWidthAndHeight)
|
|
{
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
if (!pSub)
|
|
return;
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
{
|
|
if(bBroadcast)
|
|
pObj->SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
|
|
else
|
|
pObj->NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr, bAdjustTextFrameWidthAndHeight);
|
|
}
|
|
}
|
|
|
|
SfxStyleSheet* E3dSceneProperties::GetStyleSheet() const
|
|
{
|
|
SfxStyleSheet* pRetval = nullptr;
|
|
|
|
const SdrObjList* pSub(static_cast<const E3dScene&>(GetSdrObject()).GetSubList());
|
|
OSL_ENSURE(nullptr != pSub, "Children of SdrObject expected (!)");
|
|
if (!pSub)
|
|
return pRetval;
|
|
for (const rtl::Reference<SdrObject>& pObj : *pSub)
|
|
{
|
|
SfxStyleSheet* pCandidate = pObj->GetStyleSheet();
|
|
|
|
if(pRetval)
|
|
{
|
|
if(pCandidate != pRetval)
|
|
{
|
|
// different StyleSheelts, return none
|
|
return nullptr;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
pRetval = pCandidate;
|
|
}
|
|
}
|
|
|
|
return pRetval;
|
|
}
|
|
|
|
void E3dSceneProperties::SetSceneItemsFromCamera()
|
|
{
|
|
// force ItemSet
|
|
GetObjectItemSet();
|
|
|
|
E3dScene& rObj = static_cast<E3dScene&>(GetSdrObject());
|
|
const Camera3D& aSceneCam(rObj.GetCamera());
|
|
|
|
// ProjectionType
|
|
moItemSet->Put(Svx3DPerspectiveItem(aSceneCam.GetProjection()));
|
|
|
|
// CamPos
|
|
moItemSet->Put(makeSvx3DDistanceItem(static_cast<sal_uInt32>(aSceneCam.GetPosition().getZ() + 0.5)));
|
|
|
|
// FocalLength
|
|
moItemSet->Put(makeSvx3DFocalLengthItem(static_cast<sal_uInt32>((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
|
|
}
|
|
} // end of namespace
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|