ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity
Files
5519a3d4073ae4f04f8e1aa453fbc0ea9c8e19e4
odfstudio/include/svx/svdocapt.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

154 lines
6.9 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>
// Forward Declarations
class ImpCaptParams;
namespace sdr::properties {
class CaptionProperties;
}
// Helper Class SdrCaptObjGeoData
class SdrCaptObjGeoData final : public SdrTextObjGeoData
{
public:
tools::Polygon aTailPoly;
};
// SdrCaptionObj
class SVXCORE_DLLPUBLIC SdrCaptionObj final : public SdrRectObj
{
// to allow sdr::properties::CaptionProperties access to ImpRecalcTail()
friend class sdr::properties::CaptionProperties;
friend class SdrTextObj; // for ImpRecalcTail() during AutoGrow
// tdf#118662 exclusive friend function and setter for SuppressGetBitmap
friend void setSuppressGetBitmapFromXclObjComment(SdrCaptionObj* pSdrCaptionObj, bool bValue);
void setSuppressGetBitmap(bool bNew)
{
mbSuppressGetBitmap = bNew;
}
SAL_DLLPRIVATE virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
SAL_DLLPRIVATE virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
tools::Polygon maTailPoly; // the whole tail polygon
bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE
bool mbFixedTail; // for calc note box fixed tail, default FALSE
bool mbSuppressGetBitmap; // tdf#118662
Point maFixedTailPos; // for calc note box fixed tail position.
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const;
SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle const & rRect);
SVX_DLLPRIVATE void ImpRecalcTail();
// protected destructor
SAL_DLLPRIVATE virtual ~SdrCaptionObj() override;
SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> implCloneSdrObject(SdrModel& rTargetModel) const override;
public:
SAL_DLLPRIVATE SdrCaptionObj(SdrModel& rSdrModel);
// Copy constructor
SAL_DLLPRIVATE SdrCaptionObj(SdrModel& rSdrModel, SdrCaptionObj const & rSource);
SdrCaptionObj(SdrModel& rSdrModel, const tools::Rectangle& rRect, const Point& rTail);
// tdf#118662 getter for SuppressGetBitmap
bool isSuppressGetBitmap() const { return mbSuppressGetBitmap; }
SAL_DLLPRIVATE virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override;
// for calc: special shadow only for text box
void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = true; }
bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
// for calc: fixed note tail position.
void SetFixedTail() { mbFixedTail = true; }
bool IsFixedTail() const { return mbFixedTail; }
SAL_DLLPRIVATE virtual OUString TakeObjNameSingul() const override;
SAL_DLLPRIVATE virtual OUString TakeObjNamePlural() const override;
SAL_DLLPRIVATE virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
SAL_DLLPRIVATE virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) 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& rSiz) override;
SAL_DLLPRIVATE virtual void NbcResize(const Point& rRef, double xFact, double yFact) override;
SAL_DLLPRIVATE virtual void NbcSetRelativePos(const Point& rPnt) override;
SAL_DLLPRIVATE virtual Point GetRelativePos() const override;
virtual const tools::Rectangle& GetLogicRect() const override;
virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
SAL_DLLPRIVATE virtual sal_uInt32 GetSnapPointCount() const override;
SAL_DLLPRIVATE virtual Point GetSnapPoint(sal_uInt32 i) 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:
SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
const Point& GetTailPos() const;
void SetTailPos(const Point& rPos);
SAL_DLLPRIVATE void NbcSetTailPos(const Point& rPos);
// #i32599#
// Add own implementation for TRSetBaseGeometry to handle TailPos over changes
SAL_DLLPRIVATE virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override;
const Point& GetFixedTailPos() const {return maFixedTailPos;}
// geometry access
::basegfx::B2DPolygon getTailPolygon() const;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue View Git Blame Copy Permalink