ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Revert "sc: now formula conditions can be managed

Browse Source 
...from condition format manager"

This reverts commit 8374dd472cb4a2e2edab969a73ca88ffeaadbcd8.

Change-Id: I532c17596adccfa5c88baaf2df897f3ffbee0fe6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177288
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177339
Tested-by: Pranam Lashkari <lpranam@collabora.com>
This commit is contained in:
Pranam Lashkari
2024-12-03 16:08:36 +01:00
parent eb933099a5
commit ec1b094127
9 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/inc/document.hxx
+1 -3
View File
@@ -229,12 +229,10 @@ struct ScConditionEasyDialogData
{
ScConditionMode* Mode = nullptr;
bool IsManaged : 1 = false;
OUString Formula;
ScConditionEasyDialogData(ScConditionMode* mode, bool isManaged, const OUString& formula = "")
ScConditionEasyDialogData(ScConditionMode* mode, bool isManaged)
: Mode(mode)
, IsManaged(isManaged)
, Formula(formula)
{
}
sc/sdi/cellsh.sdi
+1 -2
View File
@@ -220,8 +220,7 @@ interface CellSelection
SfxVoidItem ConditionalFormatEasy SID_EASY_CONDITIONAL_FORMAT_DIALOG
(
SfxInt16Item FormatRule FN_PARAM_1,
SfxBoolItem Managed FN_PARAM_2,
SfxStringItem Formula FN_PARAM_3
SfxBoolItem Managed FN_PARAM_2
)
[
ExecMethod = Execute;
sc/source/core/data/documen2.cxx
-1
View File
@@ -1189,7 +1189,6 @@ void ScDocument::SetEasyConditionalFormatDialogData(const ScConditionEasyDialogD
{
pConditionalFormatDialogData.Mode = data.Mode;
pConditionalFormatDialogData.IsManaged = data.IsManaged;
pConditionalFormatDialogData.Formula = data.Formula;
}
void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew)
sc/source/ui/condformat/condformateasydlg.cxx
+2 -4
View File
@@ -118,7 +118,6 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
{
meMode = *CurrentData.Mode;
mbIsManaged = CurrentData.IsManaged;
msFormula = CurrentData.Formula;
}
mxNumberEntry2->hide();
switch (meMode)
@@ -373,9 +372,8 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed, weld::Button&, rButton, vo
}
else if (meMode == ScConditionMode::Formula)
{
xEntry.reset(new ScCondFormatEntry(ScConditionMode::Direct, msFormula, OUString(),
mrDocument, maPosition,
mxStyles->get_active_text()));
xEntry.reset(new ScCondFormatEntry(ScConditionMode::Direct, "", OUString(), mrDocument,
maPosition, mxStyles->get_active_text()));
}
else
{
sc/source/ui/condformat/condformatmgr.cxx
+13 -24
View File
@@ -20,7 +20,6 @@
#include <sfx2/viewsh.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/viewoptions.hxx>
#include <iostream>
@@ -95,13 +94,15 @@ void ScCondFormatManagerWindow::setColSizes()
mrTreeView.set_column_fixed_widths(aWidths);
}
ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument& rDoc, const ScConditionalFormatList* pFormatList)
: GenericDialogController(pParent, u"modules/scalc/ui/condformatmanager.ui"_ustr, u"CondFormatManager"_ustr)
ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument& rDoc,
const ScConditionalFormatList* pFormatList)
: GenericDialogController(pParent, u"modules/scalc/ui/condformatmanager.ui"_ustr,
u"CondFormatManager"_ustr)
, m_bModified(false)
, m_xFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr)
, m_xFormatList(pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr)
, m_xConditionalType(m_xBuilder->weld_combo_box("type"))
, m_xConditionalCellValue(m_xBuilder->weld_combo_box("typeis"))
, m_xConditionalFormula(new formula::RefEdit(m_xBuilder->weld_entry("formula")))
, m_xConditionalFormula(m_xBuilder->weld_entry("formula"))
, m_xConditionalDate(m_xBuilder->weld_combo_box("datetype"))
, m_xBtnAdd(m_xBuilder->weld_button(u"add"_ustr))
, m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr))
@@ -171,10 +172,9 @@ void ScCondFormatManagerDlg::ShowEasyConditionalDialog()
case 1: // Formula
{
SfxInt16Item FormatRule(FN_PARAM_1, static_cast<sal_Int16>(ScConditionMode::Formula));
SfxStringItem Formula(FN_PARAM_3, m_xConditionalFormula->GetText());
SfxViewShell::Current()->GetDispatcher()->ExecuteList(
SID_EASY_CONDITIONAL_FORMAT_DIALOG, SfxCallMode::ASYNCHRON,
{ &FormatRule, &IsManaged, &Formula });
{ &FormatRule, &IsManaged });
}
break;
case 2: // Date
@@ -229,21 +229,21 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, ComboHdl, weld::ComboBox&, void)
case 0:
{
m_xConditionalCellValue->set_visible(true);
m_xConditionalFormula->GetWidget()->set_visible(false);
m_xConditionalFormula->set_visible(false);
m_xConditionalDate->set_visible(false);
}
break;
case 1:
{
m_xConditionalCellValue->set_visible(false);
m_xConditionalFormula->GetWidget()->set_visible(true);
m_xConditionalFormula->set_visible(true);
m_xConditionalDate->set_visible(false);
}
break;
case 2:
{
m_xConditionalCellValue->set_visible(false);
m_xConditionalFormula->GetWidget()->set_visible(false);
m_xConditionalFormula->set_visible(false);
m_xConditionalDate->set_visible(true);
}
break;
@@ -268,20 +268,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EntryFocus, weld::TreeView&, void)
{
const ScCondFormatEntry* conditionEntry = dynamic_cast<const ScCondFormatEntry*>(entry);
auto conditionType = conditionEntry->GetOperation();
if (conditionType == ScConditionMode::Direct) // Formula conditions
{
m_xConditionalType->set_active(1);
ComboHdl(*m_xConditionalType);
m_xConditionalFormula->SetText(
conditionEntry->GetExpression(conditionEntry->GetSrcPos(), 0));
}
else
{
m_xConditionalType->set_active(0);
ComboHdl(*m_xConditionalType);
m_xConditionalCellValue->set_active(static_cast<int>(conditionType));
}
m_xConditionalType->set_active(0);
ComboHdl(*m_xConditionalType);
m_xConditionalCellValue->set_active(static_cast<int>(conditionType));
}
else if (type == ScFormatEntry::Type::Date)
{
sc/source/ui/inc/condformateasydlg.hxx
-1
View File
@@ -40,7 +40,6 @@ private:
ScDocument& mrDocument;
ScConditionMode meMode;
bool mbIsManaged;
OUString msFormula;
ScAddress maPosition;
std::unique_ptr<weld::Entry> mxNumberEntry;
sc/source/ui/inc/condformatmgr.hxx
+1 -2
View File
@@ -10,7 +10,6 @@
#pragma once
#include <vcl/weld.hxx>
#include <formula/funcutl.hxx>
class ScDocument;
class ScConditionalFormat;
@@ -53,7 +52,7 @@ private:
std::unique_ptr<weld::ComboBox> m_xConditionalType;
std::unique_ptr<weld::ComboBox> m_xConditionalCellValue;
std::unique_ptr<formula::RefEdit> m_xConditionalFormula;
std::unique_ptr<weld::Entry> m_xConditionalFormula;
std::unique_ptr<weld::ComboBox> m_xConditionalDate;
std::unique_ptr<weld::Button> m_xBtnAdd;
std::unique_ptr<weld::Button> m_xBtnRemove;
sc/source/ui/view/cellsh3.cxx
+1 -8
View File
@@ -468,15 +468,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
bManaged = static_cast<const SfxBoolItem*>(pManaged)->GetValue();
}
const SfxPoolItem* pFormula;
OUString formula;
if (pReqArgs->HasItem(FN_PARAM_3, &pFormula))
{
formula = static_cast<const SfxStringItem*>(pFormula)->GetValue();
}
GetViewData().GetDocument().SetEasyConditionalFormatDialogData(
ScConditionEasyDialogData(&nFormat, bManaged, formula));
ScConditionEasyDialogData(&nFormat, bManaged));
pScMod->SetRefDialog( nId, pWindow == nullptr );
}
sc/uiconfig/scalc/ui/condformatmanager.ui
+1
View File
@@ -229,6 +229,7 @@
<property name="can-focus">True</property>
<property name="no-show-all">True</property>
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="formula-atkobject">