diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-04-10 12:16:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-11 09:56:23 +0200 |
commit | f4a0c9d9728499176460f8641d3c4edd3a31fdb4 (patch) | |
tree | cdba638a3e6dc3b7ee20a95219edec1c1d4da5ff /sc/source | |
parent | c2d2f91a6cb684c435ff5a5b68f90be69328aab2 (diff) |
ScStatisticsTwoVariableDialog no longer used
Change-Id: Id0aff27f71263769c74ce0a4fc8240ce4fe2110e
Reviewed-on: https://gerrit.libreoffice.org/70540
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 317 | ||||
-rw-r--r-- | sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 72 |
2 files changed, 0 insertions, 389 deletions
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 1dfce0397f53..07cb21b60b90 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -18,323 +18,6 @@ #include <StatisticsTwoVariableDialog.hxx> -ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( - SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - vcl::Window* pParent, ScViewData* pViewData, const OUString& rID, const OUString& rUIXMLDescription ) : - ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), - mViewData ( pViewData ), - mDocument ( pViewData->GetDocument() ), - mVariable1Range ( ScAddress::INITIALIZE_INVALID ), - mVariable2Range ( ScAddress::INITIALIZE_INVALID ), - mAddressDetails ( mDocument->GetAddressConvention(), 0, 0 ), - mOutputAddress ( ScAddress::INITIALIZE_INVALID ), - mGroupedBy ( BY_COLUMN ), - mpActiveEdit ( nullptr ), - mCurrentAddress ( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo() ), - mDialogLostFocus( false ) -{ - get(mpVariable1RangeLabel, "variable1-range-label"); - get(mpVariable1RangeEdit, "variable1-range-edit"); - get(mpVariable1RangeButton, "variable1-range-button"); - mpVariable1RangeEdit->SetReferences(this, mpVariable1RangeLabel); - mpVariable1RangeButton->SetReferences(this, mpVariable1RangeEdit); - - get(mpVariable2RangeLabel, "variable2-range-label"); - get(mpVariable2RangeEdit, "variable2-range-edit"); - get(mpVariable2RangeButton, "variable2-range-button"); - mpVariable2RangeEdit->SetReferences(this, mpVariable2RangeLabel); - mpVariable2RangeButton->SetReferences(this, mpVariable2RangeEdit); - - get(mpOutputRangeLabel, "output-range-label"); - get(mpOutputRangeEdit, "output-range-edit"); - get(mpOutputRangeButton, "output-range-button"); - mpOutputRangeEdit->SetReferences(this, mpOutputRangeLabel); - mpOutputRangeButton->SetReferences(this, mpOutputRangeEdit); - - get(mpButtonOk, "ok"); - - get(mpGroupByColumnsRadio, "groupedby-columns-radio"); - get(mpGroupByRowsRadio, "groupedby-rows-radio"); - - Init(); - GetRangeFromSelection(); -} - -ScStatisticsTwoVariableDialog::~ScStatisticsTwoVariableDialog() -{ - disposeOnce(); -} - -void ScStatisticsTwoVariableDialog::dispose() -{ - mpVariable1RangeLabel.clear(); - mpVariable1RangeEdit.clear(); - mpVariable1RangeButton.clear(); - mpVariable2RangeLabel.clear(); - mpVariable2RangeEdit.clear(); - mpVariable2RangeButton.clear(); - mpOutputRangeLabel.clear(); - mpOutputRangeEdit.clear(); - mpOutputRangeButton.clear(); - mpButtonOk.clear(); - mpGroupByColumnsRadio.clear(); - mpGroupByRowsRadio.clear(); - mpActiveEdit.clear(); - ScAnyRefDlg::dispose(); -} - -void ScStatisticsTwoVariableDialog::Init() -{ - mpButtonOk->SetClickHdl( LINK( this, ScStatisticsTwoVariableDialog, OkClicked ) ); - mpButtonOk->Enable(false); - - Link<Control&,void> aLink = LINK( this, ScStatisticsTwoVariableDialog, GetFocusHandler ); - mpVariable1RangeEdit->SetGetFocusHdl( aLink ); - mpVariable1RangeButton->SetGetFocusHdl( aLink ); - mpVariable2RangeEdit->SetGetFocusHdl( aLink ); - mpVariable2RangeButton->SetGetFocusHdl( aLink ); - mpOutputRangeEdit->SetGetFocusHdl( aLink ); - mpOutputRangeButton->SetGetFocusHdl( aLink ); - - aLink = LINK( this, ScStatisticsTwoVariableDialog, LoseFocusHandler ); - mpVariable1RangeEdit->SetLoseFocusHdl( aLink ); - mpVariable1RangeButton->SetLoseFocusHdl( aLink ); - mpVariable2RangeEdit->SetLoseFocusHdl( aLink ); - mpVariable2RangeButton->SetLoseFocusHdl( aLink ); - mpOutputRangeEdit->SetLoseFocusHdl( aLink ); - mpOutputRangeButton->SetLoseFocusHdl( aLink ); - - Link<Edit&,void> aLink2 = LINK( this, ScStatisticsTwoVariableDialog, RefInputModifyHandler); - mpVariable1RangeEdit->SetModifyHdl( aLink2); - mpVariable2RangeEdit->SetModifyHdl( aLink2); - mpOutputRangeEdit->SetModifyHdl( aLink2); - - mpOutputRangeEdit->GrabFocus(); - - mpGroupByColumnsRadio->SetToggleHdl( LINK( this, ScStatisticsTwoVariableDialog, GroupByChanged ) ); - mpGroupByRowsRadio->SetToggleHdl( LINK( this, ScStatisticsTwoVariableDialog, GroupByChanged ) ); - - mpGroupByColumnsRadio->Check(); - mpGroupByRowsRadio->Check(false); -} - -void ScStatisticsTwoVariableDialog::GetRangeFromSelection() -{ - OUString aCurrentString; - - ScRange aCurrentRange; - mViewData->GetSimpleArea(aCurrentRange); - - if (aCurrentRange.aEnd.Col() - aCurrentRange.aStart.Col() == 1) - { - mVariable1Range = aCurrentRange; - mVariable1Range.aEnd.SetCol(mVariable1Range.aStart.Col()); - aCurrentString = mVariable1Range.Format(ScRefFlags::RANGE_ABS_3D, mDocument, mAddressDetails); - mpVariable1RangeEdit->SetText(aCurrentString); - - mVariable2Range = aCurrentRange; - mVariable2Range.aStart.SetCol(mVariable2Range.aEnd.Col()); - aCurrentString = mVariable2Range.Format(ScRefFlags::RANGE_ABS_3D, mDocument, mAddressDetails); - mpVariable2RangeEdit->SetText(aCurrentString); - } - else - { - mVariable1Range = aCurrentRange; - aCurrentString = mVariable1Range.Format(ScRefFlags::RANGE_ABS_3D, mDocument, mAddressDetails); - mpVariable1RangeEdit->SetText(aCurrentString); - } -} - -void ScStatisticsTwoVariableDialog::SetActive() -{ - if ( mDialogLostFocus ) - { - mDialogLostFocus = false; - if( mpActiveEdit ) - mpActiveEdit->GrabFocus(); - } - else - { - GrabFocus(); - } - RefInputDone(); -} - -void ScStatisticsTwoVariableDialog::SetReference( const ScRange& rReferenceRange, ScDocument* pDocument ) -{ - if ( mpActiveEdit != nullptr ) - { - if ( rReferenceRange.aStart != rReferenceRange.aEnd ) - RefInputStart( mpActiveEdit ); - - OUString aReferenceString; - - if ( mpActiveEdit == mpVariable1RangeEdit ) - { - mVariable1Range = rReferenceRange; - aReferenceString = mVariable1Range.Format(ScRefFlags::RANGE_ABS_3D, pDocument, mAddressDetails); - mpVariable1RangeEdit->SetRefString(aReferenceString); - } - else if ( mpActiveEdit == mpVariable2RangeEdit ) - { - mVariable2Range = rReferenceRange; - aReferenceString = mVariable2Range.Format(ScRefFlags::RANGE_ABS_3D, pDocument, mAddressDetails); - mpVariable2RangeEdit->SetRefString(aReferenceString); - } - else if ( mpActiveEdit == mpOutputRangeEdit ) - { - mOutputAddress = rReferenceRange.aStart; - - ScRefFlags nFormat = ( mOutputAddress.Tab() == mCurrentAddress.Tab() ) ? - ScRefFlags::ADDR_ABS : - ScRefFlags::ADDR_ABS_3D; - aReferenceString = mOutputAddress.Format(nFormat, pDocument, pDocument->GetAddressConvention()); - mpOutputRangeEdit->SetRefString( aReferenceString ); - } - } - - ValidateDialogInput(); -} - -IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) -{ - CalculateInputAndWriteToOutput(); - Close(); -} - -IMPL_LINK( ScStatisticsTwoVariableDialog, GetFocusHandler, Control&, rCtrl, void ) -{ - mpActiveEdit = nullptr; - if( &rCtrl == mpVariable1RangeEdit - || &rCtrl == mpVariable1RangeButton ) - { - mpActiveEdit = mpVariable1RangeEdit; - } - else if( &rCtrl == mpVariable2RangeEdit - || &rCtrl == mpVariable2RangeButton ) - { - mpActiveEdit = mpVariable2RangeEdit; - } - else if( &rCtrl == mpOutputRangeEdit - || &rCtrl == mpOutputRangeButton ) - { - mpActiveEdit = mpOutputRangeEdit; - } - - if( mpActiveEdit ) - mpActiveEdit->SetSelection( Selection( 0, SELECTION_MAX ) ); -} - -IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseFocusHandler, Control&, void ) -{ - mDialogLostFocus = !IsActive(); -} - -IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, GroupByChanged, RadioButton&, void ) -{ - if (mpGroupByColumnsRadio->IsChecked()) - mGroupedBy = BY_COLUMN; - else if (mpGroupByRowsRadio->IsChecked()) - mGroupedBy = BY_ROW; - - ValidateDialogInput(); -} - -IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, void ) -{ - if ( mpActiveEdit ) - { - if ( mpActiveEdit == mpVariable1RangeEdit ) - { - ScRangeList aRangeList; - bool bValid = ParseWithNames( aRangeList, mpVariable1RangeEdit->GetText(), mDocument); - const ScRange* pRange = (bValid && aRangeList.size() == 1) ? &aRangeList[0] : nullptr; - if (pRange) - { - mVariable1Range = *pRange; - // Highlight the resulting range. - mpVariable1RangeEdit->StartUpdateData(); - } - else - { - mVariable1Range = ScRange( ScAddress::INITIALIZE_INVALID); - } - } - else if ( mpActiveEdit == mpVariable2RangeEdit ) - { - ScRangeList aRangeList; - bool bValid = ParseWithNames( aRangeList, mpVariable2RangeEdit->GetText(), mDocument); - const ScRange* pRange = (bValid && aRangeList.size() == 1) ? &aRangeList[0] : nullptr; - if (pRange) - { - mVariable2Range = *pRange; - // Highlight the resulting range. - mpVariable2RangeEdit->StartUpdateData(); - } - else - { - mVariable2Range = ScRange( ScAddress::INITIALIZE_INVALID); - } - } - else if ( mpActiveEdit == mpOutputRangeEdit ) - { - ScRangeList aRangeList; - bool bValid = ParseWithNames( aRangeList, mpOutputRangeEdit->GetText(), mDocument); - const ScRange* pRange = (bValid && aRangeList.size() == 1) ? &aRangeList[0] : nullptr; - if (pRange) - { - mOutputAddress = pRange->aStart; - - // Crop output range to top left address for Edit field. - if (pRange->aStart != pRange->aEnd) - { - ScRefFlags nFormat = ( mOutputAddress.Tab() == mCurrentAddress.Tab() ) ? - ScRefFlags::ADDR_ABS : - ScRefFlags::ADDR_ABS_3D; - OUString aReferenceString = mOutputAddress.Format(nFormat, mDocument, mDocument->GetAddressConvention()); - mpOutputRangeEdit->SetRefString( aReferenceString ); - } - - // Highlight the resulting range. - mpOutputRangeEdit->StartUpdateData(); - } - else - { - mOutputAddress = ScAddress( ScAddress::INITIALIZE_INVALID); - } - } - } - - ValidateDialogInput(); -} - -void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput() -{ - OUString aUndo(ScResId(GetUndoNameId())); - ScDocShell* pDocShell = mViewData->GetDocShell(); - SfxUndoManager* pUndoManager = pDocShell->GetUndoManager(); - pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() ); - - ScRange aOutputRange = ApplyOutput(pDocShell); - - pUndoManager->LeaveListAction(); - pDocShell->PostPaint( aOutputRange, PaintPartFlags::Grid ); -} - -bool ScStatisticsTwoVariableDialog::InputRangesValid() -{ - return mVariable1Range.IsValid() && mVariable2Range.IsValid() && mOutputAddress.IsValid(); -} - -void ScStatisticsTwoVariableDialog::ValidateDialogInput() -{ - // Enable OK button if all inputs are ok. - if (InputRangesValid()) - mpButtonOk->Enable(); - else - mpButtonOk->Disable(); -} - ScStatisticsTwoVariableDialogController::ScStatisticsTwoVariableDialogController( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, weld::Window* pParent, ScViewData* pViewData, const OUString& rUIXMLDescription, const OString& rID) diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 66eb3628862a..a3e90f78055e 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -17,78 +17,6 @@ #include <vcl/fixed.hxx> -class ScStatisticsTwoVariableDialog : public ScAnyRefDlg -{ -public: - enum GroupedBy { - BY_COLUMN, - BY_ROW - }; - - ScStatisticsTwoVariableDialog( - SfxBindings* pB, SfxChildWindow* pCW, - vcl::Window* pParent, ScViewData* pViewData, - const OUString& rID, const OUString& rUIXMLDescription ); - - virtual ~ScStatisticsTwoVariableDialog() override; - virtual void dispose() override; - - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual void SetActive() override; - -protected: - void CalculateInputAndWriteToOutput(); - - virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; - virtual const char* GetUndoNameId() = 0; - virtual bool InputRangesValid(); - void ValidateDialogInput(); - - // Widgets - VclPtr<FixedText> mpVariable1RangeLabel; - VclPtr<formula::RefEdit> mpVariable1RangeEdit; - VclPtr<formula::RefButton> mpVariable1RangeButton; - - VclPtr<FixedText> mpVariable2RangeLabel; - VclPtr<formula::RefEdit> mpVariable2RangeEdit; - VclPtr<formula::RefButton> mpVariable2RangeButton; - - VclPtr<FixedText> mpOutputRangeLabel; - VclPtr<formula::RefEdit> mpOutputRangeEdit; - VclPtr<formula::RefButton> mpOutputRangeButton; - - // Data - ScViewData* const mViewData; - ScDocument* const mDocument; - - ScRange mVariable1Range; - ScRange mVariable2Range; - - ScAddress::Details const mAddressDetails; - ScAddress mOutputAddress; - GroupedBy mGroupedBy; - -private: - // Widgets - VclPtr<OKButton> mpButtonOk; - - VclPtr<RadioButton> mpGroupByColumnsRadio; - VclPtr<RadioButton> mpGroupByRowsRadio; - - VclPtr<formula::RefEdit> mpActiveEdit; - ScAddress const mCurrentAddress; - bool mDialogLostFocus; - - void Init(); - void GetRangeFromSelection(); - - DECL_LINK( GroupByChanged, RadioButton&, void ); - DECL_LINK( OkClicked, Button*, void ); - DECL_LINK( GetFocusHandler, Control&, void ); - DECL_LINK( LoseFocusHandler, Control&, void ); - DECL_LINK( RefInputModifyHandler, Edit&, void ); -}; - class ScStatisticsTwoVariableDialogController : public ScAnyRefDlgController { public: |