oox/source/vml/vmlformatting.cxx | 2 +-
sw/source/core/edit/edfcol.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 308fbd8cdf9ce0fc3921b6c4c58707609b486fb9
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Aug 16 14:32:19 2018 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Aug 16 16:44:09 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.k...@collabora.com>
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index d2132c0bc8b7..99c95eab372e 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
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 1de00b60633d..43ec52565128 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));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
