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

[David Tardon]

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

New commits:
commit 9a02de1e828b963f8130faed506e2dd01f5d190f
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 24 17:56:06 2016 +0200

    fix build
    
    Change-Id: I0ebad3c6ac5714514a5135d4006586d88c50e555

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index ddcd9ef..6831cb8 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -120,7 +120,7 @@ public:
         if (n > 0 && (size_t)n < getArgCount() )
         {
             OUString aUStr( maArgs[ n ] );
-            ScGlobal::EraseQuotes( aUStr );
+            ScGlobal::EraseQuotes( aUStr, '\'' );
             return aUStr;
         } else
             return OUString();
commit 2dc528d85bf534af7921218ef822bb64ee0896d9
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 24 17:56:58 2016 +0200

    make this cond. to avoid another removal
    
    Change-Id: I33793a1c82d7a3a8679964470057f2c3011fb145

diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index c41aaa4..2fde362 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -226,7 +226,9 @@ public:
 
     ScDocument&     GetDocument()   { return aDocument; }
     ScDocFunc&      GetDocFunc()    { return *pDocFunc; }
+#if ENABLE_TELEPATHY
     void            SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
+#endif
 
     SfxPrinter*     GetPrinter( bool bCreateIfNotExist = true );
     sal_uInt16      SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
commit 0c3642e8e8c018bcc2ee57d4ccda0449df84364b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 23 12:02:53 2015 +0100

    restore removed function for umpteenth time
    
    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 d5b2c92..c41aaa4 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 );