summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-11 10:17:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-11 14:08:37 +0000
commit5448d8ed38c0e13b6df83294689bcabe9f4dcb20 (patch)
tree627b7e9d4c5c4f93cd3235a0bb51da3f4755eb48 /sc
parent252a73ff22a68909b641efb7e8cf833d7f62f8fc (diff)
surely this check should preceed deref of pActiveViewSh
Change-Id: Iaed1dafbae75fa61b15349aedda50a7b2d895719
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/inputhdl.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index eef56d029438..74c6222d11a9 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -197,13 +197,12 @@ void removeChars(OUString& rStr, sal_Unicode c)
void ScInputHandler::InitRangeFinder( const OUString& rFormula )
{
DeleteRangeFinder();
+ if ( !pActiveViewSh || !SC_MOD()->GetInputOptions().GetRangeFinder() )
+ return;
ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
const sal_Unicode cSheetSep = lcl_getSheetSeparator(&rDoc);
- if ( !pActiveViewSh || !SC_MOD()->GetInputOptions().GetRangeFinder() )
- return;
-
OUString aDelimiters = ScEditUtil::ModifyDelimiters(" !\"");
// delimiters (in addition to ScEditUtil): only characters that are
// allowed in formulas next to references and the quotation mark (so