[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 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 343f0a37534a4c1c92d11ea548ed18d524cbc2cf
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 16 14:32:19 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 20 09:53:45 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>
    Reviewed-on: https://gerrit.libreoffice.org/59250
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 5861ed88bbe3..5bc4a8b238b9 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -961,7 +961,7 @@ void TextpathModel::pushToPropMap(ShapePropertyMap& rPropMap, const uno::Referen
     {
         OUString sText = moString.get();
         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));
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 1ec98d87bb0f..bf12303ba2c7 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1481,7 +1481,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));