diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 09:21:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 09:21:55 +0000 |
| commit | 69dcd21b83d37a8c61be7f2bae42823aa03fa8d7 (patch) | |
| tree | 4921fc2bc927c6cb49f440f8a5d026df541762bd /sc | |
| parent | 1d94edf1f3a6635dbd344d2ba15f52de356d7ada (diff) | |
INTEGRATION: CWS chart31_DEV300 (1.27.42); FILE MERGED
2008/08/19 09:06:16 iha 1.27.42.1: #i92568# range chooser does not work anymore
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index b5971771b650..79505c373ac7 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsha.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -504,35 +504,40 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage ) bool ScTabViewShell::IsRefInputMode() const { ScModule* pScMod = SC_MOD(); - if ( pScMod && pScMod->IsFormulaMode() ) + if ( pScMod ) { - ScInputHandler* pHdl = pScMod->GetInputHdl(); - if ( pHdl ) + if( pScMod->IsRefDialogOpen() ) + return pScMod->IsFormulaMode(); + if( pScMod->IsFormulaMode() ) { - String aString = pHdl->GetEditString(); - if ( !pHdl->GetSelIsRef() && aString.Len() > 1 && - ( aString.GetChar(0) == '+' || aString.GetChar(0) == '-' ) ) + ScInputHandler* pHdl = pScMod->GetInputHdl(); + if ( pHdl ) { - const ScViewData* pViewData = GetViewData(); - if ( pViewData ) + String aString = pHdl->GetEditString(); + if ( !pHdl->GetSelIsRef() && aString.Len() > 1 && + ( aString.GetChar(0) == '+' || aString.GetChar(0) == '-' ) ) { - ScDocument* pDoc = pViewData->GetDocument(); - if ( pDoc ) + const ScViewData* pViewData = GetViewData(); + if ( pViewData ) { - const ScAddress aPos( pViewData->GetCurPos() ); - ScCompiler aComp( pDoc, aPos, pDoc->GetGrammar() ); - aComp.SetCloseBrackets( false ); - ScTokenArray* pArr = aComp.CompileString( aString ); - if ( pArr && pArr->MayReferenceFollow() ) + ScDocument* pDoc = pViewData->GetDocument(); + if ( pDoc ) { - return true; + const ScAddress aPos( pViewData->GetCurPos() ); + ScCompiler aComp( pDoc, aPos, pDoc->GetGrammar() ); + aComp.SetCloseBrackets( false ); + ScTokenArray* pArr = aComp.CompileString( aString ); + if ( pArr && pArr->MayReferenceFollow() ) + { + return true; + } } } } - } - else - { - return true; + else + { + return true; + } } } } |