diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-07 10:14:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-07 11:24:47 +0000 |
| commit | db0175bf3a4da8aec0e3607731b464c1ce91ee1d (patch) | |
| tree | 9c8c5a077f0fc0d83bf95e220fa53ef6a6adba02 /include/filter | |
| parent | f3a0ed5d63823a1a111de7330d4ddbaf4e0b6d41 (diff) | |
no need to allocate these separately
they are all one or two words in size
Change-Id: I44d60e9fca03ce6709551a660661dd2a6778fd7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148377
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 9c515615e0af..0fad50bf993f 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1202,7 +1202,7 @@ struct ImplPPTTextObj final : public salhelper::SimpleReferenceObject { sal_uInt32 mnShapeId; sal_uInt32 mnShapeMaster; - std::unique_ptr<PptOEPlaceholderAtom> mpPlaceHolderAtom; + std::optional<PptOEPlaceholderAtom> moPlaceHolderAtom; TSS_Type mnInstance; TSS_Type mnDestinationInstance; MSO_SPT meShapeType; @@ -1256,7 +1256,7 @@ public: void SetDestinationInstance( TSS_Type nInstance ) { mxImplTextObj->mnDestinationInstance = nInstance; } - PptOEPlaceholderAtom* GetOEPlaceHolderAtom() const { return mxImplTextObj->mpPlaceHolderAtom.get(); } + const std::optional<PptOEPlaceholderAtom> & GetOEPlaceHolderAtom() const { return mxImplTextObj->moPlaceHolderAtom; } sal_uInt32 GetTextFlags() const { return mxImplTextObj->mnTextFlags; } void SetVertical( bool bVertical ) { |