diff options
Diffstat (limited to 'sc/source/ui/miscdlgs/tabopdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/tabopdlg.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 2dce5792232d..7fe01494a49f 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,25 +50,25 @@ //============================================================================ -// class ScTabOpDlg +// class ScTabOpDlg //---------------------------------------------------------------------------- ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, - const ScRefAddress& rCursorPos ) + const ScRefAddress& rCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ), aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ), - aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), - aFtRowCell ( this, ScResId( FT_ROWCELL ) ), + aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), + aFtRowCell ( this, ScResId( FT_ROWCELL ) ), aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ), - aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), - aFtColCell ( this, ScResId( FT_COLCELL ) ), + aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), + aFtColCell ( this, ScResId( FT_COLCELL ) ), aEdColCell ( this, this, ScResId( ED_COLCELL ) ), - aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), + aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), @@ -78,12 +78,12 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, nCurTab ( theFormulaCell.Tab() ), pEdActive ( NULL ), bDlgLostFocus ( FALSE ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), - errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), - errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), - errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), - errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), + errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), + errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), + errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), + errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) { Init(); FreeResource(); @@ -100,8 +100,8 @@ __EXPORT ScTabOpDlg::~ScTabOpDlg() void __EXPORT ScTabOpDlg::Init() { - aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl ); aEdFormulaRange.SetGetFocusHdl( aLink ); @@ -160,8 +160,8 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; - USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) + String aStr; + USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) ? SCR_ABS : SCR_ABS_3D; @@ -191,7 +191,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { const String* pMsg = &errMsgNoFormula; - Edit* pEd = &aEdFormulaRange; + Edit* pEd = &aEdFormulaRange; switch ( eError ) { @@ -281,7 +281,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if (aEdRowCell.GetText().Len() > 0) { - if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, + if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, theRowCell, eConv )) nError = TABOPERR_WRONGROW; else @@ -300,7 +300,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) nError = TABOPERR_WRONGCOL; else { - if (nMode == 1) // beides + if (nMode == 1) // beides { nMode = 2; ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab, @@ -323,7 +323,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) theRowCell, theColCell, nMode ); - ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); + ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); SetDispatcherLock( FALSE ); SwitchToDocument(); |