diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 59422660f961..2d91a79693bb 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -84,12 +84,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi , mbWriteConfig(bWriteConfig) { get(mpTestButton, "test"); - get(mpOpenclInfoList, "opencl_list"); - get(mpBtnAutomaticSelectionTrue, "automatic_select_true"); - get(mpBtnAutomaticSelectionFalse, "automatic_select_false"); - get(mpFtFrequency, "frequency"); - get(mpFtComputeUnits, "compute_units"); - get(mpFtMemory, "memory"); get(mpConversion,"comboConversion"); mpConversion->SelectEntryPos(static_cast(rConfig.meStringConversion)); @@ -122,16 +116,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi mpEditField->SetModifyHdl(LINK(this, ScCalcOptionsDialog, EditModifiedHdl)); - mpOpenclInfoList->set_height_request(4* mpOpenclInfoList->GetTextHeight()); - mpOpenclInfoList->SetStyle(mpOpenclInfoList->GetStyle() | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); - mpOpenclInfoList->SetHighlightRange(); - mpOpenclInfoList->GetParent()->Hide(); - mpOpenclInfoList->SetSelectHdl(LINK(this, ScCalcOptionsDialog, DeviceSelHdl)); - - mpBtnAutomaticSelectionTrue->SetToggleHdl(LINK(this, ScCalcOptionsDialog, BtnAutomaticSelectHdl)); - - maSoftware = get("software")->GetText(); - mpTestButton->SetClickHdl(LINK(this, ScCalcOptionsDialog, TestClickHdl)); } @@ -150,58 +134,9 @@ void ScCalcOptionsDialog::dispose() mpSpinButton.clear(); mpEditField.clear(); mpTestButton.clear(); - mpFtFrequency.clear(); - mpFtComputeUnits.clear(); - mpFtMemory.clear(); - mpOpenclInfoList.clear(); - mpBtnAutomaticSelectionTrue.clear(); - mpBtnAutomaticSelectionFalse.clear(); ModalDialog::dispose(); } -void ScCalcOptionsDialog::OpenCLAutomaticSelectionChanged() -{ - bool bValue = mpBtnAutomaticSelectionTrue->IsChecked(); - if(bValue) - mpOpenclInfoList->Disable(); - else - mpOpenclInfoList->Enable(); - - maConfig.mbOpenCLAutoSelect = bValue; -} - -void ScCalcOptionsDialog::SelectedDeviceChanged() -{ -#if HAVE_FEATURE_OPENCL - SvTreeListEntry* pEntry = mpOpenclInfoList->GetModel()->GetView(0)->FirstSelected(); - if(!pEntry) - return; - - OpenCLDeviceInfo* pInfo = static_cast(pEntry->GetUserData()); - if(pInfo) - { - mpFtFrequency->SetText(OUString::number(pInfo->mnFrequency)); - mpFtComputeUnits->SetText(OUString::number(pInfo->mnComputeUnits)); - mpFtMemory->SetText(OUString::number(pInfo->mnMemory/1024/1024)); - } - else - { - mpFtFrequency->SetText(OUString()); - mpFtComputeUnits->SetText(OUString()); - mpFtMemory->SetText(OUString()); - } - - SvLBoxString& rBoxEntry = dynamic_cast(pEntry->GetItem(1)); - - OUString aDevice = rBoxEntry.GetText(); - // use english string for configuration - if(aDevice == maSoftware) - aDevice = OPENCL_SOFTWARE_DEVICE_CONFIG_NAME; - - maConfig.maOpenCLDevice = aDevice; -#endif -} - void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion() { switch (maConfig.meStringConversion) @@ -257,16 +192,6 @@ IMPL_LINK_TYPED(ScCalcOptionsDialog, SpinOpenCLMinSizeHdl, Edit&, rEdit, void) maConfig.mnOpenCLMinimumFormulaGroupSize = static_cast(rEdit).GetValue(); } -IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, BtnAutomaticSelectHdl, RadioButton&, void) -{ - OpenCLAutomaticSelectionChanged(); -} - -IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, DeviceSelHdl, SvTreeListBox*, void) -{ - SelectedDeviceChanged(); -} - IMPL_LINK_TYPED(ScCalcOptionsDialog, EditModifiedHdl, Edit&, rCtrl, void) { maConfig.mpOpenCLSubsetOpCodes = ScStringToOpCodeSet(rCtrl.GetText()); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index c7f2ffc0fb7a..1fc67311fc2d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -39,7 +39,6 @@ public: virtual void dispose() override; DECL_LINK_TYPED( BtnAutomaticSelectHdl, RadioButton&, void ); - DECL_LINK_TYPED( DeviceSelHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( EditModifiedHdl, Edit&, void ); DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void ); DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); @@ -68,16 +67,6 @@ private: VclPtr mpEditField; VclPtr mpTestButton; - VclPtr mpFtFrequency; - VclPtr mpFtComputeUnits; - VclPtr mpFtMemory; - - VclPtr mpOpenclInfoList; - VclPtr mpBtnAutomaticSelectionTrue; - VclPtr mpBtnAutomaticSelectionFalse; - - OUString maSoftware; - ScCalcConfig maConfig; bool mbSelectedEmptyStringAsZero; diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index bf1c6b0906f4..fa3ca94c2122 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -223,174 +223,6 @@ True 6 12 - - - False - vertical - 6 - - - True - True - True - True - True - - - - - - 0 - 1 - - - - - True - False - 12 - - - True - False - Automatic selection of platform/device: - - - 0 - 0 - - - - - True - True - True - False - 0 - True - automatic_select_false - - - 1 - 0 - - - - - False - True - True - False - 0 - True - automatic_select_true - - - 2 - 0 - - - - - 0 - 0 - - - - - True - False - 6 - 12 - - - True - False - 0 - Frequency: - - - 0 - 0 - - - - - True - False - 0 - Compute units: - - - 0 - 1 - - - - - True - False - 0 - Memory (in MB): - - - 0 - 2 - - - - - True - False - - - 1 - 0 - - - - - True - False - - - 1 - 1 - - - - - True - False - - - 1 - 2 - - - - - 0 - 2 - - - - - 0 - 4 - 2 - - - - - False - Internal, software interpreter - - - 0 - 6 - - _Test OpenCL