diff options
25 files changed, 118 insertions, 118 deletions
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 76a2287ed45c..6676117cdf20 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -34,6 +34,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit private: Timer aTimer; IControlReferenceHandler* pAnyRefDlg; // parent dialog + Window* pLabelWidget; DECL_LINK( UpdateHdl, void* ); @@ -43,8 +44,10 @@ protected: virtual void LoseFocus(); public: - RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ); - RefEdit( Window* _pParent, WinBits nStyle = WB_BORDER ); + RefEdit( Window* _pParent,IControlReferenceHandler* pParent, + Window* pShrinkModeLabel, const ResId& rResId ); + RefEdit( Window* _pParent, Window* pShrinkModeLabel, + WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); void SetRefString( const XubString& rStr ); @@ -61,8 +64,9 @@ public: void StartUpdateData(); - void SetRefDialog( IControlReferenceHandler* pDlg ); + void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget ); IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; } + Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; } }; @@ -77,7 +81,6 @@ private: OUString aExpandQuickHelp; IControlReferenceHandler* pAnyRefDlg; // parent dialog RefEdit* pRefEdit; // zugeordnetes Edit-Control - Window* pLabelWidget; protected: virtual void Click(); @@ -89,16 +92,14 @@ public: RefButton(Window* _pParent, const ResId& rResId); RefButton(Window* _pParent, WinBits nStyle = 0); RefButton(Window* _pParent, const ResId& rResId, - RefEdit* pEdit, Window* pShrinkModeLabel, - IControlReferenceHandler* pDlg); + RefEdit* pEdit, IControlReferenceHandler* pDlg); void SetReferences( IControlReferenceHandler* pDlg, - RefEdit* pEdit, Window* pShrinkModeLabel ); + RefEdit* pEdit ); void SetStartImage(); void SetEndImage(); void DoRef() { Click(); } - Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; } }; } // formula diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index df893f624b8c..6f98e56b31aa 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -265,8 +265,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aBtnBackward ( pParent, ModuleRes( BTN_BACKWARD ) ), aBtnForward ( pParent, ModuleRes( BTN_FORWARD ) ), aBtnEnd ( pParent, ModuleRes( BTN_END ) ), - aEdRef ( pParent, _pDlg, ModuleRes( ED_REF) ), - aRefBtn ( pParent, ModuleRes( RB_REF),&aEdRef,&aFtEditName,_pDlg ), + aEdRef ( pParent, _pDlg, &aFtEditName, ModuleRes( ED_REF) ), + aRefBtn ( pParent, ModuleRes( RB_REF), &aEdRef, _pDlg ), aFtFormResult ( pParent, ModuleRes( FT_FORMULA_RESULT)), aWndFormResult ( pParent, ModuleRes( WND_FORMULA_RESULT)), pTheRefEdit (NULL), diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 8d39ea91f556..01fc78b45d92 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -87,7 +87,7 @@ void ValWnd::SetValue( const String& rStrVal ) //---------------------------------------------------------------------------- ArgEdit::ArgEdit( Window* pParent, const ResId& rResId ) - : RefEdit( pParent, NULL, rResId ), + : RefEdit( pParent, NULL, NULL, rResId ), pEdPrev ( NULL ), pEdNext ( NULL ), pSlider ( NULL ), @@ -847,17 +847,20 @@ void EditBox::UpdateOldSel() #define SC_ENABLE_TIME 100 -RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) +RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, + Window* pShrinkModeLabel, const ResId& rResId ) : Edit( _pParent, rResId ) , pAnyRefDlg( pParent ) + , pLabelWidget(pShrinkModeLabel) { aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aTimer.SetTimeout( SC_ENABLE_TIME ); } -RefEdit::RefEdit( Window* _pParent, WinBits nStyle ) +RefEdit::RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle ) : Edit( _pParent, nStyle ) , pAnyRefDlg( NULL ) + , pLabelWidget(pShrinkModeLabel) { aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aTimer.SetTimeout( SC_ENABLE_TIME ); @@ -865,7 +868,7 @@ RefEdit::RefEdit( Window* _pParent, WinBits nStyle ) extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefEdit(Window *pParent, VclBuilder::stringmap &) { - return new RefEdit(pParent, WB_BORDER); + return new RefEdit(pParent, NULL, WB_BORDER); } RefEdit::~RefEdit() @@ -904,9 +907,10 @@ void RefEdit::StartUpdateData() aTimer.Start(); } -void RefEdit::SetRefDialog( IControlReferenceHandler* pDlg ) +void RefEdit::SetReferences( IControlReferenceHandler* pDlg, Window* pLabel ) { pAnyRefDlg = pDlg; + pLabelWidget = pLabel; if( pDlg ) { @@ -967,8 +971,7 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) : aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), pAnyRefDlg( NULL ), - pRefEdit( NULL ), - pLabelWidget( NULL ) + pRefEdit( NULL ) { SetStartImage(); } @@ -980,8 +983,7 @@ RefButton::RefButton( Window* _pParent, WinBits nStyle ) : aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), pAnyRefDlg( NULL ), - pRefEdit( NULL ), - pLabelWidget( NULL ) + pRefEdit( NULL ) { SetStartImage(); } @@ -991,15 +993,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window *pParent, return new RefButton(pParent, 0); } -RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, Window* pShrinkModeLabel, IControlReferenceHandler* _pDlg ) : +RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), pAnyRefDlg( _pDlg ), - pRefEdit( pEdit ), - pLabelWidget( pShrinkModeLabel ) + pRefEdit( pEdit ) { SetStartImage(); } @@ -1016,11 +1017,10 @@ void RefButton::SetEndImage() SetQuickHelpText( aExpandQuickHelp ); } -void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit, Window* pShrinkModeLabel ) +void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ) { pAnyRefDlg = pDlg; pRefEdit = pEdit; - pLabelWidget = pShrinkModeLabel; } //---------------------------------------------------------------------------- diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 50a2d0ded967..77e8935b118b 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -387,8 +387,8 @@ void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBt ArgEdit& rEdArg, RefButton& rRefBtn) { - rRefBtn.SetReferences(pMyParent, &rEdArg, &rFtArg); - rEdArg.SetRefDialog(pMyParent); + rRefBtn.SetReferences(pMyParent, &rEdArg); + rEdArg.SetReferences(pMyParent, &rFtArg); aArgInput[nPos].InitArgInput (&rFtArg,&rBtnFx,&rEdArg,&rRefBtn); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index c22d8f61556c..3c09ffcb47c0 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -376,8 +376,8 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnOk( this, ScResId( BTN_OK ) ), maBtnCancel( this, ScResId( BTN_CANCEL ) ), maFtRange( this, ScResId( FT_RANGE ) ), - maEdRange( this, this, ScResId( ED_RANGE ) ), - maRbRange( this, ScResId( RB_RANGE ), &maEdRange, &maFtRange, this ), + maEdRange( this, this, &maFtRange, ScResId( ED_RANGE ) ), + maRbRange( this, ScResId( RB_RANGE ), &maEdRange, this ), maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos, eType ), maPos(rPos), mpDoc(pDoc), diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 249431058b9c..d8acc85b123b 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -163,8 +163,8 @@ void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), - maEdVal1( this, NULL, ScResId( ED_VAL1 ) ), - maEdVal2( this, NULL, ScResId( ED_VAL2 ) ), + maEdVal1( this, NULL, NULL, ScResId( ED_VAL1 ) ), + maEdVal2( this, NULL, NULL, ScResId( ED_VAL2 ) ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), maWdPreview( this, ScResId( WD_PREVIEW ) ) @@ -514,7 +514,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), maWdPreview( this, ScResId( WD_PREVIEW ) ), - maEdFormula( this, NULL, ScResId( ED_FORMULA ) ) + maEdFormula( this, NULL, NULL, ScResId( ED_FORMULA ) ) { Init(); diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 74673c7f6b46..aa85cbed3b3b 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -77,13 +77,13 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window aLbDataArea ( this, ScResId( LB_DATA_AREA ) ), aFtDataArea ( this, ScResId( FT_DATA_AREA ) ), - aEdDataArea ( this, this, ScResId( ED_DATA_AREA ) ), - aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, &aFtDataArea, this ), + aEdDataArea ( this, this, &aFtDataArea, ScResId( ED_DATA_AREA ) ), + aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ), aLbDestArea ( this, ScResId( LB_DEST_AREA ) ), aFtDestArea ( this, ScResId( FT_DEST_AREA ) ), - aEdDestArea ( this, this, ScResId( ED_DEST_AREA ) ), - aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, &aFtDestArea, this), + aEdDestArea ( this, this, &aFtDestArea, ScResId( ED_DEST_AREA ) ), + aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this), aFlConsBy ( this, ScResId( FL_CONSBY ) ), aBtnByRow ( this, ScResId( BTN_BYROW ) ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index bad2f0123462..f9c8482255a9 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -127,8 +127,8 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aEdName ( this, ScResId( ED_NAME ) ), aFlAssign ( this, ScResId( FL_ASSIGN ) ), - aEdAssign ( this, this, ScResId( ED_DBAREA ) ), - aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, &aFlAssign, this ), + aEdAssign ( this, this, &aFlAssign, ScResId( ED_DBAREA ) ), + aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), aBtnHeader ( this, ScResId( BTN_HEADER ) ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index f1d73c6fbe48..1d6114594d4e 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -91,8 +91,8 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), - aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), - aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, NULL, this ), + aEdCopyArea ( this, this, NULL, ScResId( ED_COPY_AREA ) ), + aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), aFtDbArea ( this, ScResId( FT_DBAREA ) ), diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 3e01453dac8c..98d66e289f85 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -100,12 +100,12 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window maFlAreas( this, ScResId( FL_OUTPUT ) ), maFtInArea( this, ScResId( FT_INAREA) ), - maEdInPos( this, this, ScResId( ED_INAREA) ), - maRbInPos( this, ScResId( RB_INAREA ), &maEdInPos, &maFtInArea, this ), + maEdInPos( this, this, &maFtInArea, ScResId( ED_INAREA) ), + maRbInPos( this, ScResId( RB_INAREA ), &maEdInPos, this ), maLbOutPos( this, ScResId( LB_OUTAREA ) ), maFtOutArea( this, ScResId( FT_OUTAREA ) ), - maEdOutPos( this, this, ScResId( ED_OUTAREA ) ), - maRbOutPos( this, ScResId( RB_OUTAREA ), &maEdOutPos, &maFtOutArea, this ), + maEdOutPos( this, this, &maFtOutArea, ScResId( ED_OUTAREA ) ), + maRbOutPos( this, ScResId( RB_OUTAREA ), &maEdOutPos, this ), maBtnIgnEmptyRows( this, ScResId( BTN_IGNEMPTYROWS ) ), maBtnDetectCat( this, ScResId( BTN_DETECTCAT ) ), maBtnTotalCol( this, ScResId( BTN_TOTALCOL ) ), diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 5d277626d813..04c7f9fb27ef 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -56,8 +56,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi // aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), - aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ), - aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, &aFtFilterArea, this ), + aEdFilterArea ( this, this, &aFtFilterArea, ScResId( ED_CRITERIA_AREA ) ), + aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), // aFlOptions ( this, ScResId( FL_OPTIONS ) ), aBtnCase ( this, ScResId( BTN_CASE ) ), @@ -66,8 +66,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), - aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), - aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, NULL, this ), + aEdCopyArea ( this, this, NULL, ScResId( ED_COPY_AREA ) ), + aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), aFtDbArea ( this, ScResId( FT_DBAREA ) ), diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 005df94c4e39..575c238927d1 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -317,10 +317,10 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr maFtValue ( this, ScResId( FT_VALUE ) ), maLbValue ( this, ScResId( LB_VALUE ) ), maFtMin ( this, ScResId( FT_MIN ) ), - maEdMin ( this, NULL, ScResId( EDT_MIN ) ), + maEdMin ( this, NULL, &maFtMin, ScResId( EDT_MIN ) ), maEdList ( this, ScResId( EDT_LIST ) ), maFtMax ( this, ScResId( FT_MAX ) ), - maEdMax ( this, NULL, ScResId( EDT_MAX ) ), + maEdMax ( this, NULL, &maFtMax, ScResId( EDT_MAX ) ), maFtHint ( this, ScResId( FT_SOURCEHINT ) ), maStrMin ( ScResId( SCSTR_VALID_MINIMUM ) ), maStrMax ( ScResId( SCSTR_VALID_MAXIMUM ) ), @@ -511,9 +511,9 @@ void ScTPValidationValue::SetupRefDlg() m_pRefEdit->GrabFocus(); if( m_pRefEdit ) - m_pRefEdit->SetRefDialog( pValidationDlg ); + m_pRefEdit->SetReferences( pValidationDlg, pLabel ); - m_btnRef.SetReferences( pValidationDlg, m_pRefEdit, pLabel ); + m_btnRef.SetReferences( pValidationDlg, m_pRefEdit ); } } } @@ -531,10 +531,10 @@ void ScTPValidationValue::RemoveRefDlg() pValidationDlg->SetRefInputDonePostHdl( NULL ); if( m_pRefEdit ) - m_pRefEdit->SetRefDialog( NULL ); + m_pRefEdit->SetReferences( NULL, NULL ); m_pRefEdit = NULL; - m_btnRef.SetReferences( NULL, NULL, NULL ); + m_btnRef.SetReferences( NULL, NULL ); #if ! defined( WNT ) && !defined( _MSC_VER ) TidyListBoxes(); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 14d5ed5eda87..70b2882f9ccf 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -42,7 +42,7 @@ class ScCursorRefEdit : public formula::RefEdit Link maCursorDownLink; public: - ScCursorRefEdit( ScAnyRefDlg* pParent, const ResId& rResId ); + ScCursorRefEdit( ScAnyRefDlg* pParent, Window *pLabel, const ResId& rResId ); void SetCursorLinks( const Link& rUp, const Link& rDown ); protected: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index bab50175a1a1..8a0a3faff483 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -228,8 +228,8 @@ private: void Click(); public: ScRefButtonEx( Window* pParent, const ResId& rResId, formula::RefEdit* pEdit = NULL, - Window* pShrinkLabel = NULL, ScRefHandler *pRefHdlr = NULL ) - : ::formula::RefButton( pParent, rResId, pEdit, pShrinkLabel, pRefHdlr ) + ScRefHandler *pRefHdlr = NULL ) + : ::formula::RefButton( pParent, rResId, pEdit, pRefHdlr ) { } }m_btnRef; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 4db0490d43e0..ab3b534bf93c 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -479,18 +479,15 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: // Fenstertitel anpassen sOldDialogText = m_pWindow->GetText(); - if (pRefBtn) + if (Window *pLabel = pRefEdit->GetLabelWidgetForShrinkMode()) { - if (Window *pLabel = pRefBtn->GetLabelWidgetForShrinkMode()) + OUString sLabel = pLabel->GetText(); + if (!sLabel.isEmpty()) { - OUString sLabel = pLabel->GetText(); - if (!sLabel.isEmpty()) - { - String sNewDialogText = sOldDialogText; - sNewDialogText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); - sNewDialogText += sLabel; - m_pWindow->SetText( MnemonicGenerator::EraseAllMnemonicChars( sNewDialogText ) ); - } + String sNewDialogText = sOldDialogText; + sNewDialogText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); + sNewDialogText += sLabel; + m_pWindow->SetText( MnemonicGenerator::EraseAllMnemonicChars( sNewDialogText ) ); } } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 3e32d91db7ab..0ac4aaf6d46c 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -73,13 +73,13 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, aFlAssign ( this, ScResId( FL_ASSIGN ) ), aLbRange ( this, ScResId( LB_RANGE ) ), - aEdAssign ( this, this, ScResId( ED_AREA ) ), - aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, &aFlAssign, this ), + aEdAssign ( this, this, &aFlAssign, ScResId( ED_AREA ) ), + aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), - aEdAssign2 ( this, this, ScResId( ED_DATA ) ), - aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, &aFtAssign2, this ), + aEdAssign2 ( this, this, &aFtAssign2, ScResId( ED_DATA ) ), + aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index dc40bef8a095..d863bddd6f43 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -54,8 +54,8 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind aOkButton ( this, ScResId( BTN_OK ) ), aCancelButton ( this, ScResId( BTN_CANCEL ) ), aHelpButton ( this, ScResId( BTN_HELP ) ), - aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, NULL, this ), + aEdAssign ( this, this, NULL, ScResId( ED_ASSIGN ) ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 84788a52e656..2139c838342d 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -115,8 +115,8 @@ ScSolverSuccessDialog::~ScSolverSuccessDialog() //---------------------------------------------------------------------------- -ScCursorRefEdit::ScCursorRefEdit( ScAnyRefDlg* pParent, const ResId& rResId ) : - formula::RefEdit( pParent, pParent, rResId ) +ScCursorRefEdit::ScCursorRefEdit( ScAnyRefDlg* pParent, Window *pLabel, const ResId& rResId ) : + formula::RefEdit( pParent, pParent, pLabel, rResId ) { } @@ -171,44 +171,44 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_OPTSOLVER ), // maFtObjectiveCell ( this, ScResId( FT_OBJECTIVECELL ) ), - maEdObjectiveCell ( this, this, ScResId( ED_OBJECTIVECELL ) ), - maRBObjectiveCell ( this, ScResId( IB_OBJECTIVECELL ), &maEdObjectiveCell, &maFtObjectiveCell, this ), + maEdObjectiveCell ( this, this, &maFtObjectiveCell, ScResId( ED_OBJECTIVECELL ) ), + maRBObjectiveCell ( this, ScResId( IB_OBJECTIVECELL ), &maEdObjectiveCell, this ), maFtDirection ( this, ScResId( FT_DIRECTION ) ), maRbMax ( this, ScResId( RB_MAX ) ), maRbMin ( this, ScResId( RB_MIN ) ), maRbValue ( this, ScResId( RB_VALUE ) ), - maEdTargetValue ( this, this, ScResId( ED_TARGET ) ), - maRBTargetValue ( this, ScResId( IB_TARGET ), &maEdTargetValue, NULL, this ), + maEdTargetValue ( this, this, NULL, ScResId( ED_TARGET ) ), + maRBTargetValue ( this, ScResId( IB_TARGET ), &maEdTargetValue, this ), maFtVariableCells ( this, ScResId( FT_VARIABLECELLS ) ), - maEdVariableCells ( this, this, ScResId( ED_VARIABLECELLS ) ), - maRBVariableCells ( this, ScResId( IB_VARIABLECELLS ), &maEdVariableCells, &maFtVariableCells, this), + maEdVariableCells ( this, this, &maFtVariableCells, ScResId( ED_VARIABLECELLS ) ), + maRBVariableCells ( this, ScResId( IB_VARIABLECELLS ), &maEdVariableCells, this), maFlConditions ( this, ScResId( FL_CONDITIONS ) ), maFtCellRef ( this, ScResId( FT_CELLREF ) ), - maEdLeft1 ( this, ScResId( ED_LEFT1 ) ), - maRBLeft1 ( this, ScResId( IB_LEFT1 ), &maEdLeft1, NULL, this ), + maEdLeft1 ( this, NULL, ScResId( ED_LEFT1 ) ), + maRBLeft1 ( this, ScResId( IB_LEFT1 ), &maEdLeft1, this ), maFtOperator ( this, ScResId( FT_OPERATOR ) ), maLbOp1 ( this, ScResId( LB_OP1 ) ), maFtConstraint ( this, ScResId( FT_CONSTRAINT ) ), - maEdRight1 ( this, ScResId( ED_RIGHT1 ) ), - maRBRight1 ( this, ScResId( IB_RIGHT1 ), &maEdRight1, NULL, this ), + maEdRight1 ( this, NULL, ScResId( ED_RIGHT1 ) ), + maRBRight1 ( this, ScResId( IB_RIGHT1 ), &maEdRight1, this ), maBtnDel1 ( this, ScResId( IB_DELETE1 ) ), - maEdLeft2 ( this, ScResId( ED_LEFT2 ) ), - maRBLeft2 ( this, ScResId( IB_LEFT2 ), &maEdLeft2, NULL, this ), + maEdLeft2 ( this, NULL, ScResId( ED_LEFT2 ) ), + maRBLeft2 ( this, ScResId( IB_LEFT2 ), &maEdLeft2, this ), maLbOp2 ( this, ScResId( LB_OP2 ) ), - maEdRight2 ( this, ScResId( ED_RIGHT2 ) ), - maRBRight2 ( this, ScResId( IB_RIGHT2 ), &maEdRight2, NULL, this ), + maEdRight2 ( this, NULL, ScResId( ED_RIGHT2 ) ), + maRBRight2 ( this, ScResId( IB_RIGHT2 ), &maEdRight2, this ), maBtnDel2 ( this, ScResId( IB_DELETE2 ) ), - maEdLeft3 ( this, ScResId( ED_LEFT3 ) ), - maRBLeft3 ( this, ScResId( IB_LEFT3 ), &maEdLeft3, NULL, this ), + maEdLeft3 ( this, NULL, ScResId( ED_LEFT3 ) ), + maRBLeft3 ( this, ScResId( IB_LEFT3 ), &maEdLeft3, this ), maLbOp3 ( this, ScResId( LB_OP3 ) ), - maEdRight3 ( this, ScResId( ED_RIGHT3 ) ), - maRBRight3 ( this, ScResId( IB_RIGHT3 ), &maEdRight3, NULL, this ), + maEdRight3 ( this, NULL, ScResId( ED_RIGHT3 ) ), + maRBRight3 ( this, ScResId( IB_RIGHT3 ), &maEdRight3, this ), maBtnDel3 ( this, ScResId( IB_DELETE3 ) ), - maEdLeft4 ( this, ScResId( ED_LEFT4 ) ), - maRBLeft4 ( this, ScResId( IB_LEFT4 ), &maEdLeft4, NULL, this ), + maEdLeft4 ( this, NULL, ScResId( ED_LEFT4 ) ), + maRBLeft4 ( this, ScResId( IB_LEFT4 ), &maEdLeft4, this ), maLbOp4 ( this, ScResId( LB_OP4 ) ), - maEdRight4 ( this, ScResId( ED_RIGHT4 ) ), - maRBRight4 ( this, ScResId( IB_RIGHT4 ), &maEdRight4, NULL, this ), + maEdRight4 ( this, NULL, ScResId( ED_RIGHT4 ) ), + maRBRight4 ( this, ScResId( IB_RIGHT4 ), &maEdRight4, this ), maBtnDel4 ( this, ScResId( IB_DELETE4 ) ), maScrollBar ( this, ScResId( SB_SCROLL ) ), maFlButtons ( this, ScResId( FL_BUTTONS ) ), diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 4468198a75ae..7afa37cd1b45 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -47,8 +47,8 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), // aFtAssign ( this, ScResId( FT_ASSIGN ) ), - aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, &aFtAssign, this ), + aEdAssign ( this, this, &aFtAssign, ScResId( ED_ASSIGN ) ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index e5a69be23d25..80395f1f850b 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -60,15 +60,15 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, { get(m_pFtFormulaCell, "formulatext"); get(m_pEdFormulaCell, "formulaedit"); - m_pEdFormulaCell->SetRefDialog(this); + m_pEdFormulaCell->SetReferences(this, m_pFtFormulaCell); get(m_pRBFormulaCell, "formulabutton"); - m_pRBFormulaCell->SetReferences(this, m_pEdFormulaCell, m_pFtFormulaCell), + m_pRBFormulaCell->SetReferences(this, m_pEdFormulaCell), get(m_pEdTargetVal, "target"); get(m_pFtVariableCell, "vartext"); get(m_pEdVariableCell, "varedit"); - m_pEdVariableCell->SetRefDialog(this); + m_pEdVariableCell->SetReferences(this, m_pFtVariableCell); get(m_pRBVariableCell, "varbutton"); - m_pRBVariableCell->SetReferences(this, m_pEdVariableCell, m_pFtVariableCell); + m_pRBVariableCell->SetReferences(this, m_pEdVariableCell); get(m_pBtnOk, "ok"); get(m_pBtnCancel, "cancel"); Init(); diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index cce3d59b009c..443b87e4bcf5 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -45,14 +45,14 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ), - aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ), - aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, &aFtFormulaRange, this ), + aEdFormulaRange ( this, this, &aFtFormulaRange, ScResId( ED_FORMULARANGE ) ), + aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), aFtRowCell ( this, ScResId( FT_ROWCELL ) ), - aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ), - aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, &aFtRowCell, this ), + aEdRowCell ( this, this, &aFtRowCell, ScResId( ED_ROWCELL ) ), + aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), aFtColCell ( this, ScResId( FT_COLCELL ) ), - aEdColCell ( this, this, ScResId( ED_COLCELL ) ), - aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, &aFtColCell, this ), + aEdColCell ( this, this, &aFtColCell, ScResId( ED_COLCELL ) ), + aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 7ece754c88cf..812f56dc67bf 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -66,8 +66,9 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen { get(m_pEdName, "edit"); get(m_pEdRange, "range"); + m_pEdRange->SetReferences(this, m_pEdName); get(m_pRbRange, "refbutton"); - m_pRbRange->SetReferences(this, m_pEdRange, m_pEdName); + m_pRbRange->SetReferences(this, m_pEdRange); get(m_pLbScope, "scope"); get(m_pBtnRowHeader, "rowheader"); get(m_pBtnColHeader, "colheader"); diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 6675dbd3ac1d..4b715aece319 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -66,8 +66,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, { get(m_pEdName, "name"); get(m_pEdAssign, "range"); + m_pEdAssign->SetReferences(this, m_pEdName); get(m_pRbAssign, "assign"); - m_pRbAssign->SetReferences(this, m_pEdAssign, m_pEdName); + m_pRbAssign->SetReferences(this, m_pEdAssign); get(m_pLbScope, "scope"); get(m_pBtnPrintArea, "printrange"); get(m_pBtnColHeader, "colheader"); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 471b54317099..1235314452ca 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -109,18 +109,18 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* // aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ), aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), - aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ), - aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, &aFlPrintArea, this ), + aEdPrintArea ( this, this, &aFlPrintArea, ScResId( ED_PRINTAREA ) ), + aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), // aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ), aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), - aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ), - aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, &aFlRepeatRow, this ), + aEdRepeatRow ( this, this, &aFlRepeatRow, ScResId( ED_REPEATROW ) ), + aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), // aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ), aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), - aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ), - aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, &aFlRepeatCol, this ), + aEdRepeatCol ( this, this, &aFlRepeatCol, ScResId( ED_REPEATCOL ) ), + aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), // aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 4263a34ed3ad..952ac3c57d81 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -79,8 +79,8 @@ ScXMLSourceDlg::ScXMLSourceDlg( maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)), maFtMappedCellTitle(this, ScResId(FT_MAPPED_CELL_TITLE)), maLbTree(this, ScResId(LB_SOURCE_TREE)), - maRefEdit(this, this, ScResId(ED_MAPPED_CELL)), - maRefBtn(this, ScResId(BTN_MAPPED_CELL), &maRefEdit, NULL, this), + maRefEdit(this, this, NULL, ScResId(ED_MAPPED_CELL)), + maRefBtn(this, ScResId(BTN_MAPPED_CELL), &maRefEdit, this), maBtnOk(this, ScResId(BTN_OK)), maBtnCancel(this, ScResId(BTN_CANCEL)), maImgFileOpen(ScResId(IMG_FILE_OPEN)), |