diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-29 16:00:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-29 16:00:59 +0100 |
| commit | 99d3733c7f7211d7fdcd8570e33f3cbb8a446526 (patch) | |
| tree | 3179588519a2413c1ad1f002d7d66948498829f1 /sc | |
| parent | 1e1302b89deba2ef61bde35c80efd7ff8a9bda29 (diff) | |
static, not mysterious
Change-Id: Ib080dd7fcbc8abb52f762a8071b0233e970b2691
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/datastream.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/inc/datastream.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/datastreamdlg.cxx | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 0df48b67b8b1..1d99af24a26b 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -110,11 +110,10 @@ private: } -void DataStream::MakeToolbarVisible(ScDocShell *pShell) +void DataStream::MakeToolbarVisible() { - (void) pShell; // Mysterious MSVC 2012 claim pShell is unreferenced... css::uno::Reference< css::frame::XFrame > xFrame = - pShell->GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); + ScDocShell::GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); if (!xFrame.is()) return; @@ -442,7 +441,7 @@ bool DataStream::ImportData() sfx2::SvBaseLink::UpdateResult DataStream::DataChanged( const OUString& , const css::uno::Any& ) { - MakeToolbarVisible(mpScDocShell); + MakeToolbarVisible(); StopImport(); bool bStart = true; if (mnSettings & SCRIPT_STREAM && !mxReaderThread.is() && diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index b1962de196fa..6eb1e7d8fd85 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -39,7 +39,7 @@ public: enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP }; enum { SCRIPT_STREAM = 1, VALUES_IN_LINE = 2 }; - static void MakeToolbarVisible(ScDocShell *pShell); + static void MakeToolbarVisible(); static DataStream* Set(ScDocShell *pShell, const OUString& rURL, const OUString& rRange, sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings); diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index cbfd46baff0d..405c7c03ffc2 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -127,7 +127,7 @@ void DataStreamDlg::StartStream(DataStream *pStream) ? OUString("RANGE_DOWN") : OUString("MOVE_DOWN") , nSettings ); - DataStream::MakeToolbarVisible( mpDocShell ); + DataStream::MakeToolbarVisible(); pStream->StartImport(); } |