Kaydet (Commit) edc484d9 authored tarafından Matúš Kukan's avatar Matúš Kukan

make data streams an experimental feature

Change-Id: I674b86a6e1c1c0b162c159747b6900ce438ab095
üst 39bc5e11
...@@ -51,9 +51,9 @@ interface CellSelection ...@@ -51,9 +51,9 @@ interface CellSelection
SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_DATA_STREAMS [ ExecMethod = ExecuteDB; ] SID_DATA_STREAMS [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_DATA_STREAMS_PLAY [ ExecMethod = ExecuteDB; ] SID_DATA_STREAMS_PLAY [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_DATA_STREAMS_STOP [ ExecMethod = ExecuteDB; ] SID_DATA_STREAMS_STOP [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_MANAGE_XML_SOURCE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_MANAGE_XML_SOURCE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
SID_DATA_FORM [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_DATA_FORM [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
#include "editeng/langitem.hxx" #include "editeng/langitem.hxx"
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include <svl/languageoptions.hxx> #include <svl/languageoptions.hxx>
#include <svtools/miscopt.hxx>
#include <sax/tools/converter.hxx> #include <sax/tools/converter.hxx>
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
...@@ -1001,7 +1002,8 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const ScAddress& rPosition ) ...@@ -1001,7 +1002,8 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const ScAddress& rPosition )
OUString sSourceStr( pCellRangeSource->sSourceStr ); OUString sSourceStr( pCellRangeSource->sSourceStr );
OUString sRangeStr; OUString sRangeStr;
ScRangeStringConverter::GetStringFromRange( sRangeStr, aDestRange, pDoc, formula::FormulaGrammar::CONV_OOO ); ScRangeStringConverter::GetStringFromRange( sRangeStr, aDestRange, pDoc, formula::FormulaGrammar::CONV_OOO );
if (pCellRangeSource->sFilterOptions == "DataStream") SvtMiscOptions aMiscOptions;
if (aMiscOptions.IsExperimentalMode() && pCellRangeSource->sFilterOptions == "DataStream")
{ {
DataStream::Set( dynamic_cast<ScDocShell*>(pDoc->GetDocumentShell()) DataStream::Set( dynamic_cast<ScDocShell*>(pDoc->GetDocumentShell())
, pCellRangeSource->sURL // rURL , pCellRangeSource->sURL // rURL
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include <svl/visitem.hxx> #include <svl/visitem.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/moduleoptions.hxx> #include <unotools/moduleoptions.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp>
...@@ -1167,7 +1168,15 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ...@@ -1167,7 +1168,15 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
} }
} }
break; break;
case SID_DATA_STREAMS:
case SID_DATA_STREAMS_PLAY:
case SID_DATA_STREAMS_STOP:
{
SvtMiscOptions aMiscOptions;
if ( !aMiscOptions.IsExperimentalMode() )
rSet.DisableItem( nWhich );
}
break;
case SID_TEXT_TO_COLUMNS: case SID_TEXT_TO_COLUMNS:
{ {
ScRange aRange; ScRange aRange;
......
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