diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:59:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:59:26 +0000 |
| commit | 1d802b8cf40eca06b766f9644a3005d7a973c74d (patch) | |
| tree | a1a7794bcef95e6776da3818445f87de5f5decf8 /sc/source/ui/attrdlg | |
| parent | 09bc20fbd34ba4d2b8fdeaab37cbe4a20f7bef9f (diff) | |
INTEGRATION: CWS calcwarnings (1.8.46); FILE MERGED
2006/12/12 17:03:07 nn 1.8.46.2: #i69284# warning-free: ui, unxlngi6
2006/12/01 08:53:22 nn 1.8.46.1: #i69284# warning-free: ui, wntmsci10
Diffstat (limited to 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/condfrmt.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 3bb38a5ee933..9becb3790e19 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: condfrmt.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ihi $ $Date: 2006-10-18 12:26:52 $ + * last change: $Author: vg $ $Date: 2007-02-27 12:59:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,8 +70,6 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( const ScConditionalFormat* pCurrentFormat ) : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONDFORMAT ), - pDoc ( pCurDoc ), - aCbxCond1 ( this, ScResId( CBX_COND1 ) ), aLbCond11 ( this, ScResId( LB_COND1_1 ) ), aLbCond12 ( this, ScResId( LB_COND1_2 ) ), @@ -111,7 +109,9 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ) + bDlgLostFocus ( FALSE ), + + pDoc ( pCurDoc ) { Point aPos; String aName; @@ -257,7 +257,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( ; else // via Werte { - aLbCond12.SelectEntryPos( eMode ); + aLbCond12.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) aEdtCond12.SetText( pEntry->GetExpression( aCurPos, 1 ) ); } @@ -281,7 +281,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( ; else // via Werte { - aLbCond22.SelectEntryPos( eMode ); + aLbCond22.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) aEdtCond22.SetText( pEntry->GetExpression( aCurPos, 1 ) ); } @@ -304,7 +304,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( ; else // via Werte { - aLbCond32.SelectEntryPos( eMode ); + aLbCond32.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) ); if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) ) aEdtCond32.SetText( pEntry->GetExpression( aCurPos, 1 ) ); } @@ -337,7 +337,7 @@ __EXPORT ScConditionalFormatDlg::~ScConditionalFormatDlg() //---------------------------------------------------------------------------- -void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) +void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( pEdActive ) { @@ -345,7 +345,7 @@ void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc RefInputStart(pEdActive); String aStr; - rRef.Format( aStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention () ); + rRef.Format( aStr, SCR_ABS_3D, pDocP, pDocP->GetAddressConvention () ); String aVal( pEdActive->GetText() ); Selection aSel( pEdActive->GetSelection() ); aSel.Justify(); @@ -376,7 +376,7 @@ void ScConditionalFormatDlg::AddRefEntry() //---------------------------------------------------------------------------- -BOOL ScConditionalFormatDlg::IsRefInputMode() +BOOL ScConditionalFormatDlg::IsRefInputMode() const { return (pEdActive != NULL); } @@ -738,7 +738,7 @@ IMPL_LINK( ScConditionalFormatDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, pCtrl ) +IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, EMPTYARG ) { bDlgLostFocus = !IsActive(); return 0; |