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>
117 lines
4.6 KiB
C++
117 lines
4.6 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <svx/svdotext.hxx>
|
|
#include <svx/xpoly.hxx>
|
|
#include <svx/svxdllapi.h>
|
|
|
|
|
|
// Forward declaration
|
|
namespace sdr::properties {
|
|
class RectangleProperties;
|
|
}
|
|
|
|
|
|
// SdrRectObj
|
|
|
|
/// Rectangle objects (rectangle, circle, ...)
|
|
class SVXCORE_DLLPUBLIC SdrRectObj : public SdrTextObj
|
|
{
|
|
// to allow sdr::properties::RectangleProperties access to SetXPolyDirty()
|
|
friend class sdr::properties::RectangleProperties;
|
|
friend class SdrTextObj; // Due to SetXPolyDirty for GrowAdjust
|
|
|
|
virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
|
|
|
|
protected:
|
|
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
|
|
virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
|
|
|
|
std::optional<XPolygon> mpXPoly;
|
|
|
|
XPolygon ImpCalcXPoly(const tools::Rectangle& rRect1, tools::Long nRad1) const;
|
|
void SetXPolyDirty();
|
|
|
|
/// Subclasses should override RecalcXPoly() by creating an XPolygon
|
|
/// instance with new and assigning it to mpXPoly.
|
|
virtual void RecalcXPoly();
|
|
const XPolygon& GetXPoly() const;
|
|
virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override;
|
|
|
|
// protected destructor
|
|
virtual ~SdrRectObj() override;
|
|
|
|
public:
|
|
/**
|
|
* The corner radius parameter is dropped at some point.
|
|
* We need to set the corner radius via SfxItems later on, using SetAttributes()
|
|
*
|
|
* Constructor of a rectangular drawing object
|
|
*/
|
|
SdrRectObj(SdrModel& rSdrModel,
|
|
const tools::Rectangle& rRectangle = tools::Rectangle(),
|
|
std::optional<SdrObjKind> oeTextKind = std::nullopt);
|
|
|
|
// Copy constructor
|
|
SdrRectObj(SdrModel& rSdrModel, SdrRectObj const & rSource);
|
|
|
|
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
|
|
virtual SdrObjKind GetObjIdentifier() const override;
|
|
virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override;
|
|
|
|
virtual OUString TakeObjNameSingul() const override;
|
|
virtual OUString TakeObjNamePlural() const override;
|
|
|
|
virtual void RecalcSnapRect() override;
|
|
virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
|
|
virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
|
|
virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
|
|
|
|
virtual sal_uInt32 GetHdlCount() const override;
|
|
virtual void AddToHdlList(SdrHdlList& rHdlList) const override;
|
|
|
|
// Special drag methods
|
|
virtual bool hasSpecialDrag() const override;
|
|
virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override;
|
|
virtual bool applySpecialDrag(SdrDragStat& rDrag) override;
|
|
virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override;
|
|
|
|
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override;
|
|
virtual PointerStyle GetCreatePointer() const override;
|
|
|
|
virtual void NbcMove(const Size& rSiz) override;
|
|
virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
|
|
virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs) override;
|
|
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override;
|
|
virtual void NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override;
|
|
|
|
virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override;
|
|
virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override;
|
|
|
|
virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
|
|
|
|
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|