[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sw/source

[Libreoffice Gerrit user]

 oox/source/vml/vmlformatting.cxx |    2 +-
 sw/source/core/edit/edfcol.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 67ac2e8adc708480aa4e28a81cec464938e43c86
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 16 14:32:19 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Aug 20 12:22:57 2018 +0200

    tdf#118385 Avoid crash on loading document
    
    Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9
    Reviewed-on: https://gerrit.libreoffice.org/59173
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 308fbd8cdf9ce0fc3921b6c4c58707609b486fb9)
    Reviewed-on: https://gerrit.libreoffice.org/59247
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 17a730a2f8d8..c015157fdd8a 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -960,7 +960,7 @@ void TextpathModel::pushToPropMap(ShapePropertyMap& rPropMap, const uno::Referen
     if (!moTrim.has() || !moTrim.get())
     {
         OUString sText = moString.get();
-        VclPtr<VirtualDevice> pDevice = VclPtr<VirtualDevice>::Create();
+        ScopedVclPtrInstance<VirtualDevice> pDevice;
         vcl::Font aFont = pDevice->GetFont();
         aFont.SetFamilyName(sFont);
         aFont.SetFontSize(Size(0, 96));
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index a9e7d1d05ad1..6486de18a102 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1483,7 +1483,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark,
     // Calc the ratio.
     double fRatio = 0;
 
-    VclPtr<VirtualDevice> pDevice = VclPtr<VirtualDevice>::Create();
+    ScopedVclPtrInstance<VirtualDevice> pDevice;
     vcl::Font aFont = pDevice->GetFont();
     aFont.SetFamilyName(sFont);
     aFont.SetFontSize(Size(0, 96));