[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source

[Eike Rathke]

 formula/source/ui/dlg/formula.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6e80c6b9d40408a745ab0ced5d217118985e4079
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Dec 18 12:25:54 2015 +0100

    tdf#96366 disable treeview results until fix available
    
    Since f82d89f35207fc1cfc00ad5cd914b74c55c3e3d2 EditThisFunc() and
    EditNextFunc() are used to iterate through the formula to obtain
    expression results to display in the treeview. Calling the Edit...()
    functions spoils about everything as it messes around with the edit
    state. As the name suggests..
    
    Change-Id: I8b35d85b7bbf8821b5a995e84f9dd88a0f6f00b9
    (cherry picked from commit 8217ddbfc863dd9b313d6b5eaecb1877e42b2d02)

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 0448045..3c1523c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -695,6 +695,8 @@ void FormulaDlg_Impl::MakeTree(StructPage* _pTree,SvTreeListEntry* pParent,Formu
 
                 if (bCalcSubformula)
                 {
+/* FIXME: tdf#96366 this simply does not work, disable until solved. */
+#if 0
                     OUString aStr;
                     OUString aEquals(" = ");
 
@@ -717,6 +719,7 @@ void FormulaDlg_Impl::MakeTree(StructPage* _pTree,SvTreeListEntry* pParent,Formu
                         m_pWndResult->SetText( aStr );
                     aStr = m_pWndResult->GetText();
                     pStructPage->GetTlbStruct()->SetEntryText(pEntry,aResult + aEquals + aStr);
+#endif
                 }
 
                 --Count;