strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/include/svx/svdovirt.hxx
Michael Stahl ae132145ff tdf#141386 svx,sw: fix setting name/title/description on SwVirtFlyDrawObj 
The problem is that setting the title via the dialog in Writer calls
SwFlyFrameFormat::SetObjTitle() which sets SwFrameFormat::msTitle and
SdrObject::m_pPlusData::aObjTitle on the master SwFlyDrawObj.

Now ViewContactOfSdrObj::embedToObjectSpecificInformation() is called
for the SwVirtFlyDrawObj, not the SwFlyDrawObj, because that one is not
on the SdrPage.

However, SwFlyFrameFormat::GetObjTitle() will return
SwFrameFormat::msTitle as a fallback.

So what's missing here is SwVirtFlyDrawObj must forward calls that
get/set model properties to its associated SwFlyDrawObj - implement that
in base class SdrVirtObj.

But note that this does not fix the reported PDF export bug - that was
already fixed by commit 122b4264d2 in sw
and this fix is for other users of ObjectInfoPrimitive2D.

Change-Id: Id306c44c67c069777373e5e4d55415176b513afc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143465
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-11-29 16:11:44 +01:00

156 lines
7 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/svdobj.hxx>
#include <svx/svxdllapi.h>
/**
* FIXME: The virtual object is not yet fully implemented and tested.
* At the moment we only use it in a derived class in Writer.
*/
class SVXCORE_DLLPUBLIC SdrVirtObj : public SdrObject
{
SdrVirtObj(const SdrVirtObj&) = delete;
public:
virtual sdr::properties::BaseProperties& GetProperties() const override;
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
rtl::Reference<SdrObject> mxRefObj; // Referenced drawing object
tools::Rectangle aSnapRect;
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override;
// protected destructor
virtual ~SdrVirtObj() override;
public:
SdrVirtObj(SdrModel& rSdrModel, SdrObject& rNewObj);
// Copy constructor
SdrVirtObj(SdrModel& rSdrModel, SdrVirtObj const& rSource);
SdrObject& ReferencedObj();
const SdrObject& GetReferencedObj() const;
virtual void NbcSetAnchorPos(const Point& rAnchorPos) override;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
virtual SdrInventor GetObjInventor() const override;
virtual SdrObjKind GetObjIdentifier() const override;
virtual SdrObjList* GetSubList() const override;
virtual void SetName(const OUString& rStr, const bool bSetChanged = true) override;
virtual const OUString& GetName() const override;
virtual void SetTitle(const OUString& rStr) override;
virtual OUString GetTitle() const override;
virtual void SetDescription(const OUString& rStr) override;
virtual OUString GetDescription() const override;
virtual const tools::Rectangle& GetCurrentBoundRect() const override;
virtual const tools::Rectangle& GetLastBoundRect() const override;
virtual void RecalcBoundRect() override;
virtual rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override;
virtual OUString TakeObjNameSingul() const override;
virtual OUString TakeObjNamePlural() const override;
// RotGrfFlyFrame: If true, this SdrObject supports only limited rotation
virtual bool HasLimitedRotation() const override;
virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
virtual sal_uInt32 GetHdlCount() const override;
virtual void AddToPlusHdlList(SdrHdlList& rHdlList, SdrHdl& rHdl) 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 getSpecialDragPoly(const SdrDragStat& rDrag) const override;
// FullDrag support
virtual bool supportsFullDrag() const override;
virtual rtl::Reference<SdrObject> getFullDragClone() const override;
virtual bool BegCreate(SdrDragStat& rStat) override;
virtual bool MovCreate(SdrDragStat& rStat) override;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
virtual bool BckCreate(SdrDragStat& rStat) override;
virtual void BrkCreate(SdrDragStat& rStat) override;
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override;
virtual void NbcMove(const Size& rSiz) override;
virtual void NbcResize(const Point& rRef, const Fraction& xFact,
const Fraction& 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 void Move(const Size& rSiz) override;
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact,
bool bUnsetRelative = true) override;
virtual void Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs) override;
virtual void Mirror(const Point& rRef1, const Point& rRef2) override;
virtual void Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override;
virtual void RecalcSnapRect() override;
virtual const tools::Rectangle& GetSnapRect() const override;
virtual void SetSnapRect(const tools::Rectangle& rRect) override;
virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
virtual const tools::Rectangle& GetLogicRect() const override;
virtual void SetLogicRect(const tools::Rectangle& rRect) override;
virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
virtual Degree100 GetRotateAngle() const override;
virtual Degree100 GetShearAngle(bool bVertical = false) const override;
virtual sal_uInt32 GetSnapPointCount() const override;
virtual Point GetSnapPoint(sal_uInt32 i) const override;
virtual bool IsPolyObj() const override;
virtual sal_uInt32 GetPointCount() const override;
virtual Point GetPoint(sal_uInt32 i) const override;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override;
virtual std::unique_ptr<SdrObjGeoData> GetGeoData() const override;
virtual void SetGeoData(const SdrObjGeoData& rGeo) override;
virtual void NbcReformatText() override;
virtual bool HasMacro() const override;
virtual SdrObject* CheckMacroHit(const SdrObjMacroHitRec& rRec) const override;
virtual PointerStyle GetMacroPointer(const SdrObjMacroHitRec& rRec) const override;
virtual void PaintMacro(OutputDevice& rOut, const tools::Rectangle& rDirtyRect,
const SdrObjMacroHitRec& rRec) const override;
virtual bool DoMacro(const SdrObjMacroHitRec& rRec) override;
// #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0)
virtual Point GetOffset() const;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue View git blame Copy permalink