[Libreoffice] [PATCH] Eliminate ambiguous conversion to cppu::OWeakObject (in reportdesign)

[Kristian Rietveld]

This fixes the following error:

/source/libo/libo/reportdesign/source/core/sdr/ReportDrawPage.cxx:96:24:
error: ambiguous conversion from derived class 'SvxShapeControl' to base
class 'cppu::OWeakObject':
     class SvxShapeControl -> class SvxShapeText -> class SvxShape ->
SvxShape_UnoImplHelper -> class cppu::OWeakAggObject -> ::cppu::OWeakObject
     class SvxShapeControl -> class SvxShapeText -> class SvxUnoTextBase ->
class SvxUnoTextBase_Base -> SvxUnoTextBase_Base0 -> class
SvxUnoTextRangeBase -> SvxUnoTextRangeBase_Base -> class
cppu::OWeakAggObject -> ::cppu::OWeakObject
             xShape.set(*pShape,uno::UNO_QUERY);
                        ^~~~~~~

Of course, the real fix is possibly to fix the class hierarchy itself.



regards,

-kris.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0007-Eliminate-ambiguous-conversion-to-cppu-OWeakObject.patch
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20111022/9d1bd607/attachment.txt>