ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity
Files
5519a3d4073ae4f04f8e1aa453fbc0ea9c8e19e4
odfstudio/include/svx/svdocirc.hxx
T
Armin Le Grand (collabora) 5519a3d407 Correct StyleSheet handling when cloning to different Model II 
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>
2026-10-05 08:52:54 +02:00

142 lines
6.3 KiB
C++
Raw Blame History

/* -*- 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 <svx/svdorect.hxx>
#include <svx/svxdllapi.h>
namespace sdr::properties {
class CircleProperties;
}
// Helper class SdrCircObjGeoData
class SdrCircObjGeoData final : public SdrTextObjGeoData
{
public:
Degree100 nStartAngle;
Degree100 nEndAngle;
};
enum class SdrCircKind { Full, Section, Cut, Arc };
extern SVXCORE_DLLPUBLIC SdrCircKind ToSdrCircKind(SdrObjKind);
class SVXCORE_DLLPUBLIC SdrCircObj final : public SdrRectObj
{
// to allow sdr::properties::CircleProperties access to ImpSetAttrToCircInfo()
friend class sdr::properties::CircleProperties;
SAL_DLLPRIVATE virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
SAL_DLLPRIVATE virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
SdrCircKind meCircleKind;
Degree100 m_nStartAngle;
Degree100 m_nEndAngle;
SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrCircKind eKind, const tools::Rectangle& rRect1, Degree100 nStart, Degree100 nEnd) const;
SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat);
SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool
SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool
// returns sal_True if paint requires a XPolygon
SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
SVX_DLLPRIVATE virtual void RecalcXPoly() override;
SAL_DLLPRIVATE virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
// protected destructor - due to final, make private
SAL_DLLPRIVATE virtual ~SdrCircObj() override;
SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
public:
SAL_DLLPRIVATE SdrCircObj(
SdrModel& rSdrModel,
SdrCircKind eNewKind);
SdrCircObj(
SdrModel& rSdrModel,
SdrCircKind eNewKind,
const tools::Rectangle& rRect);
// Copy constructor
SAL_DLLPRIVATE SdrCircObj(SdrModel& rSdrModel, SdrCircObj const & rSource);
// 0=0.00Deg=3h 9000=90.00Deg=12h 18000=180.00Deg=9h 27000=270.00Deg=6h
// The circle is built up from StartAngle to EndWink anti-clockwise.
// If nNewStartAngle==nNewEndWink, then arc has an angle of 0 degrees.
// If nNewStartAngle+36000==nNewEndWink, then the arc has angle of 360 degrees.
SdrCircObj(
SdrModel& rSdrModel,
SdrCircKind eNewKind,
const tools::Rectangle& rRect,
Degree100 nNewStartAngle,
Degree100 nNewEndAngle);
SdrCircKind GetCircleKind() const { return meCircleKind; }
SAL_DLLPRIVATE virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override;
SAL_DLLPRIVATE virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override;
SAL_DLLPRIVATE virtual OUString TakeObjNameSingul() const override;
SAL_DLLPRIVATE virtual OUString TakeObjNamePlural() const override;
SAL_DLLPRIVATE virtual void RecalcSnapRect() override;
SAL_DLLPRIVATE virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
SAL_DLLPRIVATE virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
SAL_DLLPRIVATE virtual sal_uInt32 GetSnapPointCount() const override;
SAL_DLLPRIVATE virtual Point GetSnapPoint(sal_uInt32 i) const override;
SAL_DLLPRIVATE virtual sal_uInt32 GetHdlCount() const override;
SAL_DLLPRIVATE virtual void AddToHdlList(SdrHdlList& rHdlList) const override;
// special drag methods
SAL_DLLPRIVATE virtual bool hasSpecialDrag() const override;
SAL_DLLPRIVATE virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override;
SAL_DLLPRIVATE virtual bool applySpecialDrag(SdrDragStat& rDrag) override;
SAL_DLLPRIVATE virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override;
SAL_DLLPRIVATE virtual bool BegCreate(SdrDragStat& rStat) override;
SAL_DLLPRIVATE virtual bool MovCreate(SdrDragStat& rStat) override;
SAL_DLLPRIVATE virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
SAL_DLLPRIVATE virtual bool BckCreate(SdrDragStat& rStat) override;
SAL_DLLPRIVATE virtual void BrkCreate(SdrDragStat& rStat) override;
SAL_DLLPRIVATE virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override;
SAL_DLLPRIVATE virtual PointerStyle GetCreatePointer() const override;
SAL_DLLPRIVATE virtual void NbcMove(const Size& aSiz) override;
SAL_DLLPRIVATE virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
SAL_DLLPRIVATE virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override;
SAL_DLLPRIVATE virtual void NbcShear (const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override;
SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
private:
SAL_DLLPRIVATE virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
SAL_DLLPRIVATE virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
SAL_DLLPRIVATE virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override;
public:
Degree100 GetStartAngle() const { return m_nStartAngle; }
Degree100 GetEndAngle() const { return m_nEndAngle; }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue View Git Blame Copy Permalink