bInterpret is always set false. Remove it.

Change-Id: I067f8eb4b81231e3ea7f084a6608c29e0dfeaf2b

5 files changed, 8 insertions, 12 deletions

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index f5cde9b36ec1..3e45a8c3ad7c 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -181,11 +181,10 @@ bool ScDocFuncSend::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell,
     return true; // needs some code auditing action
 }
 
-sal_Bool ScDocFuncSend::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
-                          sal_Bool bInterpret, sal_Bool bApi )
+bool ScDocFuncSend::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi )
 {
     SAL_INFO( "sc.tubes", "PutData not implemented!" );
-    return ScDocFunc::PutData( rPos, rEngine, bInterpret, bApi );
+    return ScDocFunc::PutData( rPos, rEngine, bApi );
 }
 
 bool ScDocFuncSend::SetCellText(
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index e1866ff4ec3a..5e4d147b4040 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -277,8 +277,7 @@ public:
     virtual bool SetStringCell( const ScAddress& rPos, const OUString& rStr, bool bInteraction );
     virtual bool SetEditCell( const ScAddress& rPos, const EditTextObject& rStr, bool bInteraction );
     virtual bool SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, bool bInteraction );
-    virtual sal_Bool    PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
-                                sal_Bool bInterpret, sal_Bool bApi );
+    virtual bool PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi );
     virtual bool SetCellText(
         const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish,
         bool bApi, const formula::FormulaGrammar::Grammar eGrammar );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c2f3df6ccc23..fc7e84e6b5e9 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1005,7 +1005,7 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
 
         typedef ::std::list<ScMyRememberItem*> ScMyRememberItemList;
 
-sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, sal_Bool bInterpret, sal_Bool bApi )
+bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi )
 {
     //  PutData ruft PutCell oder SetNormalString
 
@@ -1053,7 +1053,6 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngi
         // Set the paragraph attributes back to the EditEngine.
         if (!aRememberItems.empty())
         {
-//            ScMyRememberItem* pRememberItem = NULL;
             ScMyRememberItemList::iterator aItr = aRememberItems.begin();
             while (aItr != aRememberItems.end())
             {
@@ -1070,8 +1069,8 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngi
     }
     else
     {
-        String aText = rEngine.GetText();
-        if ( bInterpret || !aText.Len() )
+        OUString aText = rEngine.GetText();
+        if (aText.isEmpty())
         {
             bool bNumFmtSet = false;
             bRet = SetNormalString( bNumFmtSet, rPos, aText, bApi );
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index da96bb93c45c..6b6d1d405ec9 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -100,8 +100,7 @@ public:
      * must not delete it after passing it to this call.
      */
     virtual bool SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, bool bInteraction );
-    virtual sal_Bool        PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
-                                      sal_Bool bInterpret, sal_Bool bApi );
+    virtual bool PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi );
     virtual bool SetCellText(
         const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish, bool bApi,
         const formula::FormulaGrammar::Grammar eGrammar );
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 62f52340ccf1..fbd48a555a65 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -1031,7 +1031,7 @@ void ScCellTextData::UpdateData()
             //  or things like attributes after the text would be lost
             //  (are not stored in the cell)
             bInUpdate = sal_True;   // prevents bDataValid from being reset
-            pDocShell->GetDocFunc().PutData( aCellPos, *pEditEngine, false, sal_True ); // always as text
+            pDocShell->GetDocFunc().PutData(aCellPos, *pEditEngine, true); // always as text
 
             bInUpdate = false;
             bDirty = false;