C++ name lookup is hard, especially for clang tinderbox

Change-Id: I50a25e5cfa219bbdcf0a23c03b8e6a2cff72c3d6
This commit is contained in:
Michael Stahl
2014-08-20 17:11:12 +02:00
parent 9a42c59394
commit c310523a5f

View File

@@ -1232,7 +1232,7 @@ SwXFrame::~SwXFrame()
delete pProps;
}
template<class Interface, class Impl>
template<class Interface, class NameLookupIsHard>
uno::Reference<Interface>
SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
{
@@ -1244,7 +1244,9 @@ SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
}
if (!xFrame.is())
{
Impl *const pNew((pFrmFmt) ? new Impl(*pFrmFmt) : new Impl(&rDoc));
NameLookupIsHard *const pNew((pFrmFmt)
? new NameLookupIsHard(*pFrmFmt)
: new NameLookupIsHard(&rDoc));
xFrame.set(pNew);
if (pFrmFmt)
{