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>
221 lines
6.8 KiB
C++
221 lines
6.8 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 <svx/strings.hrc>
|
|
#include <svx/deflt3d.hxx>
|
|
#include <svx/dialmgr.hxx>
|
|
#include <svx/svdobjkind.hxx>
|
|
#include <extrud3d.hxx>
|
|
|
|
#include <svx/svdopath.hxx>
|
|
#include <svx/svdmodel.hxx>
|
|
#include <svx/svx3ditems.hxx>
|
|
#include <svx/xlineit0.hxx>
|
|
#include <sdr/properties/e3dextrudeproperties.hxx>
|
|
#include <sdr/contact/viewcontactofe3dextrude.hxx>
|
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
|
#include <basegfx/polygon/b2dpolypolygontools.hxx>
|
|
#include <basegfx/polygon/b2dpolygontools.hxx>
|
|
#include <basegfx/polygon/b3dpolypolygontools.hxx>
|
|
#include <utility>
|
|
|
|
|
|
// DrawContact section
|
|
std::unique_ptr<sdr::contact::ViewContact> E3dExtrudeObj::CreateObjectSpecificViewContact()
|
|
{
|
|
return std::make_unique<sdr::contact::ViewContactOfE3dExtrude>(*this);
|
|
}
|
|
|
|
std::unique_ptr<sdr::properties::BaseProperties> E3dExtrudeObj::CreateObjectSpecificProperties()
|
|
{
|
|
return std::make_unique<sdr::properties::E3dExtrudeProperties>(*this);
|
|
}
|
|
|
|
// Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side
|
|
// surfaces rectangles from the passed PolyPolygon
|
|
E3dExtrudeObj::E3dExtrudeObj(
|
|
SdrModel& rSdrModel,
|
|
const E3dDefaultAttributes& rDefault,
|
|
basegfx::B2DPolyPolygon aPP,
|
|
double fDepth)
|
|
: E3dCompoundObject(rSdrModel),
|
|
maExtrudePolygon(std::move(aPP))
|
|
{
|
|
// since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here
|
|
basegfx::B2DHomMatrix aMirrorY;
|
|
aMirrorY.scale(1.0, -1.0);
|
|
maExtrudePolygon.transform(aMirrorY);
|
|
|
|
// Set Defaults
|
|
SetDefaultAttributes(rDefault);
|
|
|
|
// set extrude depth
|
|
GetProperties().SetObjectItemDirect(makeSvx3DDepthItem(static_cast<sal_uInt32>(fDepth + 0.5)));
|
|
}
|
|
|
|
E3dExtrudeObj::E3dExtrudeObj(SdrModel& rSdrModel)
|
|
: E3dCompoundObject(rSdrModel)
|
|
{
|
|
// Set Defaults
|
|
const E3dDefaultAttributes aDefault;
|
|
|
|
SetDefaultAttributes(aDefault);
|
|
}
|
|
|
|
E3dExtrudeObj::E3dExtrudeObj(SdrModel& rSdrModel, E3dExtrudeObj const & rSource)
|
|
: E3dCompoundObject(rSdrModel, rSource)
|
|
{
|
|
// Set Defaults
|
|
const E3dDefaultAttributes aDefault;
|
|
|
|
SetDefaultAttributes(aDefault);
|
|
|
|
maExtrudePolygon = rSource.maExtrudePolygon;
|
|
}
|
|
|
|
E3dExtrudeObj::~E3dExtrudeObj()
|
|
{
|
|
}
|
|
|
|
void E3dExtrudeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
|
|
{
|
|
GetProperties().SetObjectItemDirect(Svx3DSmoothNormalsItem(rDefault.GetDefaultExtrudeSmoothed()));
|
|
GetProperties().SetObjectItemDirect(Svx3DSmoothLidsItem(rDefault.GetDefaultExtrudeSmoothFrontBack()));
|
|
GetProperties().SetObjectItemDirect(Svx3DCharacterModeItem(rDefault.GetDefaultExtrudeCharacterMode()));
|
|
GetProperties().SetObjectItemDirect(Svx3DCloseFrontItem(rDefault.GetDefaultExtrudeCloseFront()));
|
|
GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultExtrudeCloseBack()));
|
|
|
|
// For extrudes use StdTexture in X and Y by default
|
|
GetProperties().SetObjectItemDirect(Svx3DTextureProjectionXItem(1));
|
|
GetProperties().SetObjectItemDirect(Svx3DTextureProjectionYItem(1));
|
|
}
|
|
|
|
SdrObjKind E3dExtrudeObj::GetObjIdentifier() const
|
|
{
|
|
return SdrObjKind::E3D_Extrusion;
|
|
}
|
|
|
|
rtl::Reference<SdrObject> E3dExtrudeObj::implCloneSdrObject(SdrModel& rTargetModel) const
|
|
{
|
|
return new E3dExtrudeObj(rTargetModel, *this);
|
|
}
|
|
|
|
// Set local parameters with geometry re-creating
|
|
|
|
void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew)
|
|
{
|
|
if(maExtrudePolygon != rNew)
|
|
{
|
|
maExtrudePolygon = rNew;
|
|
ActionChanged();
|
|
}
|
|
}
|
|
|
|
// Get the name of the object (singular)
|
|
|
|
OUString E3dExtrudeObj::TakeObjNameSingul() const
|
|
{
|
|
OUString sName(SvxResId(STR_ObjNameSingulExtrude3d));
|
|
|
|
OUString aName(GetName());
|
|
if (!aName.isEmpty())
|
|
{
|
|
sName += " '" + aName + "'";
|
|
}
|
|
return sName;
|
|
}
|
|
|
|
// Get the name of the object (plural)
|
|
|
|
OUString E3dExtrudeObj::TakeObjNamePlural() const
|
|
{
|
|
return SvxResId(STR_ObjNamePluralExtrude3d);
|
|
}
|
|
|
|
bool E3dExtrudeObj::IsBreakObjPossible()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
rtl::Reference<SdrAttrObj> E3dExtrudeObj::GetBreakObj()
|
|
{
|
|
basegfx::B3DPolyPolygon aFrontSide;
|
|
basegfx::B3DPolyPolygon aBackSide;
|
|
|
|
if(maExtrudePolygon.count())
|
|
{
|
|
basegfx::B2DPolyPolygon aTemp(maExtrudePolygon);
|
|
aTemp.removeDoublePoints();
|
|
aTemp = basegfx::utils::correctOrientations(aTemp);
|
|
const basegfx::B2VectorOrientation aOrient = basegfx::utils::getOrientation(aTemp.getB2DPolygon(0));
|
|
|
|
if(basegfx::B2VectorOrientation::Positive == aOrient)
|
|
{
|
|
aTemp.flip();
|
|
}
|
|
|
|
aFrontSide = basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(aTemp);
|
|
}
|
|
|
|
if(aFrontSide.count())
|
|
{
|
|
aBackSide = std::move(aFrontSide);
|
|
|
|
if(GetExtrudeDepth())
|
|
{
|
|
basegfx::B3DHomMatrix aTransform;
|
|
|
|
if(100 != GetPercentBackScale())
|
|
{
|
|
// scale polygon from center
|
|
const double fScaleFactor(GetPercentBackScale() / 100.0);
|
|
const basegfx::B3DRange aPolyPolyRange(basegfx::utils::getRange(aBackSide));
|
|
const basegfx::B3DPoint aCenter(aPolyPolyRange.getCenter());
|
|
|
|
aTransform.translate(-aCenter.getX(), -aCenter.getY(), -aCenter.getZ());
|
|
aTransform.scale(fScaleFactor, fScaleFactor, fScaleFactor);
|
|
aTransform.translate(aCenter.getX(), aCenter.getY(), aCenter.getZ());
|
|
}
|
|
|
|
// translate by extrude depth
|
|
aTransform.translate(0.0, 0.0, static_cast<double>(GetExtrudeDepth()));
|
|
|
|
aBackSide.transform(aTransform);
|
|
}
|
|
}
|
|
|
|
if(aBackSide.count())
|
|
{
|
|
// create PathObj
|
|
basegfx::B2DPolyPolygon aPoly = TransformToScreenCoor(aBackSide);
|
|
rtl::Reference<SdrPathObj> pPathObj(new SdrPathObj(getSdrModelFromSdrObject(), SdrObjKind::PolyLine, std::move(aPoly)));
|
|
|
|
SfxItemSet aSet(GetObjectItemSet());
|
|
aSet.Put(XLineStyleItem(css::drawing::LineStyle_SOLID));
|
|
pPathObj->SetMergedItemSet(aSet);
|
|
|
|
return pPathObj;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|