[Libreoffice-commits] core.git: filter/source include/filter

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx  |    4 ++--
 include/filter/msfilter/svdfppt.hxx |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3e41c06607737e3ab91545644abe2761dcba1157
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Jul 27 15:38:29 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 27 21:17:36 2018 +0200

    use boost::optional for OUString instead of std::unique_ptr
    
    Change-Id: I4539380956dad232f3ce92498b8f58a205fe00b1
    Reviewed-on: https://gerrit.libreoffice.org/58196
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d31da869b523..a7f5cd0fab9d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6774,7 +6774,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
                                             if (rPersistEntry.xHeaderFooterEntry->nAtom & 0x20000)    // auto date time
                                                 xEntry->SetDateTime(rPersistEntry.xHeaderFooterEntry->nAtom & 0xff);
                                             else
-                                                xEntry->xString.reset(new OUString(rPersistEntry.xHeaderFooterEntry->pPlaceholder[nVal]));
+                                                xEntry->xString = rPersistEntry.xHeaderFooterEntry->pPlaceholder[nVal];
                                         }
                                     }
                                     break;
@@ -6826,7 +6826,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
                                                             else if (!n)
                                                             {
                                                                 // End of format string
-                                                                xEntry->xString.reset(new OUString( aStr ));
+                                                                xEntry->xString = aStr;
                                                                 break;
                                                             }
                                                             else if (!inquote)
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 044ad88b43d2..5600200334d9 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -45,6 +45,7 @@
 #include <tools/solar.h>
 #include <vcl/graph.hxx>
 #include <salhelper/simplereferenceobject.hxx>
+#include <boost/optional.hpp>
 
 namespace boost {
     template <class T> class optional;
@@ -495,7 +496,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry
     sal_uInt16          nTextRangeEnd;
     std::unique_ptr<SvxFieldItem> xField1;
     std::unique_ptr<SvxFieldItem> xField2;
-    std::unique_ptr<OUString> xString;
+    boost::optional<OUString> xString;
 
     PPTFieldEntry()
         : nPos(0)