diff options
Diffstat (limited to 'sc/source/ui/inc')
25 files changed, 190 insertions, 308 deletions
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx index 486322936ba8..0e4f81f41572 100644 --- a/sc/source/ui/inc/IAnyRefDialog.hxx +++ b/sc/source/ui/inc/IAnyRefDialog.hxx @@ -36,7 +36,6 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) = 0; - virtual void RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton = nullptr ) = 0; virtual void RefInputDone( bool bForced = false ) = 0; virtual bool IsTableLocked() const = 0; virtual bool IsRefInputMode() const = 0; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 55a476b86faf..ca78e004bb74 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -49,7 +49,7 @@ private: ScAddress::Details const maAddressDetails; bool mbDialogLostFocus; - formula::WeldRefEdit* mpActiveEdit; + formula::RefEdit* mpActiveEdit; std::unique_ptr<ScPivotLayoutTreeListLabel> mxListBoxField; std::unique_ptr<ScPivotLayoutTreeList> mxListBoxPage; std::unique_ptr<ScPivotLayoutTreeList> mxListBoxColumn; @@ -67,16 +67,16 @@ private: std::unique_ptr<weld::RadioButton> mxSourceRadioSelection; std::unique_ptr<weld::ComboBox> mxSourceListBox; - std::unique_ptr<formula::WeldRefEdit> mxSourceEdit; - std::unique_ptr<formula::WeldRefButton> mxSourceButton; + std::unique_ptr<formula::RefEdit> mxSourceEdit; + std::unique_ptr<formula::RefButton> mxSourceButton; std::unique_ptr<weld::RadioButton> mxDestinationRadioNewSheet; std::unique_ptr<weld::RadioButton> mxDestinationRadioNamedRange; std::unique_ptr<weld::RadioButton> mxDestinationRadioSelection; std::unique_ptr<weld::ComboBox> mxDestinationListBox; - std::unique_ptr<formula::WeldRefEdit> mxDestinationEdit; - std::unique_ptr<formula::WeldRefButton> mxDestinationButton; + std::unique_ptr<formula::RefEdit> mxDestinationEdit; + std::unique_ptr<formula::RefButton> mxDestinationButton; std::unique_ptr<weld::Button> mxBtnOK; std::unique_ptr<weld::Button> mxBtnCancel; @@ -91,14 +91,14 @@ private: DECL_LINK(CancelClicked, weld::Button&, void); DECL_LINK(OKClicked, weld::Button&, void); - DECL_LINK(GetEditFocusHandler, formula::WeldRefEdit&, void); - DECL_LINK(GetButtonFocusHandler, formula::WeldRefButton&, void); - DECL_LINK(LoseEditFocusHandler, formula::WeldRefEdit&, void); - DECL_LINK(LoseButtonFocusHandler, formula::WeldRefButton&, void); + DECL_LINK(GetEditFocusHandler, formula::RefEdit&, void); + DECL_LINK(GetButtonFocusHandler, formula::RefButton&, void); + DECL_LINK(LoseEditFocusHandler, formula::RefEdit&, void); + DECL_LINK(LoseButtonFocusHandler, formula::RefButton&, void); DECL_LINK(ToggleSource, weld::ToggleButton&, void); DECL_LINK(ToggleDestination, weld::ToggleButton&, void); DECL_LINK(SourceListSelected, weld::ComboBox&, void); - DECL_LINK(SourceEditModified, formula::WeldRefEdit&, void); + DECL_LINK(SourceEditModified, formula::RefEdit&, void); void ToggleSource(); void ToggleDestination(); virtual void Close() override; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index a281fb734566..a013d25c53c6 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -44,8 +44,8 @@ private: // Widgets std::unique_ptr<weld::Label> mxInputRangeText; - std::unique_ptr<formula::WeldRefEdit> mxInputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxInputRangeButton; + std::unique_ptr<formula::RefEdit> mxInputRangeEdit; + std::unique_ptr<formula::RefButton> mxInputRangeButton; std::unique_ptr<weld::ComboBox> mxDistributionCombo; std::unique_ptr<weld::Label> mxParameter1Text; std::unique_ptr<weld::SpinButton> mxParameter1Value; @@ -71,12 +71,12 @@ private: DECL_LINK( OkClicked, weld::Button&, void ); DECL_LINK( CloseClicked, weld::Button&, void ); DECL_LINK( ApplyClicked, weld::Button&, void ); - DECL_LINK( GetEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( LoseEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( LoseButtonFocusHandler, formula::WeldRefButton&, void ); + DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( LoseEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void ); - DECL_LINK( InputRangeModified, formula::WeldRefEdit&, void ); + DECL_LINK( InputRangeModified, formula::RefEdit&, void ); DECL_LINK( Parameter1ValueModified, weld::SpinButton&, void ); DECL_LINK( Parameter2ValueModified, weld::SpinButton&, void ); DECL_LINK( DistributionChanged, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 7b0751cc4782..a702bdf2871c 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -31,7 +31,7 @@ public: virtual void Close() override; private: - formula::WeldRefEdit* mpActiveEdit; + formula::RefEdit* mpActiveEdit; // Data ScViewData* const mViewData; @@ -50,12 +50,12 @@ private: // Widgets std::unique_ptr<weld::Label> mxInputRangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxInputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxInputRangeButton; + std::unique_ptr<formula::RefEdit> mxInputRangeEdit; + std::unique_ptr<formula::RefButton> mxInputRangeButton; std::unique_ptr<weld::Label> mxOutputRangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxOutputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxOutputRangeButton; + std::unique_ptr<formula::RefEdit> mxOutputRangeEdit; + std::unique_ptr<formula::RefButton> mxOutputRangeButton; std::unique_ptr<weld::SpinButton> mxSampleSize; std::unique_ptr<weld::SpinButton> mxPeriod; @@ -78,14 +78,14 @@ private: ScRange PerformPeriodicSampling(ScDocShell* pDocShell); DECL_LINK( OkClicked, weld::Button&, void ); - DECL_LINK( GetEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( LoseEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( LoseButtonFocusHandler, formula::WeldRefButton&, void ); + DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( LoseEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void ); DECL_LINK( SamplingSizeValueModified, weld::SpinButton&, void ); DECL_LINK( PeriodValueModified, weld::SpinButton&, void ); DECL_LINK( ToggleSamplingMethod, weld::ToggleButton&, void ); - DECL_LINK( RefInputModifyHandler, formula::WeldRefEdit&, void ); + DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void ); DECL_LINK( CheckHdl, weld::Button&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index cd689a85db15..e7727b95071c 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -46,12 +46,12 @@ protected: // Widgets std::unique_ptr<weld::Label> mxInputRangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxInputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxInputRangeButton; + std::unique_ptr<formula::RefEdit> mxInputRangeEdit; + std::unique_ptr<formula::RefButton> mxInputRangeButton; std::unique_ptr<weld::Label> mxOutputRangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxOutputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxOutputRangeButton; + std::unique_ptr<formula::RefEdit> mxOutputRangeEdit; + std::unique_ptr<formula::RefButton> mxOutputRangeButton; std::unique_ptr<weld::RadioButton> mxGroupByColumnsRadio; std::unique_ptr<weld::RadioButton> mxGroupByRowsRadio; @@ -72,7 +72,7 @@ private: // Widgets std::unique_ptr<weld::Button> mxButtonOk; - formula::WeldRefEdit* mpActiveEdit; + formula::RefEdit* mpActiveEdit; ScAddress const mCurrentAddress; bool mDialogLostFocus; @@ -81,11 +81,11 @@ private: DECL_LINK( GroupByChanged, weld::ToggleButton&, void ); DECL_LINK( OkClicked, weld::Button&, void ); - DECL_LINK( GetEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( LoseEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( LoseButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( RefInputModifyHandler, formula::WeldRefEdit&, void ); + DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( LoseEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void ); }; diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index bf4db74c2fd6..430201926f86 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -45,16 +45,16 @@ protected: // Widgets std::unique_ptr<weld::Label> mxVariable1RangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxVariable1RangeEdit; - std::unique_ptr<formula::WeldRefButton> mxVariable1RangeButton; + std::unique_ptr<formula::RefEdit> mxVariable1RangeEdit; + std::unique_ptr<formula::RefButton> mxVariable1RangeButton; std::unique_ptr<weld::Label> mxVariable2RangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxVariable2RangeEdit; - std::unique_ptr<formula::WeldRefButton> mxVariable2RangeButton; + std::unique_ptr<formula::RefEdit> mxVariable2RangeEdit; + std::unique_ptr<formula::RefButton> mxVariable2RangeButton; std::unique_ptr<weld::Label> mxOutputRangeLabel; - std::unique_ptr<formula::WeldRefEdit> mxOutputRangeEdit; - std::unique_ptr<formula::WeldRefButton> mxOutputRangeButton; + std::unique_ptr<formula::RefEdit> mxOutputRangeEdit; + std::unique_ptr<formula::RefButton> mxOutputRangeButton; // Data ScViewData* const mViewData; @@ -74,7 +74,7 @@ private: std::unique_ptr<weld::RadioButton> mxGroupByColumnsRadio; std::unique_ptr<weld::RadioButton> mxGroupByRowsRadio; - formula::WeldRefEdit* mpActiveEdit; + formula::RefEdit* mpActiveEdit; ScAddress const mCurrentAddress; bool mDialogLostFocus; @@ -83,11 +83,11 @@ private: DECL_LINK( GroupByChanged, weld::ToggleButton&, void ); DECL_LINK( OkClicked, weld::Button&, void ); - DECL_LINK( GetEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( LoseEditFocusHandler, formula::WeldRefEdit&, void ); - DECL_LINK( LoseButtonFocusHandler, formula::WeldRefButton&, void ); - DECL_LINK( RefInputModifyHandler, formula::WeldRefEdit&, void ); + DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( LoseEditFocusHandler, formula::RefEdit&, void ); + DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void ); + DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void ); }; #endif diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 978c733fb784..cf5e7390cd6c 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -38,38 +38,21 @@ class ScFormulaReferenceHelper { IAnyRefDialog* m_pDlg; ::std::unique_ptr<ScCompiler> m_pRefComp; - VclPtr<formula::RefEdit> m_pRefEdit; // active input field - VclPtr<formula::RefButton> m_pRefBtn; // associated button - formula::WeldRefEdit* m_pWeldRefEdit; // active input field - formula::WeldRefButton* m_pWeldRefBtn; // associated button - VclPtr<vcl::Window> m_pWindow; + formula::RefEdit* m_pRefEdit; // active input field + formula::RefButton* m_pRefBtn; // associated button weld::Dialog* m_pDialog; SfxBindings* const m_pBindings; - ::std::unique_ptr<Accelerator> - m_pAccel; // for Enter/Escape - ::std::vector<VclPtr<vcl::Window> > m_aHiddenWidgets; // vector of hidden Controls - sal_Int32 m_nOldBorderWidth; // border width for expanded dialog SCTAB m_nRefTab; // used for ShowReference OUString m_sOldDialogText; // Original title of the dialog window - Size m_aOldDialogSize; // Original size of the dialog window - Point m_aOldEditPos; // Original position of the input field - Size m_aOldEditSize; // Original size of the input field - long m_nOldEditWidthReq; - Point m_aOldButtonPos; // Original position of the button - VclPtr<vcl::Window> m_pOldEditParent; // Original parent of the edit field and the button - bool m_bOldDlgLayoutEnabled; // Original layout state of parent dialog - bool m_bOldEditParentLayoutEnabled; // Original layout state of edit widget parent bool m_bEnableColorRef; bool m_bHighlightRef; - bool m_bAccInserted; - DECL_LINK( AccelSelectHdl, Accelerator&, void ); DECL_LINK( ActivateHdl, weld::Widget&, bool ); public: - ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); + ScFormulaReferenceHelper(IAnyRefDialog* _pDlg, SfxBindings* _pBindings); ~ScFormulaReferenceHelper(); void dispose(); @@ -80,15 +63,11 @@ public: void ShowReference(const OUString& rStr); void ReleaseFocus( formula::RefEdit* pEdit ); - void ReleaseFocus( formula::WeldRefEdit* pEdit ); void HideReference( bool bDoneRefMode = true ); void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ); - void RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton ); void RefInputDone( bool bForced ); void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ); - void ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton ); - void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } void SetDialog(weld::Dialog* pDialog) { m_pDialog = pDialog; } void DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); @@ -98,21 +77,15 @@ public: static void enableInput(bool _bInput); public: - static bool CanInputStart( const formula::WeldRefEdit *pEdit ){ return !!pEdit; } - bool CanInputDone( bool bForced ){ return (m_pRefEdit || m_pWeldRefEdit) && (bForced || !(m_pRefBtn || m_pWeldRefBtn)); } + static bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } + bool CanInputDone(bool bForced) { return m_pRefEdit && (bForced || !m_pRefBtn); } }; -class SC_DLLPUBLIC ScRefHandler : - public IAnyRefDialog +class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog { - VclPtr<vcl::Window> m_rWindow; weld::DialogController* m_pController; bool m_bInRefMode; -public: - friend class formula::RefButton; - friend class formula::RefEdit; - private: ScFormulaReferenceHelper m_aHelper; @@ -127,14 +100,12 @@ protected: void SetDispatcherLock( bool bLock ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override; - virtual void RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton = nullptr ) override; virtual void RefInputDone( bool bForced = false ) override; bool ParseWithNames( ScRangeList& rRanges, const OUString& rStr, const ScDocument* pDoc ); public: - ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ); - ScRefHandler( SfxDialogController &rController, SfxBindings* pB, bool bBindRef ); + ScRefHandler(SfxDialogController &rController, SfxBindings* pB, bool bBindRef); virtual ~ScRefHandler() override; virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override = 0; @@ -148,9 +119,7 @@ public: virtual void HideReference( bool bDoneRefMode = true ) override; virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) override; - virtual void ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton ) override; virtual void ReleaseFocus( formula::RefEdit* pEdit ) override; - virtual void ReleaseFocus( formula::WeldRefEdit* pEdit ) override; virtual void ViewShellChanged() override; void SwitchToDocument(); @@ -160,81 +129,13 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - static inline bool CanInputStart( const formula::WeldRefEdit *pEdit ); - inline bool CanInputDone( bool bForced ); -}; - -template< class TWindow, bool bBindRef = true > -class ScRefHdlrImplBase: public TWindow, public ScRefHandler -{ -private: - template<class TBindings, class TChildWindow, class TParentWindow > - ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, - TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription ); - - template<class TParentWindow, class TArg> - ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB ); - - virtual ~ScRefHdlrImplBase() override; - - template<class, class, bool> friend struct ScRefHdlrImpl; -}; - -template<class TWindow, bool bBindRef> -template<class TBindings, class TChildWindow, class TParentWindow> -ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, - TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription ) - : TWindow(pB, pCW, pParent, rID, rUIXMLDescription ) - , ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ) -{ -} - -template<class TWindow, bool bBindRef > -template<class TParentWindow, class TArg> -ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB ) - : TWindow( pParent, rID, rUIXMLDescription, rArg ), - ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ) -{ -} - -template<class TWindow, bool bBindRef > -ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){} - -template<class TDerived, class TBase, bool bBindRef = true> -struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > -{ - enum { UNKNOWN_SLOTID = 0U, SLOTID = UNKNOWN_SLOTID }; - - template<class T1, class T2, class T3, class T4> - ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& rt4 ) - : ScRefHdlrImplBase<TBase, bBindRef >(rt1, rt2, rt3, rt4) + static bool CanInputStart( const formula::RefEdit *pEdit ) { + return ScFormulaReferenceHelper::CanInputStart( pEdit ); } - - template<class T1, class T2, class T3, class T4, class T5> - ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& rt4, const T5& rt5 ) - : ScRefHdlrImplBase<TBase, bBindRef >(rt1, rt2, rt3, rt4, rt5) - { - } - - virtual void dispose() override - { - ScRefHdlrImplBase<TBase, bBindRef >::disposeRefHandler(); - TBase::dispose(); - } - - ~ScRefHdlrImpl() - { - TBase::disposeOnce(); - } -}; - -struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> -{ - template<class T1, class T2, class T3, class T4, class T5> - ScAnyRefDlg( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& rt4, const T5& rt5 ) - : ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog>(rt1, rt2, rt3, rt4, rt5) + bool CanInputDone( bool bForced ) { + return m_aHelper.CanInputDone( bForced ); } }; @@ -264,16 +165,6 @@ struct ScAnyRefDlgController : ScRefHdlrControllerImpl<SfxModelessDialogControll } }; -inline bool ScRefHandler::CanInputStart( const formula::WeldRefEdit *pEdit ) -{ - return ScFormulaReferenceHelper::CanInputStart( pEdit ); -} - -inline bool ScRefHandler::CanInputDone( bool bForced ) -{ - return m_aHelper.CanInputDone( bForced ); -} - #endif // INCLUDED_SC_SOURCE_UI_INC_ANYREFDG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index f006d3bdee8d..a421049e28a4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -49,19 +49,19 @@ private: ScViewData* pViewData; SCTAB nCurTab; - formula::WeldRefEdit* m_pRefInputEdit; + formula::RefEdit* m_pRefInputEdit; std::unique_ptr<weld::ComboBox> m_xLbPrintArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdPrintArea; - std::unique_ptr<formula::WeldRefButton> m_xRbPrintArea; + std::unique_ptr<formula::RefEdit> m_xEdPrintArea; + std::unique_ptr<formula::RefButton> m_xRbPrintArea; std::unique_ptr<weld::ComboBox> m_xLbRepeatRow; - std::unique_ptr<formula::WeldRefEdit> m_xEdRepeatRow; - std::unique_ptr<formula::WeldRefButton> m_xRbRepeatRow; + std::unique_ptr<formula::RefEdit> m_xEdRepeatRow; + std::unique_ptr<formula::RefButton> m_xRbRepeatRow; std::unique_ptr<weld::ComboBox> m_xLbRepeatCol; - std::unique_ptr<formula::WeldRefEdit> m_xEdRepeatCol; - std::unique_ptr<formula::WeldRefButton> m_xRbRepeatCol; + std::unique_ptr<formula::RefEdit> m_xEdRepeatCol; + std::unique_ptr<formula::RefButton> m_xRbRepeatCol; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; @@ -77,13 +77,13 @@ private: void Impl_Reset(); bool Impl_CheckRefStrings(); void Impl_FillLists(); - bool Impl_GetItem( const formula::WeldRefEdit* pEd, SfxStringItem& rItem ); + bool Impl_GetItem( const formula::RefEdit* pEd, SfxStringItem& rItem ); // Handler: DECL_LINK( Impl_SelectHdl, weld::ComboBox&, void ); - DECL_LINK( Impl_ModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( Impl_ModifyHdl, formula::RefEdit&, void ); DECL_LINK( Impl_BtnHdl, weld::Button&, void ); - DECL_LINK( Impl_GetEditFocusHdl, formula::WeldRefEdit&, void ); + DECL_LINK( Impl_GetEditFocusHdl, formula::RefEdit&, void ); DECL_LINK( Impl_GetFocusHdl, weld::Widget&, void ); }; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index a2f9bae21864..39a53d408f4e 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -93,7 +93,7 @@ private: OUString msBaseTitle; - formula::WeldRefEdit* mpLastEdit; + formula::RefEdit* mpLastEdit; std::unique_ptr<weld::Button> mxBtnOk; std::unique_ptr<weld::Button> mxBtnAdd; std::unique_ptr<weld::Button> mxBtnRemove; @@ -101,12 +101,12 @@ private: std::unique_ptr<weld::Button> mxBtnDown; std::unique_ptr<weld::Button> mxBtnCancel; std::unique_ptr<weld::Label> mxFtRange; - std::unique_ptr<formula::WeldRefEdit> mxEdRange; - std::unique_ptr<formula::WeldRefButton> mxRbRange; + std::unique_ptr<formula::RefEdit> mxEdRange; + std::unique_ptr<formula::RefButton> mxRbRange; std::unique_ptr<ScCondFormatList> mxCondFormList; void updateTitle(); - DECL_LINK( EdRangeModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( EdRangeModifyHdl, formula::RefEdit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; @@ -130,7 +130,7 @@ public: void OnSelectionChange(size_t nIndex, size_t nSize, bool bSelected = true); DECL_LINK( BtnPressedHdl, weld::Button&, void ); - DECL_LINK( RangeGetFocusHdl, formula::WeldRefEdit&, void ); + DECL_LINK( RangeGetFocusHdl, formula::RefEdit&, void ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 83ba66460ec4..cb3618a212ff 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -105,8 +105,8 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener //cond format ui elements FontPrevWindow maWdPreview; std::unique_ptr<weld::ComboBox> mxLbCondType; - std::unique_ptr<formula::WeldRefEdit> mxEdVal1; - std::unique_ptr<formula::WeldRefEdit> mxEdVal2; + std::unique_ptr<formula::RefEdit> mxEdVal1; + std::unique_ptr<formula::RefEdit> mxEdVal2; std::unique_ptr<weld::Label> mxFtVal; std::unique_ptr<weld::Label> mxFtStyle; std::unique_ptr<weld::ComboBox> mxLbStyle; @@ -124,7 +124,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener void Init(ScCondFormatDlg* pDialogParent); DECL_LINK( StyleSelectHdl, weld::ComboBox&, void ); DECL_LINK( ConditionTypeSelectHdl, weld::ComboBox&, void ); - DECL_LINK( OnEdChanged, formula::WeldRefEdit&, void ); + DECL_LINK( OnEdChanged, formula::RefEdit&, void ); // Searches the lookup table for the entry position, given condition mode static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); @@ -158,7 +158,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry std::unique_ptr<weld::ComboBox> mxLbStyle; std::unique_ptr<weld::Widget> mxWdPreviewWin; std::unique_ptr<weld::CustomWeld> mxWdPreview; - std::unique_ptr<formula::WeldRefEdit> mxEdFormula; + std::unique_ptr<formula::RefEdit> mxEdFormula; ScFormatEntry* createFormulaEntry() const; virtual OUString GetExpressionString() override; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index ccb943e4c1ad..24f6810b14cb 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -57,18 +57,18 @@ private: sal_uInt16 const nWhichCons; bool bDlgLostFocus; - formula::WeldRefEdit* m_pRefInputEdit; + formula::RefEdit* m_pRefInputEdit; std::unique_ptr<weld::ComboBox> m_xLbFunc; std::unique_ptr<weld::TreeView> m_xLbConsAreas; std::unique_ptr<weld::ComboBox> m_xLbDataArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdDataArea; - std::unique_ptr<formula::WeldRefButton> m_xRbDataArea; + std::unique_ptr<formula::RefEdit> m_xEdDataArea; + std::unique_ptr<formula::RefButton> m_xRbDataArea; std::unique_ptr<weld::ComboBox> m_xLbDestArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdDestArea; - std::unique_ptr<formula::WeldRefButton> m_xRbDestArea; + std::unique_ptr<formula::RefEdit> m_xEdDestArea; + std::unique_ptr<formula::RefButton> m_xRbDestArea; std::unique_ptr<weld::Expander> m_xExpander; std::unique_ptr<weld::CheckButton> m_xBtnByRow; @@ -86,13 +86,13 @@ private: void Init (); void FillAreaLists (); - bool VerifyEdit(formula::WeldRefEdit* pEd); + bool VerifyEdit(formula::RefEdit* pEd); DECL_LINK( OkHdl, weld::Button&, void ); DECL_LINK( ClickHdl, weld::Button&, void ); DECL_LINK( GetFocusHdl, weld::Widget&, void ); - DECL_LINK( GetEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( ModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( ModifyHdl, formula::RefEdit&, void ); DECL_LINK( SelectTVHdl, weld::TreeView&, void ); DECL_LINK( SelectCBHdl, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 948724e08e84..697721e4668b 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -55,15 +55,15 @@ private: ScDocument* pDoc; bool bDlgLostFocus; - formula::WeldRefEdit* m_pEdActive; + formula::RefEdit* m_pEdActive; std::unique_ptr<weld::TreeView> m_xLbRange; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign; + std::unique_ptr<formula::RefEdit> m_xEdAssign; + std::unique_ptr<formula::RefButton> m_xRbAssign; std::unique_ptr<weld::RadioButton> m_xBtnColHead; std::unique_ptr<weld::RadioButton> m_xBtnRowHead; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign2; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign2; + std::unique_ptr<formula::RefEdit> m_xEdAssign2; + std::unique_ptr<formula::RefButton> m_xRbAssign2; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; @@ -84,14 +84,14 @@ private: DECL_LINK( AddBtnHdl, weld::Button&, void ); DECL_LINK( RemoveBtnHdl, weld::Button&, void ); DECL_LINK( Range1SelectHdl, weld::TreeView&, void ); - DECL_LINK( Range1DataModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( Range1DataModifyHdl, formula::RefEdit&, void ); DECL_LINK( ColClickHdl, weld::Button&, void ); DECL_LINK( RowClickHdl, weld::Button&, void ); - DECL_LINK( Range2DataModifyHdl, formula::WeldRefEdit&, void ); - DECL_LINK( GetEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( LoseEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHdl, formula::WeldRefButton&, void ); - DECL_LINK( LoseButtonFocusHdl, formula::WeldRefButton&, void ); + DECL_LINK( Range2DataModifyHdl, formula::RefEdit&, void ); + DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHdl, formula::RefButton&, void ); + DECL_LINK( LoseButtonFocusHdl, formula::RefButton&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 60e9511c0877..19991075b530 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -67,8 +67,8 @@ private: std::unique_ptr<weld::EntryTreeView> m_xEdName; std::unique_ptr<weld::Frame> m_xAssignFrame; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign; + std::unique_ptr<formula::RefEdit> m_xEdAssign; + std::unique_ptr<formula::RefButton> m_xRbAssign; std::unique_ptr<weld::Widget> m_xOptions; std::unique_ptr<weld::CheckButton> m_xBtnHeader; @@ -100,7 +100,7 @@ private: DECL_LINK( AddBtnHdl, weld::Button&, void ); DECL_LINK( RemoveBtnHdl, weld::Button&, void ); DECL_LINK( NameModifyHdl, weld::ComboBox&, void ); - DECL_LINK( AssModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( AssModifyHdl, formula::RefEdit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DBNAMDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index a84a5289ab70..3ecaf6e322a7 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -130,8 +130,8 @@ private: std::unique_ptr<weld::CheckButton> m_xBtnUnique; std::unique_ptr<weld::CheckButton> m_xBtnCopyResult; std::unique_ptr<weld::ComboBox> m_xLbCopyArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdCopyArea; - std::unique_ptr<formula::WeldRefButton> m_xRbCopyArea; + std::unique_ptr<formula::RefEdit> m_xEdCopyArea; + std::unique_ptr<formula::RefButton> m_xRbCopyArea; std::unique_ptr<weld::CheckButton> m_xBtnDestPers; std::unique_ptr<weld::Label> m_xFtDbAreaLabel; std::unique_ptr<weld::Label> m_xFtDbArea; @@ -184,11 +184,11 @@ private: bool bRefInputMode; - formula::WeldRefEdit* m_pRefInputEdit; + formula::RefEdit* m_pRefInputEdit; std::unique_ptr<weld::ComboBox> m_xLbFilterArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdFilterArea; - std::unique_ptr<formula::WeldRefButton> m_xRbFilterArea; + std::unique_ptr<formula::RefEdit> m_xEdFilterArea; + std::unique_ptr<formula::RefButton> m_xRbFilterArea; std::unique_ptr<weld::Expander> m_xExpander; std::unique_ptr<weld::CheckButton> m_xBtnCase; @@ -197,8 +197,8 @@ private: std::unique_ptr<weld::CheckButton> m_xBtnUnique; std::unique_ptr<weld::CheckButton> m_xBtnCopyResult; std::unique_ptr<weld::ComboBox> m_xLbCopyArea; - std::unique_ptr<formula::WeldRefEdit> m_xEdCopyArea; - std::unique_ptr<formula::WeldRefButton> m_xRbCopyArea; + std::unique_ptr<formula::RefEdit> m_xEdCopyArea; + std::unique_ptr<formula::RefButton> m_xRbCopyArea; std::unique_ptr<weld::CheckButton> m_xBtnDestPers; std::unique_ptr<weld::Label> m_xFtDbAreaLabel; std::unique_ptr<weld::Label> m_xFtDbArea; @@ -216,12 +216,12 @@ private: // Handler DECL_LINK( FilterAreaSelHdl, weld::ComboBox&, void ); - DECL_LINK( FilterAreaModHdl, formula::WeldRefEdit&, void ); + DECL_LINK( FilterAreaModHdl, formula::RefEdit&, void ); DECL_LINK( EndDlgHdl, weld::Button&, void ); // RefInput control - DECL_LINK( RefInputEditHdl, formula::WeldRefEdit&, void ); - DECL_LINK( RefInputButtonHdl, formula::WeldRefButton&, void ); + DECL_LINK( RefInputEditHdl, formula::RefEdit&, void ); + DECL_LINK( RefInputButtonHdl, formula::RefButton&, void ); void RefInputHdl(); }; diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 7286c129fb1f..e5385978b45f 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -27,8 +27,8 @@ namespace formula { class RefButton; - class WeldRefButton; - class WeldRefEdit; + class RefButton; + class RefEdit; } struct ScQueryParam; class ScDocument; @@ -46,8 +46,8 @@ public: weld::CheckButton* refBtnCopyResult, weld::CheckButton* refBtnDestPers, weld::ComboBox* refLbCopyArea, - formula::WeldRefEdit* refEdCopyArea, - formula::WeldRefButton* refRbCopyArea, + formula::RefEdit* refEdCopyArea, + formula::RefButton* refRbCopyArea, weld::Label* refFtDbAreaLabel, weld::Label* refFtDbArea, const OUString& refStrUndefined ); @@ -65,8 +65,8 @@ private: weld::CheckButton* pBtnCopyResult; weld::CheckButton* pBtnDestPers; weld::ComboBox* pLbCopyArea; - formula::WeldRefEdit* pEdCopyArea; - formula::WeldRefButton* pRbCopyArea; + formula::RefEdit* pEdCopyArea; + formula::RefButton* pRbCopyArea; weld::Label* pFtDbAreaLabel; weld::Label* pFtDbArea; @@ -78,7 +78,7 @@ private: void Init(); // Handler: - DECL_LINK( EdAreaModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( EdAreaModifyHdl, formula::RefEdit&, void ); DECL_LINK( LbAreaSelHdl, weld::ComboBox&, void ); DECL_LINK( BtnCopyResultHdl, weld::ToggleButton&, void ); }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 1940b4bf5865..9d4e7c68fc42 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -82,9 +82,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pD ) override; virtual void ReleaseFocus( formula::RefEdit* pEdit ) override; - virtual void ReleaseFocus( formula::WeldRefEdit* pEdit ) override; virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) override; - virtual void ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton ) override; virtual void RefInputDone( bool bForced = false ) override; virtual bool IsTableLocked() const override; virtual bool IsRefInputMode() const override; @@ -96,7 +94,6 @@ public: private: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override; - virtual void RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton = nullptr ) override; static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); static bool IsInputHdl(const ScInputHandler* pHdl); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index ffb504cdf633..e2b6c104590e 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -41,8 +41,8 @@ private: std::unique_ptr<weld::CheckButton> m_xCbReject; std::unique_ptr<weld::Button> m_xOkButton; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign; + std::unique_ptr<formula::RefEdit> m_xEdAssign; + std::unique_ptr<formula::RefButton> m_xRbAssign; std::unique_ptr<weld::Container> m_xBox; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index aa9861cd278f..0aa08781d574 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -44,8 +44,8 @@ private: std::unique_ptr<weld::Entry> m_xEdName; - std::unique_ptr<formula::WeldRefEdit> m_xEdRange; - std::unique_ptr<formula::WeldRefButton> m_xRbRange; + std::unique_ptr<formula::RefEdit> m_xEdRange; + std::unique_ptr<formula::RefButton> m_xRbRange; std::unique_ptr<weld::ComboBox> m_xLbScope; @@ -69,7 +69,7 @@ private: DECL_LINK( CancelBtnHdl, weld::Button&, void ); DECL_LINK( AddBtnHdl, weld::Button&, void ); DECL_LINK( NameModifyHdl, weld::Entry&, void ); - DECL_LINK( AssignGetFocusHdl, formula::WeldRefEdit&, void ); + DECL_LINK( AssignGetFocusHdl, formula::RefEdit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index dd87ede4acdf..09effbb234af 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -57,8 +57,8 @@ private: std::unique_ptr<weld::Entry> m_xEdName; std::unique_ptr<weld::Label> m_xFtAssign; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign; + std::unique_ptr<formula::RefEdit> m_xEdAssign; + std::unique_ptr<formula::RefButton> m_xRbAssign; std::unique_ptr<weld::ComboBox> m_xLbScope; std::unique_ptr<weld::CheckButton> m_xBtnPrintArea; @@ -101,9 +101,9 @@ private: DECL_LINK( AddBtnHdl, weld::Button&, void ); DECL_LINK( RemoveBtnHdl, weld::Button&, void ); DECL_LINK( EdModifyHdl, weld::Entry&, void ); - DECL_LINK( RefEdModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( RefEdModifyHdl, formula::RefEdit&, void ); DECL_LINK( EdModifyCheckBoxHdl, weld::ToggleButton&, void ); - DECL_LINK( AssignGetFocusHdl, formula::WeldRefEdit&, void ); + DECL_LINK( AssignGetFocusHdl, formula::RefEdit&, void ); DECL_LINK( SelectionChangedHdl_Impl, weld::TreeView&, void ); DECL_LINK( ScopeChangedHdl, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 9b8b78501726..05d93362ee80 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -class ScCursorRefEdit : public formula::WeldRefEdit +class ScCursorRefEdit : public formula::RefEdit { Link<ScCursorRefEdit&,void> maCursorUpLink; Link<ScCursorRefEdit&,void> maCursorDownLink; @@ -119,57 +119,57 @@ private: static const sal_uInt16 EDIT_ROW_COUNT = 4; ScCursorRefEdit* mpLeftEdit[EDIT_ROW_COUNT]; - formula::WeldRefButton* mpLeftButton[EDIT_ROW_COUNT]; + formula::RefButton* mpLeftButton[EDIT_ROW_COUNT]; ScCursorRefEdit* mpRightEdit[EDIT_ROW_COUNT]; - formula::WeldRefButton* mpRightButton[EDIT_ROW_COUNT]; + formula::RefButton* mpRightButton[EDIT_ROW_COUNT]; weld::ComboBox* mpOperator[EDIT_ROW_COUNT]; weld::Button* mpDelButton[EDIT_ROW_COUNT]; - formula::WeldRefEdit* mpEdActive; + formula::RefEdit* mpEdActive; std::unique_ptr<weld::Label> m_xFtObjectiveCell; - std::unique_ptr<formula::WeldRefEdit> m_xEdObjectiveCell; - std::unique_ptr<formula::WeldRefButton> m_xRBObjectiveCell; + std::unique_ptr<formula::RefEdit> m_xEdObjectiveCell; + std::unique_ptr<formula::RefButton> m_xRBObjectiveCell; std::unique_ptr<weld::RadioButton> m_xRbMax; std::unique_ptr<weld::RadioButton> m_xRbMin; std::unique_ptr<weld::RadioButton> m_xRbValue; - std::unique_ptr<formula::WeldRefEdit> m_xEdTargetValue; - std::unique_ptr<formula::WeldRefButton> m_xRBTargetValue; + std::unique_ptr<formula::RefEdit> m_xEdTargetValue; + std::unique_ptr<formula::RefButton> m_xRBTargetValue; std::unique_ptr<weld::Label> m_xFtVariableCells; - std::unique_ptr<formula::WeldRefEdit> m_xEdVariableCells; - std::unique_ptr<formula::WeldRefButton> m_xRBVariableCells; + std::unique_ptr<formula::RefEdit> m_xEdVariableCells; + std::unique_ptr<formula::RefButton> m_xRBVariableCells; std::unique_ptr<weld::Label> m_xFtCellRef; // labels are together with controls for the first row std::unique_ptr<ScCursorRefEdit> m_xEdLeft1; - std::unique_ptr<formula::WeldRefButton> m_xRBLeft1; + std::unique_ptr<formula::RefButton> m_xRBLeft1; std::unique_ptr<weld::Label> m_xFtOperator; std::unique_ptr<weld::ComboBox> m_xLbOp1; std::unique_ptr<weld::Label> m_xFtConstraint; std::unique_ptr<ScCursorRefEdit> m_xEdRight1; - std::unique_ptr<formula::WeldRefButton> m_xRBRight1; + std::unique_ptr<formula::RefButton> m_xRBRight1; std::unique_ptr<weld::Button> m_xBtnDel1; std::unique_ptr<ScCursorRefEdit> m_xEdLeft2; - std::unique_ptr<formula::WeldRefButton> m_xRBLeft2; + std::unique_ptr<formula::RefButton> m_xRBLeft2; std::unique_ptr<weld::ComboBox> m_xLbOp2; std::unique_ptr<ScCursorRefEdit> m_xEdRight2; - std::unique_ptr<formula::WeldRefButton> m_xRBRight2; + std::unique_ptr<formula::RefButton> m_xRBRight2; std::unique_ptr<weld::Button> m_xBtnDel2; std::unique_ptr<ScCursorRefEdit> m_xEdLeft3; - std::unique_ptr<formula::WeldRefButton> m_xRBLeft3; + std::unique_ptr<formula::RefButton> m_xRBLeft3; std::unique_ptr<weld::ComboBox> m_xLbOp3; std::unique_ptr<ScCursorRefEdit> m_xEdRight3; - std::unique_ptr<formula::WeldRefButton> m_xRBRight3; + std::unique_ptr<formula::RefButton> m_xRBRight3; std::unique_ptr<weld::Button> m_xBtnDel3; std::unique_ptr<ScCursorRefEdit> m_xEdLeft4; - std::unique_ptr<formula::WeldRefButton> m_xRBLeft4; + std::unique_ptr<formula::RefButton> m_xRBLeft4; std::unique_ptr<weld::ComboBox> m_xLbOp4; std::unique_ptr<ScCursorRefEdit> m_xEdRight4; - std::unique_ptr<formula::WeldRefButton> m_xRBRight4; + std::unique_ptr<formula::RefButton> m_xRBRight4; std::unique_ptr<weld::Button> m_xBtnDel4; std::unique_ptr<weld::ScrolledWindow> m_xScrollBar; @@ -188,20 +188,20 @@ private: void EnableButtons(); bool ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange ); bool FindTimeout( sal_Int32& rTimeout ); - void ShowError( bool bCondition, formula::WeldRefEdit* pFocus ); + void ShowError( bool bCondition, formula::RefEdit* pFocus ); DECL_LINK( BtnHdl, weld::Button&, void ); DECL_LINK( DelBtnHdl, weld::Button&, void ); - DECL_LINK( GetEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHdl, formula::WeldRefButton&, void ); + DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHdl, formula::RefButton&, void ); DECL_LINK( GetFocusHdl, weld::Widget&, void ); - DECL_LINK( LoseEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( LoseButtonFocusHdl, formula::WeldRefButton&, void ); + DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( LoseButtonFocusHdl, formula::RefButton&, void ); DECL_LINK( ScrollHdl, weld::ScrolledWindow&, void); DECL_LINK( CursorUpHdl, ScCursorRefEdit&, void ); DECL_LINK( CursorDownHdl, ScCursorRefEdit&, void ); - DECL_LINK( CondModifyHdl, formula::WeldRefEdit&, void ); - DECL_LINK( TargetModifyHdl, formula::WeldRefEdit&, void ); + DECL_LINK( CondModifyHdl, formula::RefEdit&, void ); + DECL_LINK( TargetModifyHdl, formula::RefEdit&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); }; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 7920005ac437..b5b4bceb4007 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -41,8 +41,8 @@ private: bool bMultiSelection; std::unique_ptr<weld::Label> m_xFtAssign; - std::unique_ptr<formula::WeldRefEdit> m_xEdAssign; - std::unique_ptr<formula::WeldRefButton> m_xRbAssign; + std::unique_ptr<formula::RefEdit> m_xEdAssign; + std::unique_ptr<formula::RefButton> m_xRbAssign; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 173ced735a6a..474d202c0a2b 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -59,17 +59,17 @@ private: const OUString errMsgNoFormula; const OUString errMsgInvalidVal; - formula::WeldRefEdit* m_pEdActive; + formula::RefEdit* m_pEdActive; std::unique_ptr<weld::Label> m_xFtFormulaCell; - std::unique_ptr<formula::WeldRefEdit> m_xEdFormulaCell; - std::unique_ptr<formula::WeldRefButton> m_xRBFormulaCell; + std::unique_ptr<formula::RefEdit> m_xEdFormulaCell; + std::unique_ptr<formula::RefButton> m_xRBFormulaCell; std::unique_ptr<weld::Entry> m_xEdTargetVal; std::unique_ptr<weld::Label> m_xFtVariableCell; - std::unique_ptr<formula::WeldRefEdit> m_xEdVariableCell; - std::unique_ptr<formula::WeldRefButton> m_xRBVariableCell; + std::unique_ptr<formula::RefEdit> m_xEdVariableCell; + std::unique_ptr<formula::RefButton> m_xRBVariableCell; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; @@ -79,11 +79,11 @@ private: void RaiseError( ScSolverErr eError ); DECL_LINK( BtnHdl, weld::Button&, void ); - DECL_LINK( GetEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( LoseEditFocusHdl, formula::WeldRefEdit&, void ); + DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void ); - DECL_LINK( GetButtonFocusHdl, formula::WeldRefButton&, void ); - DECL_LINK( LoseButtonFocusHdl, formula::WeldRefButton&, void ); + DECL_LINK( GetButtonFocusHdl, formula::RefButton&, void ); + DECL_LINK( LoseButtonFocusHdl, formula::RefButton&, void ); DECL_LINK( GetFocusHdl, weld::Widget&, void ); }; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index a9e6ebf41a99..80d6b16869f6 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -64,18 +64,18 @@ private: const OUString errMsgNoColFormula; const OUString errMsgNoRowFormula; - formula::WeldRefEdit* m_pEdActive; + formula::RefEdit* m_pEdActive; std::unique_ptr<weld::Label> m_xFtFormulaRange; - std::unique_ptr<formula::WeldRefEdit> m_xEdFormulaRange; - std::unique_ptr<formula::WeldRefButton> m_xRBFormulaRange; + std::unique_ptr<formula::RefEdit> m_xEdFormulaRange; + std::unique_ptr<formula::RefButton> m_xRBFormulaRange; std::unique_ptr<weld::Label> m_xFtRowCell; - std::unique_ptr<formula::WeldRefEdit> m_xEdRowCell; - std::unique_ptr<formula::WeldRefButton> m_xRBRowCell; + std::unique_ptr<formula::RefEdit> m_xEdRowCell; + std::unique_ptr<formula::RefButton> m_xRBRowCell; std::unique_ptr<weld::Label> m_xFtColCell; - std::unique_ptr<formula::WeldRefEdit> m_xEdColCell; - std::unique_ptr<formula::WeldRefButton> m_xRBColCell; + std::unique_ptr<formula::RefEdit> m_xEdColCell; + std::unique_ptr<formula::RefButton> m_xRBColCell; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; @@ -84,10 +84,10 @@ private: void RaiseError( ScTabOpErr eError ); DECL_LINK( BtnHdl, weld::Button&, void ); - DECL_LINK( GetEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( LoseEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( GetButtonFocusHdl, formula::WeldRefButton&, void ); - DECL_LINK( LoseButtonFocusHdl, formula::WeldRefButton&, void ); + DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( GetButtonFocusHdl, formula::RefButton&, void ); + DECL_LINK( LoseButtonFocusHdl, formula::RefButton&, void ); }; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9cca33cbc282..5912431de0ee 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -40,7 +40,7 @@ protected: #endif void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , const ScDocument* ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); - void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::WeldRefEdit* pEdit, const formula::WeldRefButton* pButton ); + void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); #if defined( _WIN32) #pragma pack(pop) @@ -49,7 +49,7 @@ protected: public: typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , const ScDocument* ); typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); - typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( formula::WeldRefEdit* pEdit, const formula::WeldRefButton* pButton ); + typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) { @@ -107,12 +107,12 @@ private: OUString const maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK( EditSetFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( KillEditFocusHdl, formula::WeldRefEdit&, void ); - DECL_LINK( KillButtonFocusHdl, formula::WeldRefButton&, void ); - DECL_LINK( ClickHdl, formula::WeldRefButton&, void ); + DECL_LINK( EditSetFocusHdl, formula::RefEdit&, void ); + DECL_LINK( KillEditFocusHdl, formula::RefEdit&, void ); + DECL_LINK( KillButtonFocusHdl, formula::RefButton&, void ); + DECL_LINK( ClickHdl, formula::RefButton&, void ); - formula::WeldRefEdit* m_pRefEdit; + formula::RefEdit* m_pRefEdit; std::unique_ptr<weld::ComboBox> m_xLbAllow; std::unique_ptr<weld::CheckButton> m_xCbAllow; /// Allow blank cells. @@ -122,12 +122,12 @@ private: std::unique_ptr<weld::ComboBox> m_xLbValue; std::unique_ptr<weld::Label> m_xFtMin; std::unique_ptr<weld::Widget> m_xMinGrid; - std::unique_ptr<formula::WeldRefEdit> m_xEdMin; + std::unique_ptr<formula::RefEdit> m_xEdMin; std::unique_ptr<weld::TextView> m_xEdList; /// Entries for explicit list std::unique_ptr<weld::Label> m_xFtMax; - std::unique_ptr<formula::WeldRefEdit> m_xEdMax; + std::unique_ptr<formula::RefEdit> m_xEdMax; std::unique_ptr<weld::Label> m_xFtHint; /// Hint text for cell range validity. - std::unique_ptr<formula::WeldRefButton> m_xBtnRef; + std::unique_ptr<formula::RefButton> m_xBtnRef; std::unique_ptr<weld::Container> m_xRefGrid; weld::Container* m_pRefEditParent; @@ -135,7 +135,7 @@ private: void SetReferenceHdl( const ScRange& , const ScDocument* ); void SetActiveHdl(); - void RefInputStartPreHdl(formula::WeldRefEdit* pEdit, const formula::WeldRefButton* pButton); + void RefInputStartPreHdl(formula::RefEdit* pEdit, const formula::RefButton* pButton); void RefInputDonePostHdl(); ScValidationDlg * GetValidationDlg(); public: @@ -192,7 +192,7 @@ public: bool IsRefInputting(){ return m_bRefInputting; } weld::Container* get_refinput_shrink_parent() { return m_xHBox.get(); } - virtual void RefInputStart( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton = nullptr ) override + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override { if( !CanInputStart( pEdit ) ) return; @@ -203,11 +203,6 @@ public: ScValidationDlgBase::RefInputStart( pEdit, pButton ); } - virtual void RefInputStart( formula::RefEdit* /*pEdit*/, formula::RefButton* /*pButton*/ = nullptr ) override - { - assert(false); - } - virtual void RefInputDone( bool bForced = false ) override { if( !CanInputDone( bForced ) ) diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 8b4c6b1871cb..3e9fc05f5a05 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -51,15 +51,15 @@ class ScXMLSourceDlg : public ScAnyRefDlgController ScDocument* mpDoc; bool mbDlgLostFocus; - formula::WeldRefEdit* mpActiveEdit; + formula::RefEdit* mpActiveEdit; std::unique_ptr<weld::Button> mxBtnSelectSource; std::unique_ptr<weld::Label> mxFtSourceFile; std::unique_ptr<weld::Container> mxMapGrid; std::unique_ptr<weld::TreeView> mxLbTree; - std::unique_ptr<formula::WeldRefEdit> mxRefEdit; - std::unique_ptr<formula::WeldRefButton> mxRefBtn; + std::unique_ptr<formula::RefEdit> mxRefEdit; + std::unique_ptr<formula::RefButton> mxRefBtn; std::unique_ptr<weld::Button> mxBtnOk; std::unique_ptr<weld::Button> mxBtnCancel; @@ -108,7 +108,7 @@ private: DECL_LINK(BtnPressedHdl, weld::Button&, void); DECL_LINK(TreeItemSelectHdl, weld::TreeView&, void); - DECL_LINK(RefModifiedHdl, formula::WeldRefEdit&, void); + DECL_LINK(RefModifiedHdl, formula::RefEdit&, void); }; #endif |