Kaydet (Commit) 99d3733c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

static, not mysterious

Change-Id: Ib080dd7fcbc8abb52f762a8071b0233e970b2691
üst 1e1302b8
...@@ -110,11 +110,10 @@ private: ...@@ -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 = css::uno::Reference< css::frame::XFrame > xFrame =
pShell->GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); ScDocShell::GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface();
if (!xFrame.is()) if (!xFrame.is())
return; return;
...@@ -442,7 +441,7 @@ bool DataStream::ImportData() ...@@ -442,7 +441,7 @@ bool DataStream::ImportData()
sfx2::SvBaseLink::UpdateResult DataStream::DataChanged( sfx2::SvBaseLink::UpdateResult DataStream::DataChanged(
const OUString& , const css::uno::Any& ) const OUString& , const css::uno::Any& )
{ {
MakeToolbarVisible(mpScDocShell); MakeToolbarVisible();
StopImport(); StopImport();
bool bStart = true; bool bStart = true;
if (mnSettings & SCRIPT_STREAM && !mxReaderThread.is() && if (mnSettings & SCRIPT_STREAM && !mxReaderThread.is() &&
......
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP }; enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP };
enum { SCRIPT_STREAM = 1, VALUES_IN_LINE = 2 }; 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, static DataStream* Set(ScDocShell *pShell, const OUString& rURL, const OUString& rRange,
sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings); sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings);
......
...@@ -127,7 +127,7 @@ void DataStreamDlg::StartStream(DataStream *pStream) ...@@ -127,7 +127,7 @@ void DataStreamDlg::StartStream(DataStream *pStream)
? OUString("RANGE_DOWN") : OUString("MOVE_DOWN") ? OUString("RANGE_DOWN") : OUString("MOVE_DOWN")
, nSettings , nSettings
); );
DataStream::MakeToolbarVisible( mpDocShell ); DataStream::MakeToolbarVisible();
pStream->StartImport(); pStream->StartImport();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment