Similar to the previous patch.
regards,
-kris.
>From 14cf1044aa2d9fe0ed7fdcba44ecada4aec88d80 Mon Sep 17 00:00:00 2001
From: Kristian Rietveld <k...@lanedo.com>
Date: Sat, 22 Oct 2011 10:17:59 +0200
Subject: [PATCH 8/8] Eliminate ambiguous conversion to cppu::OWeakObject
---
svx/source/form/fmdmod.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 807919e..e4ecc37 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -49,7 +49,7 @@ using namespace ::svxform;
else if ( ServiceSpecifier == ::rtl::OUString(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))
) )
{
SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
- xRet = *new SvxShapeControl(pObj);
+ xRet =
static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new
SvxShapeControl(pObj)));
}
if (!xRet.is())
xRet = SvxUnoDrawMSFactory::createInstance(ServiceSpecifier);
--
1.7.4.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
