diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-11-28 20:33:37 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-11-28 20:40:42 +0100 |
| commit | edc484d92e3d8c154f72231cde049269c5b6c217 (patch) | |
| tree | ce90157ed6a982c3634efed80cab6e7b873655d7 /sc | |
| parent | 39bc5e1155d928b89d5e35822170b0b368bb7e50 (diff) | |
make data streams an experimental feature
Change-Id: I674b86a6e1c1c0b162c159747b6900ce438ab095
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/sdi/cellsh.sdi | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 470e319d4198..2fe1237c570b 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -51,9 +51,9 @@ interface CellSelection SID_REFRESH_DBAREA [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] - SID_DATA_STREAMS [ ExecMethod = ExecuteDB; ] - SID_DATA_STREAMS_PLAY [ ExecMethod = ExecuteDB; ] - SID_DATA_STREAMS_STOP [ ExecMethod = ExecuteDB; ] + SID_DATA_STREAMS [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_DATA_STREAMS_PLAY [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] + SID_DATA_STREAMS_STOP [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_MANAGE_XML_SOURCE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_DATA_FORM [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 5ca7129f42fb..1875afa6e5a6 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -86,6 +86,7 @@ #include "editeng/langitem.hxx" #include <svx/unoapi.hxx> #include <svl/languageoptions.hxx> +#include <svtools/miscopt.hxx> #include <sax/tools/converter.hxx> #include <com/sun/star/frame/XModel.hpp> @@ -1001,7 +1002,8 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const ScAddress& rPosition ) OUString sSourceStr( pCellRangeSource->sSourceStr ); OUString sRangeStr; 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()) , pCellRangeSource->sURL // rURL diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a8d301e8c061..71c92825ca1a 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -29,6 +29,7 @@ #include <vcl/msgbox.hxx> #include <svl/stritem.hxx> #include <svl/visitem.hxx> +#include <svtools/miscopt.hxx> #include <unotools/moduleoptions.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -1167,7 +1168,15 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } } 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: { ScRange aRange; |