diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:00:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:00:57 +0000 |
| commit | 41b4adaee2b8d4b4f2df02e93ec06623bd03c954 (patch) | |
| tree | d9bdd7e020041b7637ce938e113a4ccd29cb789a /sc | |
| parent | 06b42e61ca5aab89546393d29a91f85bb9d0bf09 (diff) | |
INTEGRATION: CWS calcwarnings (1.10.110); FILE MERGED
2006/12/12 17:03:07 nn 1.10.110.2: #i69284# warning-free: ui, unxlngi6
2006/12/01 08:53:23 nn 1.10.110.1: #i69284# warning-free: ui, wntmsci10
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/consdlg.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 711acecffc9e..d7b82e74b0eb 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: consdlg.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2006-07-21 13:17:49 $ + * last change: $Author: vg $ $Date: 2007-02-27 13:00:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,13 +103,13 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ), aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ), - aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), + aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), aEdDataArea ( this, ScResId( ED_DATA_AREA ) ), aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea ), - aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), + aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), aEdDestArea ( this, ScResId( ED_DEST_AREA ) ), aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea ), @@ -124,18 +124,16 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), aBtnAdd ( this, ScResId( BTN_ADD ) ), aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), // - nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), theConsData ( ((const ScConsolidateItem&) rArgSet.Get( rArgSet.GetPool()-> GetWhich( SID_CONSOLIDATE ) ) ).GetData() ), - pViewData ( ((ScTabViewShell*)SfxViewShell::Current())-> GetViewData() ), pDoc ( ((ScTabViewShell*)SfxViewShell::Current())-> @@ -143,6 +141,8 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window pRangeUtil ( new ScRangeUtil ), pAreaData ( NULL ), nAreaDataCount ( 0 ), + nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ), + pRefInputEdit ( &aEdDataArea ) { Init(); @@ -296,7 +296,7 @@ void ScConsolidateDlg::FillAreaLists() // neue Selektion im Referenz-Fenster angezeigt wird. -void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) +void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( pRefInputEdit ) { @@ -310,9 +310,9 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) nFmt |= SCA_TAB2_3D; if ( pRefInputEdit == &aEdDataArea) - rRef.Format( aStr, nFmt, pDoc ); + rRef.Format( aStr, nFmt, pDocP ); else if ( pRefInputEdit == &aEdDestArea ) - rRef.aStart.Format( aStr, nFmt, pDoc ); + rRef.aStart.Format( aStr, nFmt, pDocP ); pRefInputEdit->SetRefString( aStr ); } @@ -416,7 +416,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConsolidateDlg, OkHdl, void*, p ) +IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) { USHORT nDataAreaCount = aLbConsAreas.GetEntryCount(); |