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>
188 lines
7.0 KiB
C++
188 lines
7.0 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_OBJ3D_HXX
|
|
#define INCLUDED_SVX_OBJ3D_HXX
|
|
|
|
#include <svx/svdoattr.hxx>
|
|
#include <svx/svdobj.hxx>
|
|
#include <svx/svdgeodata.hxx>
|
|
#include <basegfx/matrix/b3dhommatrix.hxx>
|
|
#include <basegfx/range/b3drange.hxx>
|
|
#include <basegfx/polygon/b3dpolypolygon.hxx>
|
|
#include <svx/svxdllapi.h>
|
|
|
|
// Forward declarations
|
|
class E3dScene;
|
|
|
|
namespace sdr::properties {
|
|
class E3dCompoundProperties;
|
|
class E3dExtrudeProperties;
|
|
class E3dLatheProperties;
|
|
class E3dSphereProperties;
|
|
}
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* GeoData relevant for undo actions
|
|
|*
|
|
\************************************************************************/
|
|
|
|
class E3DObjGeoData : public SdrObjGeoData
|
|
{
|
|
public:
|
|
basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object
|
|
basegfx::B3DHomMatrix maTransformation; // local transformations
|
|
|
|
E3DObjGeoData() {}
|
|
};
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Base class for 3D objects
|
|
|*
|
|
\************************************************************************/
|
|
|
|
class SVXCORE_DLLPUBLIC E3dObject : public SdrAttrObj
|
|
{
|
|
// Allow everything for E3dObjList and E3dDragMethod
|
|
friend class E3dDragMethod;
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
|
|
|
|
protected:
|
|
virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
|
|
|
|
basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation)
|
|
basegfx::B3DHomMatrix maTransformation; // local transformation
|
|
basegfx::B3DHomMatrix maFullTransform; // global transformation (including. parents)
|
|
|
|
// Flags
|
|
bool mbTfHasChanged : 1;
|
|
bool mbIsSelected : 1;
|
|
|
|
protected:
|
|
virtual basegfx::B3DRange RecalcBoundVolume() const;
|
|
|
|
// E3dObject is only a helper class (for E3DScene and E3DCompoundObject)
|
|
// and no instances should be created from anyone, so i move the constructors
|
|
// to protected area
|
|
E3dObject(SdrModel& rSdrModel);
|
|
E3dObject(SdrModel& rSdrModel, E3dObject const & rSource);
|
|
|
|
// protected destructor
|
|
virtual ~E3dObject() override;
|
|
|
|
public:
|
|
virtual void StructureChanged();
|
|
virtual void SetTransformChanged();
|
|
virtual void RecalcSnapRect() override;
|
|
|
|
virtual SdrInventor GetObjInventor() const override;
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
|
|
virtual void NbcMove(const Size& rSize) override;
|
|
virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
|
|
|
|
E3dScene* getParentE3dSceneFromE3dObject() const;
|
|
virtual E3dScene* getRootE3dSceneFromE3dObject() const;
|
|
|
|
const basegfx::B3DRange& GetBoundVolume() const;
|
|
void InvalidateBoundVolume();
|
|
|
|
// calculate complete transformation including all parents
|
|
const basegfx::B3DHomMatrix& GetFullTransform() const;
|
|
|
|
// get and (re)set transformation matrix
|
|
const basegfx::B3DHomMatrix& GetTransform() const { return maTransformation;}
|
|
virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix);
|
|
virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix);
|
|
|
|
// 2D rotations, are implemented as a rotation around the Z axis
|
|
// which is vertical to the screen, plus a shift of the scene.
|
|
// This means that also the scene (E3dScene) must define this
|
|
// routine as virtual in its class.
|
|
virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs) override;
|
|
|
|
// get wireframe polygon for local object. No transform is applied.
|
|
basegfx::B3DPolyPolygon CreateWireframe() const;
|
|
|
|
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
|
|
virtual OUString TakeObjNameSingul() const override;
|
|
virtual OUString TakeObjNamePlural() const override;
|
|
|
|
virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
|
|
virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
|
|
virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override;
|
|
|
|
// get/set the selection
|
|
bool GetSelected() const { return mbIsSelected; }
|
|
virtual void SetSelected(bool bNew);
|
|
|
|
// break up
|
|
virtual bool IsBreakObjPossible();
|
|
virtual rtl::Reference<SdrAttrObj> GetBreakObj();
|
|
};
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Class for all compound objects (Cube, Lathe, Scene, Extrude)
|
|
|* This class saves some ISA queries and accelerates the behaviour
|
|
|* significantly, because all the attributes etc. are kept through this.
|
|
|* The polygons may only keep attributes if they are directly
|
|
|* subordinated to the scene.
|
|
|*
|
|
\************************************************************************/
|
|
|
|
class SVXCORE_DLLPUBLIC E3dCompoundObject : public E3dObject
|
|
{
|
|
// to allow sdr::properties::E3dCompoundProperties access to SetGeometryValid()
|
|
friend class sdr::properties::E3dCompoundProperties;
|
|
friend class sdr::properties::E3dExtrudeProperties;
|
|
friend class sdr::properties::E3dLatheProperties;
|
|
friend class sdr::properties::E3dSphereProperties;
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
|
|
|
|
protected:
|
|
virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
|
|
|
|
protected:
|
|
// convert given basegfx::B3DPolyPolygon to screen coor
|
|
basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate) const;
|
|
|
|
// protected destructor
|
|
virtual ~E3dCompoundObject() override;
|
|
|
|
public:
|
|
E3dCompoundObject(SdrModel& rSdrModel, E3dCompoundObject const & rSource);
|
|
E3dCompoundObject(SdrModel& rSdrModel);
|
|
|
|
virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
|
|
virtual sal_uInt32 GetHdlCount() const override;
|
|
virtual void AddToHdlList(SdrHdlList& rHdlList) const override;
|
|
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
virtual void RecalcSnapRect() override;
|
|
};
|
|
|
|
#endif // INCLUDED_SVX_OBJ3D_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|