summaryrefslogtreecommitdiff
path: root/sc/source/ui/docshell/datastream.cxx
diff options
context:
space:
mode:
authorxukai <xukai@multicorewareinc.com>2014-09-23 21:55:13 -0400
committerMichael Meeks <michael.meeks@collabora.com>2014-10-09 09:54:30 +0100
commitfcf953b8ec8ef9652f12a2cc91e9edc6153c1bb1 (patch)
treed2111ff21975156dc6e9158e919eee8b04f677f2 /sc/source/ui/docshell/datastream.cxx
parent11044cbf0d92fea3cb55ba46d81f8fe51b1ec0ab (diff)
make streamtimeout a config variable instead of an env. var.
Change-Id: I6c82142265a0a149206d15fbc267ad61e6b9cf3b
Diffstat (limited to 'sc/source/ui/docshell/datastream.cxx')
-rw-r--r--sc/source/ui/docshell/datastream.cxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 449a992fd7a2..92f9519d93bc 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -27,6 +27,8 @@
#include <documentlinkmgr.hxx>
#include <config_orcus.h>
+#include "officecfg/Office/Calc.hxx"
+
#if ENABLE_ORCUS
#if defined WNT
@@ -501,18 +503,11 @@ void DataStream::MoveData()
default:
;
}
-
if(mbIsFirst && mbIsUpdate)
{
- int nImportTimeout = 0;
- static char * cenv = getenv( "streamtimeout" );
- if(cenv)
- {
- double nEnv = atof(cenv);
- nImportTimeout = 1000 * nEnv;
- }
- maImportTimer.SetTimeout(nImportTimeout);
- mbIsFirst = false;
+ sal_Int32 nStreamTimeout = officecfg::Office::Calc::DataStream::UpdateTimeout::get();
+ maImportTimer.SetTimeout(nStreamTimeout);
+ mbIsFirst = false;
}
}