[Libreoffice-commits] core.git: 3 commits - sc/source

[David Tardon]

 sc/source/ui/collab/sendfunc.cxx |    5 ++---
 sc/source/ui/collab/sendfunc.hxx |    2 +-
 sc/source/ui/inc/docsh.hxx       |    1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2adf4ae59a0d92e289bbd63c8ed3490a58c4cbbf
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 15 06:54:13 2016 +0100

    update return type
    
    Change-Id: I34b53e660263a1ff89de9c468f197ecc5e7fe9dd

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 1c8a387..fca719e 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -387,10 +387,10 @@ bool ScDocFuncSend::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell,
     return true; // needs some code auditing action
 }
 
-bool ScDocFuncSend::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi )
+void ScDocFuncSend::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi )
 {
     SAL_INFO( "sc.tubes", "PutData not implemented!" );
-    return ScDocFunc::PutData( rPos, rEngine, bApi );
+    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 d5b605d..3601e68 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -39,7 +39,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 bool PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, bool bApi );
+    virtual void 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 );
commit 18d357807496603a53300bfcdfaf4f5a3f1a6f0c
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 23 12:02:53 2015 +0100

    restore removed function
    
    It is used by the tubes collaboration stuff.
    
    Change-Id: I9e31f0588f6c400716fba29806c1dab462c32a43

diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index d0f93d4..23755ba 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -226,6 +226,7 @@ public:
 
     ScDocument&     GetDocument()   { return aDocument; }
     ScDocFunc&      GetDocFunc()    { return *pDocFunc; }
+    void            SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
 
     SfxPrinter*     GetPrinter( bool bCreateIfNotExist = true );
     sal_uInt16      SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
commit d41c44f9048e1877c129704842a0c59e90dce3d8
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Mar 14 15:28:17 2016 +0100

    WaE: unused variable
    
    Change-Id: I6e4f2043118cf0946628f50f51c3d5635b1ce682

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 7edda7a..1c8a387 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -309,7 +309,6 @@ ScDocFuncSend::~ScDocFuncSend()
 void ScDocFuncSend::EnterListAction( sal_uInt16 nNameResId )
 {
     // Want to group these operations for the other side ...
-    OUString aUndo( ScGlobal::GetRscString( nNameResId ) );
     ScChangeOpWriter aOp( "enterListAction" );
     aOp.appendInt( nNameResId ); // nasty but translate-able ...
     SendMessage( aOp );