[Libreoffice-commits] core.git: Branch 'feature/fixes18' - sw/source

[László Németh]

 sw/source/core/txtnode/txtedt.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0965dc4c8e96b7bc6de49bdab7b55fef5f099e21
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Fri Mar 11 18:05:34 2016 +0100

    Revert "test autocompletion word collection"
    
    This reverts commit 6314d1eac6b0c622a6414c96d74a6dc3d5b19a33.

diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index fd912a5..5064e00 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1556,10 +1556,6 @@ SwRect SwTextFrame::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActP
     return aRet;
 }
 
-#if 1
-void SwTextFrame::CollectAutoCmplWrds( SwContentNode* , sal_Int32  )
-{}
-#else
 // Wird vom CollectAutoCmplWords gerufen
 void SwTextFrame::CollectAutoCmplWrds( SwContentNode* pActNode, sal_Int32 nActPos )
 {
@@ -1609,7 +1605,7 @@ void SwTextFrame::CollectAutoCmplWrds( SwContentNode* pActNode, sal_Int32 nActPo
     if (!bACWDirty)
         pNode->SetAutoCompleteWordDirty( false );
 }
-#endif
+
 /** Findet den TextFrame und sucht dessen CalcHyph */
 bool SwTextNode::Hyphenate( SwInterHyphInfo &rHyphInf )
 {