[Libreoffice-commits] core.git: svx/source

[Noel Grandin (via logerrit)]

 svx/source/xml/xmlgrhlp.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 95684fb99ebed5b53bda99957c43466541597b2f
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Sep 18 12:13:30 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 19 10:31:37 2022 +0200

    no need to allocate these separately
    
    Change-Id: I5e61c783806d78df94fa08840f7d3f37f1a743ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140114
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index e2e452d51ae9..b60a5c9a9260 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -224,10 +224,10 @@ private:
 
 private:
 
-    std::unique_ptr<::utl::TempFile> mpTmp;
+    std::optional<::utl::TempFile>   moTmp;
     SvStream*                        mpOStm;
     Reference< XOutputStream >       mxStmWrapper;
-    std::unique_ptr<GraphicObject>   mxGrfObj;
+    std::optional<GraphicObject>     moGrfObj;
     bool                             mbClosed;
 
 public:
@@ -243,13 +243,13 @@ public:
 };
 
 SvXMLGraphicOutputStream::SvXMLGraphicOutputStream()
-    : mpTmp(new ::utl::TempFile)
-    , mxGrfObj(new GraphicObject)
+    : moTmp(std::in_place)
+    , moGrfObj(std::in_place)
     , mbClosed(false)
 {
-    mpTmp->EnableKillingFile();
+    moTmp->EnableKillingFile();
 
-    mpOStm = mpTmp->GetStream( StreamMode::READWRITE );
+    mpOStm = moTmp->GetStream( StreamMode::READWRITE );
 
     if( mpOStm )
         mxStmWrapper = new ::utl::OOutputStreamWrapper( *mpOStm );
@@ -257,7 +257,7 @@ SvXMLGraphicOutputStream::SvXMLGraphicOutputStream()
 
 SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream()
 {
-    mpTmp.reset();
+    moTmp.reset();
 }
 
 void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 
>& rData )
@@ -291,7 +291,7 @@ Graphic SvXMLGraphicOutputStream::GetGraphic()
 {
     Graphic aGraphic;
 
-    if (mbClosed && mxGrfObj->GetType() == GraphicType::NONE && mpOStm)
+    if (mbClosed && moGrfObj->GetType() == GraphicType::NONE && mpOStm)
     {
         mpOStm->Seek( 0 );
         sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
@@ -347,7 +347,7 @@ Graphic SvXMLGraphicOutputStream::GetGraphic()
     if (aGraphic.GetType() != GraphicType::NONE)
     {
         mpOStm = nullptr;
-        mpTmp.reset();
+        moTmp.reset();
     }
     return aGraphic;
 }
@@ -357,9 +357,9 @@ const GraphicObject& 
SvXMLGraphicOutputStream::GetGraphicObject()
     Graphic aGraphic(GetGraphic());
     if (aGraphic.GetType() != GraphicType::NONE)
     {
-        mxGrfObj.reset(new GraphicObject(std::move(aGraphic)));
+        moGrfObj.emplace(std::move(aGraphic));
     }
-    return *mxGrfObj;
+    return *moGrfObj;
 }
 
 }