From 5ad65cf4d8afb66c3da8034046d08b7399c1016c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Wed, 13 Nov 2013 11:19:33 +0100 Subject: [PATCH] remove broken friend declaration and make methods public instead Change-Id: I59b1a89cdd1269e6245bad9491916dfd1bcecea7 --- sc/source/ui/inc/datastreams.hxx | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sc/source/ui/inc/datastreams.hxx b/sc/source/ui/inc/datastreams.hxx index 124ebefc5c35..8233be1f492e 100644 --- a/sc/source/ui/inc/datastreams.hxx +++ b/sc/source/ui/inc/datastreams.hxx @@ -16,7 +16,6 @@ #include 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 mpEndRange; boost::scoped_ptr mpStream; rtl::Reference 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: */