diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2024-11-05 18:50:18 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2025-03-21 20:11:41 +0100 |
| commit | 1efddf160508c2fdd860ad3815c553aaaa6aa460 (patch) | |
| tree | afd756f250a4e4dc70e7afe73ca22f1c4644d9d8 /include | |
| parent | e312cf46fe840f04b729600db9efe89d5f58d6fe (diff) | |
slideshow: create a placeholder even if text field content is hidden
A placeholder always needs to be exported even if the content is hidden
since it
could be visible on another slide and master page layers should be
cached on the
client.
In order to support text fields different from the default ones a hash
is used
for linking text field placeholder and text field content in place of
the text
field type.
Any text field content should be sent first, so that when the client try
to draw
a master page layer corresponding to a text field placeholder the
content is
already available.
Slideshow unit tests have been updated to match the new implementation.
Includes:
Author: Marco Cecchetti <marco.cecchetti@collabora.com>
AuthorDate: Tue Mar 11 18:46:13 2025 +0100
AnnotationTest: UniqueID regression
By when incrementing the static counter used by UniqueID has been moved
from getID() method to ctor, it's wrong to expect that created
annotations have consecutive ids.
Change-Id: I845888d141e0f02c2066a9cb17d89ab152bf28b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183201
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdobj.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index f5ee902d7778..297ee9530a61 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -31,6 +31,7 @@ #include <svx/svdtypes.hxx> #include <svx/svdobjkind.hxx> #include <svx/svxdllapi.h> +#include <tools/UniqueID.hxx> #include <tools/link.hxx> #include <tools/gen.hxx> #include <unotools/resmgr.hxx> @@ -268,6 +269,8 @@ public: virtual void SAL_CALL acquire() noexcept override final; virtual void SAL_CALL release() noexcept override final; + sal_uInt64 GetUniqueID() const { return maUniqueID.getID(); } + // SdrModel/SdrPage access on SdrObject level SdrPage* getSdrPageFromSdrObject() const; SdrModel& getSdrModelFromSdrObject() const; @@ -949,6 +952,7 @@ private: std::unique_ptr<Impl> mpImpl; SdrObjList* mpParentOfSdrObject; // list that includes this object sal_uInt32 m_nOrdNum; // order number of the object in the list + class UniqueID maUniqueID; std::unique_ptr<SfxGrabBagItem> m_pGrabBagItem; // holds the GrabBagItem property // Position in the navigation order. SAL_MAX_UINT32 when not used. sal_uInt32 mnNavigationPosition; |