diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-27 15:38:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-27 21:17:36 +0200 |
| commit | 3e41c06607737e3ab91545644abe2761dcba1157 (patch) | |
| tree | 061782d28095fe1a9243c256da6232a62bf325f1 /filter | |
| parent | 53491f8a66d72176aab332983f9aff47ecd3d654 (diff) | |
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@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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) |