[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/qa sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8
sc/Library_sc.mk |2
sc/UIConfig_scalc.mk |1
sc/inc/globstr.hrc|1
sc/inc/sc.hrc |4
sc/qa/unit/SparklineTest.cxx | 64 +++
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 17
sc/source/ui/app/scdll.cxx|1
sc/source/ui/dialogs/SparklineDataRangeDialog.cxx | 202
++
sc/source/ui/docshell/docfunc.cxx | 12
sc/source/ui/inc/SparklineDataRangeDialog.hxx | 66 +++
sc/source/ui/inc/docfunc.hxx |2
sc/source/ui/inc/reffact.hxx |7
sc/source/ui/inc/undo/UndoEditSparkline.hxx | 47 ++
sc/source/ui/undo/UndoEditSparkline.cxx | 63 +++
sc/source/ui/view/cellsh.cxx |6
sc/source/ui/view/cellsh1.cxx | 10
sc/source/ui/view/tabvwsh.cxx |1
sc/source/ui/view/tabvwshc.cxx|6
sc/uiconfig/scalc/popupmenu/cell.xml |1
sc/uiconfig/scalc/ui/sparklinedatarangedialog.ui | 148
+++
22 files changed, 668 insertions(+), 2 deletions(-)
New commits:
commit a08f9ed2341bc60faae6b86538661fea40417ace
Author: Tomaž Vajngerl
AuthorDate: Sat Apr 9 14:30:22 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Apr 10 15:27:36 2022 +0200
sc: add UI, undo/redo and test to change sparkline data range
This adds a "edit sparkline" action to the context menu and a
dialog to change the data range of a sparkline. To change a
sparkline using undo/redo, a new class UndoEditSparkline was
added, which allows to change the attributes of a sparkline and
revert back the old attributes when undoing. This is then used in
the Dialog when setting the changed data range of a sparkline.
To make sure that undo/redo works correctly, a simple unit tests
was added.
Change-Id: I08af1813fa288278bc0d33b0540660b325b17235
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132748
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 2bd6210666e3..5c608969da64 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1122,6 +1122,14 @@
1
+
+
+ Edit Sparkline...
+
+
+ 1
+
+
Edit Sparkline Group...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 519daa881530..bd69b9e57c24 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -421,6 +421,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/dbgui/validate \
sc/source/ui/dialogs/searchresults \
sc/source/ui/dialogs/SparklineDialog \
+sc/source/ui/dialogs/SparklineDataRangeDialog \
sc/source/ui/docshell/arealink \
sc/source/ui/docshell/autostyl \
sc/source/ui/docshell/datastream \
@@ -561,6 +562,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/UndoDeleteSparklineGroup \
sc/source/ui/undo/UndoUngroupSparklines \
sc/source/ui/undo/UndoGroupSparklines \
+sc/source/ui/undo/UndoEditSparkline \
sc/source/ui/unoobj/ChartRangeSelectionListener \
sc/source/ui/unoobj/addruno \
sc/source/ui/unoobj/afmtuno \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 302f08ff3fb3..643645ee7432 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -245,6 +245,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortoptionspage \
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/sparklinedialog \
+ sc/uiconfig/scalc/ui/sparklinedatarangedialog \
sc/uiconfig/scalc/ui/splitcolumnentry \
sc/uiconfig/scalc/ui/subtotaldialog \
sc/uiconfig/scalc/ui/subtotaloptionspage \
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 96d2dca307a5..7f2bcb28b0ba 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -545,6 +545,7 @@
#define STR_UNDO_EDIT_SPARKLINE_GROUP
NC_("STR_UNDO_EDIT_SPARKLINE_GROUP", "Edit Sparkline Group")
#define STR_UNDO_GROUP_SPARKLINES
NC_("STR_UNDO_G
[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/qa sc/sdi sc/source sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16
sc/Library_sc.mk |2
sc/inc/globstr.hrc|2
sc/inc/sc.hrc |8
sc/qa/unit/SparklineTest.cxx | 239
++
sc/sdi/cellsh.sdi |2
sc/sdi/scalc.sdi | 34 +
sc/source/ui/docshell/docfunc.cxx | 20
sc/source/ui/inc/docfunc.hxx |3
sc/source/ui/inc/undo/UndoGroupSparklines.hxx | 55 ++
sc/source/ui/inc/undo/UndoUngroupSparklines.hxx | 53 ++
sc/source/ui/undo/UndoGroupSparklines.cxx | 91 +++
sc/source/ui/undo/UndoUngroupSparklines.cxx | 89 +++
sc/source/ui/view/cellsh.cxx |6
sc/source/ui/view/cellsh1.cxx | 29 +
sc/source/ui/view/viewfun2.cxx|2
sc/uiconfig/scalc/popupmenu/cell.xml |2
17 files changed, 649 insertions(+), 4 deletions(-)
New commits:
commit c6fecc628a60a3955c022f04020cdb515cc4fb6e
Author: Tomaž Vajngerl
AuthorDate: Sun Apr 3 09:02:38 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Wed Apr 6 02:59:02 2022 +0200
sc: add Group and Ungroup to context menu for sparklines
This change allows to group parklines together into a sparkline
group, or ungroup them, so they use their own sparkline group.
This also adds the undo and redo for this actions.
Change-Id: I61b604203afaf2fe8c2d47b80082739ded15d6fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132545
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 70f6b83ef8ed..2bd6210666e3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1106,6 +1106,22 @@
1
+
+
+ Group Sparklines
+
+
+ 1
+
+
+
+
+ Ungroup Sparklines
+
+
+ 1
+
+
Edit Sparkline Group...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 9eb23e39240e..743125bfef10 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -558,6 +558,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/UndoEditSparklineGroup \
sc/source/ui/undo/UndoDeleteSparkline \
sc/source/ui/undo/UndoDeleteSparklineGroup \
+sc/source/ui/undo/UndoUngroupSparklines \
+sc/source/ui/undo/UndoGroupSparklines \
sc/source/ui/unoobj/ChartRangeSelectionListener \
sc/source/ui/unoobj/addruno \
sc/source/ui/unoobj/afmtuno \
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 6c9318179380..96d2dca307a5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -543,6 +543,8 @@
#define STR_UNDO_DELETE_SPARKLINE
NC_("STR_UNDO_DELETE_SPARKLINE", "Delete Sparkline")
#define STR_UNDO_DELETE_SPARKLINE_GROUP
NC_("STR_UNDO_DELETE_SPARKLINE_GROUP", "Delete Sparkline Group")
#define STR_UNDO_EDIT_SPARKLINE_GROUP
NC_("STR_UNDO_EDIT_SPARKLINE_GROUP", "Edit Sparkline Group")
+#define STR_UNDO_GROUP_SPARKLINES
NC_("STR_UNDO_GROUP_SPARKLINES", "Group Sparklines")
+#define STR_UNDO_UNGROUP_SPARKLINES
NC_("STR_UNDO_UNGROUP_SPARKLINES", "Ungroup Sparklines")
#endif
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3aecfc5cdb31..207dc4224e53 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -310,9 +310,11 @@ class SvxZoomSliderItem;
#define FID_DEFINE_CURRENT_NAME (INSERT_MENU_START + 24)
#define SID_INSERT_SPARKLINE(INSERT_MENU_START + 25)
#define SID_DELETE_SPARKLINE(INSERT_MENU_START + 26)
-#define SID_EDIT_SPARKLINE_GROUP (INSERT_MENU_START + 27)
-#define SID_DELETE_SPARKLINE_GROUP(INSERT_MENU_START + 28)
-#define INSERT_MENU_END (INSERT_MENU_START + 29)
+#define SID_EDIT_SPARKLINE_GROUP (INSERT_MENU_START + 27)
+#define SID_DELETE_SPARKLINE_GROUP (INSERT_MENU_START + 28)
+#define SID_GROUP_SPARKLINES(INSERT_MENU_START + 29)
+#define SID_UNGROUP_SPARKLINES (INSERT_MENU_START + 30)
+#define INSERT_MENU_END (INSERT_MENU_START + 31)
#define FORMAT_MENU_START (INSERT_MENU_END)
#define FID_CELL_FORMAT (FORMAT_MENU_START)
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/SparklineTest.cxx
index aea9d45152e0..99efd55f8209 100644
--- a/sc/qa/unit/SparklineTest.cxx
[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/qa sc/sdi sc/source sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8
sc/Library_sc.mk |1
sc/inc/document.hxx | 11 +
sc/inc/globstr.hrc|1
sc/inc/sc.hrc |5
sc/qa/unit/SparklineTest.cxx | 65
+++
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 17 ++
sc/source/core/data/document.cxx | 17 +-
sc/source/ui/docshell/docfunc.cxx | 18 ++
sc/source/ui/inc/docfunc.hxx |1
sc/source/ui/inc/undo/UndoDeleteSparklineGroup.hxx| 45 +
sc/source/ui/undo/UndoDeleteSparklineGroup.cxx| 82
++
sc/source/ui/view/cellsh.cxx |1
sc/source/ui/view/cellsh1.cxx | 16 +
sc/uiconfig/scalc/popupmenu/cell.xml |1
16 files changed, 281 insertions(+), 9 deletions(-)
New commits:
commit ec18c7bf707e85d85f362d43454d35b1636de40f
Author: Tomaž Vajngerl
AuthorDate: Fri Apr 1 23:03:52 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Wed Apr 6 02:58:45 2022 +0200
sc: add "Delete Sparkline Group" context menu action + Undo/Redo
Change-Id: I34e11a4881c564351c3e08d157fb42ac4bb8ef3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132544
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 98f4c9695acd..70f6b83ef8ed 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1098,6 +1098,14 @@
1
+
+
+ Delete Sparkline Group
+
+
+ 1
+
+
Edit Sparkline Group...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 294c36b4578c..9eb23e39240e 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -557,6 +557,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/UndoInsertSparkline \
sc/source/ui/undo/UndoEditSparklineGroup \
sc/source/ui/undo/UndoDeleteSparkline \
+sc/source/ui/undo/UndoDeleteSparklineGroup \
sc/source/ui/unoobj/ChartRangeSelectionListener \
sc/source/ui/unoobj/addruno \
sc/source/ui/unoobj/afmtuno \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1cde9b95fe4c..43c2fa96a133 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1249,16 +1249,23 @@ public:
*/
sc::MultiDataCellState HasMultipleDataCells( const ScRange& rRange ) const;
-/** Spaklines */
+// Spaklines
+/** Returns sparkline at the addrss if it exists */
SC_DLLPUBLIC std::shared_ptr GetSparkline(ScAddress const &
rPosition);
SC_DLLPUBLIC bool HasSparkline(ScAddress const & rPosition);
SC_DLLPUBLIC sc::Sparkline* CreateSparkline(ScAddress const & rPosition,
std::shared_ptr const& pSparklineGroup);
SC_DLLPUBLIC sc::SparklineList* GetSparklineList(SCTAB nTab);
SC_DLLPUBLIC bool DeleteSparkline(ScAddress const& rPosition);
+
+/**
+ * Returns true if the whole range covers one and the same sparkline
+ * group and returns the group via out parameter
+ */
+SC_DLLPUBLIC bool GetSparklineGroupInRange(ScRange const& rRange,
std::shared_ptr& rGroup);
SC_DLLPUBLIC bool HasOneSparklineGroup(ScRange const& rRange);
SC_DLLPUBLIC std::shared_ptr
SearchSparklineGroup(tools::Guid const& rGuid);
-/** Notes **/
+// Notes
SC_DLLPUBLIC ScPostIt* GetNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
void SetNote(const ScAddress& rPos,
std::unique_ptr pNote);
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index de33f2d4e61b..6c9318179380 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -541,6 +541,7 @@
#define STR_INDENTCELL NC_("STR_INDENTCELL", "Indent:
")
#define STR_UNDO_INSERT_SPARKLINE_GROUP
NC_("STR_UNDO_INSERT_SPARKLINE", "Insert Sparkline Group")
#define STR_UNDO_DELETE_SPARKLINE
NC_("STR_UNDO_DELETE_SPARKLINE", "Delete Sparkline")
+#define STR_UNDO_DELETE_SPARKLINE_GROUP
NC_("STR_UNDO_DELETE_SPARKLINE_GROUP", "Delete Sparkline Group")
#define STR_UNDO_EDIT_SPARKLINE_GROUP
NC_("STR_UNDO_EDIT_SPARKLINE_GROUP", "Edit Sparkline Group")
#endif
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8555e34ae0b
[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/qa sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk solenv/sanitizers
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8
sc/Library_sc.mk |1
sc/UIConfig_scalc.mk |1
sc/inc/sc.hrc |1
sc/inc/strings.hrc| 17
sc/qa/unit/screenshots/data/screenshots.txt |1
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 17
sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx | 247 +
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx| 28
sc/source/ui/app/scdll.cxx|1
sc/source/ui/inc/FourierAnalysisDialog.hxx| 60 +
sc/source/ui/inc/StatisticsInputOutputDialog.hxx |2
sc/source/ui/inc/reffact.hxx |7
sc/source/ui/view/cellsh1.cxx |9
sc/source/ui/view/tabvwsh.cxx |1
sc/source/ui/view/tabvwshc.cxx|7
sc/uiconfig/scalc/menubar/menubar.xml |1
sc/uiconfig/scalc/ui/fourieranalysisdialog.ui | 423
++
sc/uiconfig/scalc/ui/notebookbar.ui |7
sc/uiconfig/scalc/ui/notebookbar_compact.ui |7
solenv/sanitizers/ui/modules/scalc.suppr |1
22 files changed, 837 insertions(+), 11 deletions(-)
New commits:
commit 1b9f0e99f3ab0deb8ee2291b34c5c2e6a31de2d1
Author: Dennis Francis
AuthorDate: Tue Mar 12 18:21:34 2019 +0530
Commit: Dennis Francis
CommitDate: Tue Mar 26 14:33:23 2019 +0100
tdf#74664 : add Fourier analysis tool
Add Fourier analysis tool to Statistics submenu.
Use FOURIER() formula to do all the work here.
Change-Id: Ifdaa79d8ee367f1c1f5054248e01853ffe4c6823
Reviewed-on: https://gerrit.libreoffice.org/69472
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 996d3c1f029d..3a70c4f2fb2b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -998,6 +998,14 @@
1
+
+
+ F~ourier Analysis...
+
+
+ 1
+
+
~Headers and Footers...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 9e67772d81f2..aa596d001a26 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -520,6 +520,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog \
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog \
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog \
+sc/source/ui/StatisticsDialogs/FourierAnalysisDialog \
sc/source/ui/StatisticsDialogs/FTestDialog \
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator \
sc/source/ui/StatisticsDialogs/MovingAverageDialog \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 68f210509c2a..a80f9d2ea791 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -128,6 +128,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/formulacalculationoptions \
+ sc/uiconfig/scalc/ui/fourieranalysisdialog \
sc/uiconfig/scalc/ui/floatingborderstyle \
sc/uiconfig/scalc/ui/floatinglinestyle \
sc/uiconfig/scalc/ui/functionpanel \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 52b945ea9441..c8388a4e3c8d 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -237,6 +237,7 @@
#define SID_WINDOW_FIX_COL (SC_MESSAGE_START + 85)
#define SID_COLUMN_OPERATIONS (SC_MESSAGE_START + 86)
#define SID_ROW_OPERATIONS (SC_MESSAGE_START + 87)
+#define SID_FOURIER_ANALYSIS_DIALOG (SC_MESSAGE_START + 88)
// functions
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index f85aa46263f2..a3392a36b20c 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -289,6 +289,8 @@
#define STR_CHI_SQUARE_TEST NC_("STR_CHI_SQUARE_TEST",
"Test of Independence (Chi-Square)")
#define STR_REGRESSION_UNDO_NAME
NC_("STR_REGRESSION_UNDO_NAME", "Regression")
#define STR_REGRESSION NC_("STR_REGRESSION",
"Regression")
+#define STR_FOURIER_ANALYSIS_UNDO_NAME
NC_("STR_FOURIER_ANALYSIS_UNDO_NAME", "Fourier A
