summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-09-28 18:35:50 +0200
committerMichael Meeks <michael.meeks@collabora.com>2017-09-28 19:13:29 +0200
commit9e0be8a76e13ed3d71e792c1a30e5628b7e1056e (patch)
treee4160d64d915510ae5e39c7e8554d89a60475ac7 /sc
parent49564323e25d742ef11a9c93f5d7324459fdb95d (diff)
Remove dead code behind Calc "Live Data Streams" dialog's "scriptdata" button
...that has been disabled and hidden ever since 4c90ed782a09e2e4b8738b82028032c42d1a203d "Actually hide these two radio buttons (since there is no choice now)." This removes the sole user of SvScriptStream. (Unfortunately, removing the no longer needed #include <osl/process.h> from include/tools/stream.hxx triggered an avalanche of missing includes elsewhere.) Change-Id: I7b0e683b14c0eaf7f4737f62adc9d691826380c0 Reviewed-on: https://gerrit.libreoffice.org/42916 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xestyle.cxx1
-rw-r--r--sc/source/ui/docshell/datastream.cxx6
-rw-r--r--sc/source/ui/inc/datastream.hxx2
-rw-r--r--sc/source/ui/inc/datastreamdlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/datastreamdlg.cxx9
-rw-r--r--sc/uiconfig/scalc/ui/datastreams.ui46
6 files changed, 3 insertions, 63 deletions
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index d907ccbcb29f..d627ebd0500f 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -25,6 +25,7 @@
#include <iterator>
#include <set>
#include <com/sun/star/i18n/ScriptType.hpp>
+#include <rtl/tencinfo.h>
#include <vcl/font.hxx>
#include <svl/zformat.hxx>
#include <svl/itempool.hxx>
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index a153726e06a2..f99384142ed0 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -401,11 +401,7 @@ void DataStream::StartImport()
if (!mxReaderThread.is())
{
- SvStream *pStream = nullptr;
- if (mnSettings & SCRIPT_STREAM)
- pStream = new SvScriptStream(msURL);
- else
- pStream = new SvFileStream(msURL, StreamMode::READ);
+ SvStream *pStream = new SvFileStream(msURL, StreamMode::READ);
mxReaderThread = new datastreams::ReaderThread(pStream, maStartRange.aEnd.Col() - maStartRange.aStart.Col() + 1);
mxReaderThread->launch();
}
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index e70b5e47626e..b60de3fb852e 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -66,7 +66,7 @@ public:
typedef std::vector<Line> LinesType;
enum MoveType { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP };
- enum { SCRIPT_STREAM = 1, VALUES_IN_LINE = 2 };
+ enum { VALUES_IN_LINE = 2 };
static void MakeToolbarVisible();
static DataStream* Set(ScDocShell *pShell, const OUString& rURL, const ScRange& rRange,
diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx
index 74fba3ff6de4..c728f87402cf 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -31,8 +31,6 @@ class DataStreamDlg : public ModalDialog
VclPtr<SvtURLBox> m_pCbUrl;
VclPtr<PushButton> m_pBtnBrowse;
- VclPtr<RadioButton> m_pRBDirectData;
- VclPtr<RadioButton> m_pRBScriptData;
VclPtr<RadioButton> m_pRBValuesInLine;
VclPtr<RadioButton> m_pRBAddressValue;
VclPtr<CheckBox> m_pCBRefreshOnEmpty;
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 8a657492c29d..f447f48dc277 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -23,8 +23,6 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent)
{
get(m_pCbUrl, "url");
get(m_pBtnBrowse, "browse");
- get(m_pRBDirectData, "directdata");
- get(m_pRBScriptData, "scriptdata");
get(m_pRBValuesInLine, "valuesinline");
get(m_pRBAddressValue, "addressvalue");
get(m_pCBRefreshOnEmpty, "refresh_ui");
@@ -42,9 +40,6 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent)
m_pCbUrl->SetSelectHdl( LINK( this, DataStreamDlg, UpdateComboBoxHdl ) );
m_pRBAddressValue->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) );
m_pRBAddressValue->Enable(false);
- m_pRBScriptData->Enable(false);
- m_pRBDirectData->Hide();
- m_pRBScriptData->Hide();
m_pRBNoMove->Hide();
m_pRBValuesInLine->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) );
m_pEdRange->SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
@@ -61,8 +56,6 @@ void DataStreamDlg::dispose()
{
m_pCbUrl.clear();
m_pBtnBrowse.clear();
- m_pRBDirectData.clear();
- m_pRBScriptData.clear();
m_pRBValuesInLine.clear();
m_pRBAddressValue.clear();
m_pCBRefreshOnEmpty.clear();
@@ -200,8 +193,6 @@ void DataStreamDlg::StartStream()
nLimit = m_pEdLimit->GetText().toInt32();
OUString rURL = m_pCbUrl->GetText();
sal_uInt32 nSettings = 0;
- if (m_pRBScriptData->IsChecked())
- nSettings |= DataStream::SCRIPT_STREAM;
if (m_pRBValuesInLine->IsChecked())
nSettings |= DataStream::VALUES_IN_LINE;
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui b/sc/uiconfig/scalc/ui/datastreams.ui
index 8063776c7af4..e41d8ef51f68 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -98,52 +98,6 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="directdata">
- <property name="label" translatable="yes" context="datastreams|directdata">Direct data feed</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">scriptdata</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="scriptdata">
- <property name="label" translatable="yes" context="datastreams|scriptdata">Script to execute to obtain the data</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">directdata</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>