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

[Matúš Kukan]

 sc/inc/refreshtimer.hxx          |    5 +++--
 sc/source/ui/inc/datastreams.hxx |   27 ++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 5ad65cf4d8afb66c3da8034046d08b7399c1016c
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Wed Nov 13 11:19:33 2013 +0100

    remove broken friend declaration and make methods public instead
    
    Change-Id: I59b1a89cdd1269e6245bad9491916dfd1bcecea7

diff --git a/sc/source/ui/inc/datastreams.hxx b/sc/source/ui/inc/datastreams.hxx
index 124ebef..8233be1 100644
--- a/sc/source/ui/inc/datastreams.hxx
+++ b/sc/source/ui/inc/datastreams.hxx
@@ -16,7 +16,6 @@
 #include <boost/scoped_ptr.hpp>
 
 namespace datastreams { class CallerThread; }
-namespace { class DataStreamsDlg; }
 class ScDocShell;
 class ScDocument;
 class ScRange;
@@ -25,8 +24,19 @@ class Window;
 
 class DataStreams : boost::noncopyable
 {
-    friend DataStreamsDlg;
+public:
     enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP };
+    DataStreams(ScDocShell *pScDocShell);
+    ~DataStreams();
+    bool ImportData();
+    void MoveData();
+    void Set(const OUString& rUrl, bool bIsScript, const OUString& rRange,
+            sal_Int32 nLimit, MoveEnum eMove);
+    void ShowDialog(Window *pParent);
+    void Start();
+    void Stop();
+
+private:
     ScDocShell *mpScDocShell;
     ScDocument *mpScDocument;
     MoveEnum meMove;
@@ -37,19 +47,6 @@ class DataStreams : boost::noncopyable
     boost::scoped_ptr<ScRange> mpEndRange;
     boost::scoped_ptr<SvStream> mpStream;
     rtl::Reference<datastreams::CallerThread> mxThread;
-
-public:
-    DataStreams(ScDocShell *pScDocShell);
-    ~DataStreams();
-    bool ImportData();
-    void ShowDialog(Window *pParent);
-    void Start();
-    void Stop();
-
-private:
-    void MoveData();
-    void Set(const OUString& rUrl, bool bIsScript, const OUString& rRange,
-            sal_Int32 nLimit, MoveEnum eMove);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 22a7c9c0a6301ab497d91e0370164c3c9e3cf988
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Wed Nov 13 11:14:06 2013 +0100

    ScRefreshTimer: export virtual methods and if possible mark SAL_OVERRIDE
    
    Change-Id: I7a14121d1e50bcf87810316db9b51a548d55a47a

diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index ff8fb12..fc1eaec 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -22,6 +22,7 @@
 
 #include <vcl/timer.hxx>
 #include <osl/mutex.hxx>
+#include <scdllapi.h>
 
 class ScRefreshTimerControl
 {
@@ -55,8 +56,8 @@ public:
     sal_uLong GetRefreshDelay() const;
     void StopRefreshTimer();
 
-    virtual void SetRefreshDelay( sal_uLong nSeconds );
-    virtual void Timeout();
+    SC_DLLPUBLIC virtual void SetRefreshDelay( sal_uLong nSeconds );
+    SC_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE;
 
 private:
     void Start();

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits