[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/unocore/unoframe.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c310523a5f33372e76b69545dbbee0809644bd0c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 20 17:11:12 2014 +0200

    C++ name lookup is hard, especially for clang tinderbox
    
    Change-Id: I50a25e5cfa219bbdcf0a23c03b8e6a2cff72c3d6

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 58be8ab..6eab659 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -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)
         {