core.git: sc/inc sc/qa sc/source
sc/inc/table.hxx |2 -
sc/qa/uitest/data/tdf160104.ods|binary
sc/qa/uitest/solver/solver.py | 57 +
sc/qa/unit/data/ods/SolverModel.ods|binary
sc/qa/unit/ucalc_solver.cxx| 24 +
sc/source/core/data/SolverSettings.cxx |3 +
6 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit 2533960315607bf3e86ad014d2daa4bfa7e3fa59
Author: Rafael Lima
AuthorDate: Mon Apr 1 14:46:35 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Mon Apr 8 16:03:03 2024 +0200
tdf#160064 Hide named ranges/expressions of solver models
Prior to this patch, all named ranges/expressions associated with solver
models were visible by default, which clutters the UI with various names in the
Manage Names dialog.
Now all such named ranges/expressions are hidden by default, thus mimicking
what MSO does.
Change-Id: I79727b375c48527632c4967d174c61f99ff41050
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165621
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f04b1fa0df7a..f578926535ae 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1047,7 +1047,7 @@ public:
const ScObjectHandling eObjectHandling =
ScObjectHandling::RecalcPosMode);
void SetRangeName(std::unique_ptr pNew);
-ScRangeName* GetRangeName() const;
+SC_DLLPUBLIC ScRangeName* GetRangeName() const;
void PreprocessRangeNameUpdate(
sc::EndListeningContext& rEndListenCxt, sc::CompileFormulaContext&
rCompileCxt );
diff --git a/sc/qa/uitest/data/tdf160104.ods b/sc/qa/uitest/data/tdf160104.ods
index a98340f80a50..ea8f23bb4791 100644
Binary files a/sc/qa/uitest/data/tdf160104.ods and
b/sc/qa/uitest/data/tdf160104.ods differ
diff --git a/sc/qa/uitest/solver/solver.py b/sc/qa/uitest/solver/solver.py
index 2a164b90f6c5..ed8132b0f205 100644
--- a/sc/qa/uitest/solver/solver.py
+++ b/sc/qa/uitest/solver/solver.py
@@ -132,4 +132,61 @@ class solver(UITestCase):
# Here isModified needs to be True because changes were made to
the Solver dialog
self.assertTrue(calc_doc.isModified())
+
+# Tests whether all solver named ranges are hidden in the UI
+def test_tdf160064(self):
+# This test uses the same file from bug tdf#160104, so no need to
check if the model is correct upon opening
+with self.ui_test.load_file(get_url_for_data_file("tdf160104.ods")) as
calc_doc:
+# The Manage Names dialog must not contain any names
+with
self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
+xList = xDialog.getChild("names")
+self.assertEqual('0', get_state_as_dict(xList)['Children'])
+
+# Makes a small change in the solver dialog by clicking the
"Minimize" button
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SolverDialog",
close_button="") as xDialog:
+xMin = xDialog.getChild("min")
+xMin.executeAction("CLICK", ())
+# Closes the dialog
+xCloseBtn = xDialog.getChild("close")
+xCloseBtn.executeAction("CLICK", ())
+
+# Here the file has been modified and needs to be saved and
reloaded
+self.assertTrue(calc_doc.isModified())
+self.xUITest.executeCommand('.uno:Save')
+self.xUITest.executeCommand('.uno:Reload')
+
+# Open the Solver dialog and check whether the model is loaded
correctly
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SolverDialog",
close_button="") as xDialog:
+xTargetEdit = xDialog.getChild("targetedit")
+xMin = xDialog.getChild("min")
+xChangeEdit = xDialog.getChild("changeedit")
+xRef1Edit = xDialog.getChild("ref1edit")
+xVal1Edit = xDialog.getChild("val1edit")
+xOp1List = xDialog.getChild("op1list")
+xRef2Edit = xDialog.getChild("ref2edit")
+xVal2Edit = xDialog.getChild("val2edit")
+xOp2List = xDialog.getChild("op2list")
+
+# Checks whether the solver model was loaded correctly
+self.assertEqual("$F$2",
get_state_as_dict(xTargetEdit)["Text"])
+self.assertEqual("true", get_state_as_dict(xMin)["Checked"])
+self.assertEqual("$D$2:$D$11",
get_state_as_dict(xChangeEdit)["Text"])
+self.assertEqual("$F$5", get_state_as_dict(xRef1Edit)["Text"])
+self.assertEqual("$F$8", get_state_as_dict(xVal1Edit)["Text"])
+self.assertEqual("≤",
get_state_as_dict(xOp1List)["SelectEntryText"])
+self.assertEqual("$D$2:$D$11",
get_state_as_dict(xRef2Edit)["Text"])
+self.assertEqual("",
core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui | 19 +++--- sc/uiconfig/scalc/ui/notebookbar_compact.ui |2 - sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui| 19 +++--- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 19 +++--- sd/uiconfig/sdraw/ui/notebookbar.ui | 19 +++--- sd/uiconfig/sdraw/ui/notebookbar_compact.ui |2 - sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui| 13 + sd/uiconfig/simpress/ui/notebookbar.ui| 19 +++--- sd/uiconfig/simpress/ui/notebookbar_compact.ui|2 - sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 13 + sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui| 13 + sw/uiconfig/swriter/ui/notebookbar.ui | 15 ++- sw/uiconfig/swriter/ui/notebookbar_compact.ui |1 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 19 +++--- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 19 +++--- 15 files changed, 169 insertions(+), 25 deletions(-) New commits: commit f8e927e6cdbc99240d8967a5e920ce33d45838d2 Author: Rafael Lima AuthorDate: Tue Apr 2 09:31:28 2024 -0300 Commit: Rafael Lima CommitDate: Wed Apr 3 15:38:10 2024 +0200 tdf#160376 Add uno:Reload to the Notebookbar UI The command uno:Reload is missing from some of the Notebookbar UI variants (f.i. in Calc notebookbar_compact.ui has it, but the others do not). This patch adds the uno:Reload command to all variants of the Tabbed UI in all LO apps. Change-Id: Ic56a05a15bc52a51bc45435ca938a6879452189f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165675 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Rafael Lima diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 4e9058aa7faf..46f674647d80 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -469,6 +469,19 @@ False + + +True +False +.uno:Reload + + + + +True +False + + True @@ -484,7 +497,7 @@ - + True False @@ -511,7 +524,7 @@ - + True False @@ -545,7 +558,7 @@ - + True False diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 01102b481c35..513679ec6ce1 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -609,7 +609,7 @@ -False +True False .uno:Reload diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 899f839699ec..e577579264c0 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -668,6 +668,19 @@ False + + +True +False +.uno:Reload + + + + +True +False + + True @@ -683,7 +696,7 @@ - + True False @@ -710,7 +723,7 @@ - + True False @@ -744,7 +757,7 @@ - + True False diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 1c700123fabc..b7e91985a525 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1175,6 +1175,19 @@ False + + +True +False +.uno:Reload + + + + +True +False + + True @@ -1190,7 +1203,7 @@ - + True False @@ -1217,7 +1230,7 @@ - + True False @@ -1251,7 +1264,7 @@ - + True False diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index bf0a03ea1229..37ab230d261c 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -499,6 +499,19 @@ False + + +True +False +.uno:Reload + + + + +True +False + + True @@ -514,7 +527,7 @@ -
core.git: schema/libreoffice sc/qa sc/source
sc/qa/unit/data/ods/NamedExpressionsHidden.ods |binary
sc/qa/unit/subsequent_filters_test.cxx | 59
sc/source/filter/xml/xmlexprt.cxx |4
sc/source/filter/xml/xmlnexpi.cxx |4
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 19 +++
5 files changed, 86 insertions(+)
New commits:
commit 350c590620226c4d5b94aa01d3853e15af3cebb0
Author: Rafael Lima
AuthorDate: Mon Mar 25 15:24:30 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Mon Apr 1 05:56:10 2024 +0200
tdf#160356 Add support for hidden named expressions in Calc
Since bug 154449 was fixed, Calc now supports hidden named ranges. However,
named expressions were not considered in the original patch and it would be
useful to support hidden named expressions as well.
This patch adds suppport for hidden named expressions (import and export).
Change-Id: I2580416dcd5db0fcb2aa9061085cdc9975fb03c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165239
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/qa/unit/data/ods/NamedExpressionsHidden.ods
b/sc/qa/unit/data/ods/NamedExpressionsHidden.ods
new file mode 100644
index ..61e6d1feac6b
Binary files /dev/null and b/sc/qa/unit/data/ods/NamedExpressionsHidden.ods
differ
diff --git a/sc/qa/unit/subsequent_filters_test.cxx
b/sc/qa/unit/subsequent_filters_test.cxx
index 87e00ac7f3f0..a0cbd4f0780c 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -703,6 +703,65 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest,
testHiddenRangeNameXLSX)
pRangeData2->GetUnoType() &
sheet::NamedRangeFlag::HIDDEN);
}
+CPPUNIT_TEST_FIXTURE(ScFiltersTest, testHiddenNamedExpression)
+{
+createScDoc();
+ScDocument* pDoc = getScDoc();
+
+// Adds two hidden named expressions and two non-hidden named expressions
+ScRangeName* pNamedRanges = pDoc->GetRangeName();
+ScRangeData* pRangeData1 = new ScRangeData(*pDoc, "NAME1", "100");
+pRangeData1->AddType(ScRangeData::Type::Hidden);
+pNamedRanges->insert(pRangeData1);
+ScRangeData* pRangeData2 = new ScRangeData(*pDoc, "NAME2", "text1");
+pRangeData2->AddType(ScRangeData::Type::Hidden);
+pNamedRanges->insert(pRangeData2);
+ScRangeData* pRangeData3 = new ScRangeData(*pDoc, "NAME3", "200");
+pNamedRanges->insert(pRangeData3);
+ScRangeData* pRangeData4 = new ScRangeData(*pDoc, "NAME4", "text2");
+pNamedRanges->insert(pRangeData4);
+CPPUNIT_ASSERT_EQUAL(size_t(4), pNamedRanges->size());
+
+// Save and reload to test whether the named expressions retain the hidden
where applicable
+saveAndReload("calc8");
+pDoc = getScDoc();
+pNamedRanges = pDoc->GetRangeName();
+CPPUNIT_ASSERT_EQUAL(size_t(4), pNamedRanges->size());
+pRangeData1 = pNamedRanges->findByUpperName(OUString("NAME1"));
+CPPUNIT_ASSERT(pRangeData1);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Hidden, pRangeData1->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("100"), pRangeData1->GetSymbol());
+pRangeData2 = pNamedRanges->findByUpperName(OUString("NAME2"));
+CPPUNIT_ASSERT(pRangeData2);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Hidden, pRangeData2->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("text1"), pRangeData2->GetSymbol());
+pRangeData3 = pNamedRanges->findByUpperName(OUString("NAME3"));
+CPPUNIT_ASSERT(pRangeData3);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Name, pRangeData3->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("200"), pRangeData3->GetSymbol());
+pRangeData4 = pNamedRanges->findByUpperName(OUString("NAME4"));
+CPPUNIT_ASSERT(pRangeData4);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Name, pRangeData4->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("text2"), pRangeData4->GetSymbol());
+}
+
+CPPUNIT_TEST_FIXTURE(ScFiltersTest, testHiddenNamedExpressionODS)
+{
+createScDoc("ods/NamedExpressionsHidden.ods");
+ScDocument* pDoc = getScDoc();
+
+// The document has 2 named expressions; the first is hidden; the second
is visible
+ScRangeName* pNamedRanges = pDoc->GetRangeName();
+ScRangeData* pRangeData1 =
pNamedRanges->findByUpperName(OUString("NAME1"));
+CPPUNIT_ASSERT(pRangeData1);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Hidden, pRangeData1->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("100"), pRangeData1->GetSymbol());
+ScRangeData* pRangeData2 =
pNamedRanges->findByUpperName(OUString("NAME2"));
+CPPUNIT_ASSERT(pRangeData2);
+CPPUNIT_ASSERT_EQUAL(ScRangeData::Type::Name, pRangeData2->GetType());
+CPPUNIT_ASSERT_EQUAL(OUString("200"), pRangeData2->GetSymbol());
+}
+
CPPUNIT_TEST_FIXTURE(ScFiltersTest, testHyperlinksXLSX)
{
createScDoc("xlsx/hyperlinks.xlsx");
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index abef9391b1fb..e776c006643a 100644
core.git: sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui |7 --- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|7 --- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui |7 --- sd/uiconfig/sdraw/ui/notebookbar.ui |7 --- sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|7 --- sd/uiconfig/simpress/ui/notebookbar.ui|7 --- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |7 --- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui|7 --- 8 files changed, 56 deletions(-) New commits: commit 1b00c292754c529ca6615d6b39a8545f340c7f50 Author: Rafael Lima AuthorDate: Tue Mar 26 12:50:59 2024 -0300 Commit: Rafael Lima CommitDate: Sat Mar 30 14:52:16 2024 +0100 tdf#160378 Remove NewGlobalDoc from the Tabbed UI in sd and sc The command NewGlobalDoc is not supported by Calc, Impress and Draw, so they should not exist in the Tabbed UI. Otherwise, a gap appears, since there's no info about this command. Change-Id: I0dd2b4639cfb44437d6726d6f138c4767c5a3175 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165351 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 855719bb3946..4e9058aa7faf 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -463,13 +463,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 2533c66719f0..899f839699ec 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -662,13 +662,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index b036557cea0f..1c700123fabc 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1169,13 +1169,6 @@ .uno:SaveAsRemote - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 32e7212d5e70..bf0a03ea1229 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -493,13 +493,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 083af53572d3..81f1395a293c 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -737,13 +737,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 18530c457d7a..843b7c9f079d 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -415,13 +415,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index d2f71a8cb993..dbb79ead7deb 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -717,13 +717,6 @@ .uno:SaveACopy - - -True -False -.uno:NewGlobalDoc - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 5d4f592b856e..dea621413f5c 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -767,13 +767,6 @@ .uno:SaveAsRemote - - -True -False -.uno:NewGlobalDoc - - True
core.git: Branch 'libreoffice-7-6' - sc/inc sc/qa sc/source
sc/inc/SolverSettings.hxx | 117 -
sc/qa/unit/data/ods/tdf158735.ods |binary
sc/qa/unit/ucalc_solver.cxx| 29
sc/source/core/data/SolverSettings.cxx | 220 +
4 files changed, 356 insertions(+), 10 deletions(-)
New commits:
commit 68b0c3a6ac189eea011d1809480e13f7d33652a6
Author: Rafael Lima
AuthorDate: Mon Mar 4 19:01:40 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Sun Mar 24 11:31:55 2024 +0100
tdf#158735 Save solver settings for DEPS and SCO as well
When bug tdf#38948 was originally fixed, the solvers DEPS and SCO were not
considered. This caused a regression, because setting engine options for these
solvers made them never be saved, even in its own sheet.
This patch fixes that by incorporating the engine options for DEPS and SCO.
Change-Id: I93af712f91da2f7b1ac57ed74f6c2c2d7d411bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164376
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 04d884cc99eb66679fb254129b54488bd40e5abf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164385
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164531
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index ec1ef994a7b8..985e8d30f796 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -39,11 +39,34 @@ enum SolverParameter
SP_LO_ENGINE, // Engine name used in LO
SP_MS_ENGINE, // Engine ID used in MSO
SP_INTEGER, // Assume all variables are integer (0: no, 1: yes)
+// LpSolve, CoinMP and SwarmSolver
SP_NON_NEGATIVE, // Assume non negativity (1: yes, 2: no)
SP_EPSILON_LEVEL, // Epsilon level
SP_LIMIT_BBDEPTH, // Branch and bound depth
SP_TIMEOUT, // Time limit to return a solution
-SP_ALGORITHM // Algorithm used by the SwarmSolver (1, 2 or 3)
+SP_ALGORITHM, // Algorithm used by the SwarmSolver (1, 2 or 3)
+// Engine options common for DEPS and SCO
+SP_SWARM_SIZE, // Size of Swarm
+SP_LEARNING_CYCLES, // Learning Cycles
+SP_GUESS_VARIABLE_RANGE, // Variable Bounds Guessing
+SP_VARIABLE_RANGE_THRESHOLD, // Variable Bounds Threshold (when guessing)
+SP_ACR_COMPARATOR, // Use ACR Comparator (instead of BCH)
+SP_RND_STARTING_POINT, // Use Random starting point
+SP_STRONGER_PRNG, // Use a stronger random generator (slower)
+SP_STAGNATION_LIMIT, // Stagnation Limit
+SP_STAGNATION_TOLERANCE, // Stagnation Tolerance
+SP_ENHANCED_STATUS, // Show enhanced solver status
+// DEPS Options
+SP_AGENT_SWITCH_RATE, // Agent Switch Rate (DE Probability)
+SP_SCALING_MIN, // DE: Min Scaling Factor (0-1.2)
+SP_SCALING_MAX, // DE: Max Scaling Factor (0-1.2)
+SP_CROSSOVER_PROB, // DE: Crossover Probability (0-1)
+SP_COGNITIVE_CONST, // Cognitive Constant
+SP_SOCIAL_CONST, // Social Constant
+SP_CONSTRICTION_COEFF, // PS: Constriction Coefficient
+SP_MUTATION_PROB, // Mutation Probability (0-0.005)
+// SCO Options
+SP_LIBRARY_SIZE, // Size of library
};
// Starts at 1 to maintain MS compatibility
@@ -123,6 +146,28 @@ private:
OUString m_sLimitBBDepth;
OUString m_sTimeout;
OUString m_sAlgorithm;
+// DEPS and SCO
+OUString m_sSwarmSize;
+OUString m_sLearningCycles;
+OUString m_sGuessVariableRange;
+OUString m_sVariableRangeThreshold;
+OUString m_sUseACRComparator;
+OUString m_sUseRandomStartingPoint;
+OUString m_sUseStrongerPRNG;
+OUString m_sStagnationLimit;
+OUString m_sTolerance;
+OUString m_sEnhancedSolverStatus;
+// DEPS only
+OUString m_sAgentSwitchRate;
+OUString m_sScalingFactorMin;
+OUString m_sScalingFactorMax;
+OUString m_sCrossoverProbability;
+OUString m_sCognitiveConstant;
+OUString m_sSocialConstant;
+OUString m_sConstrictionCoeff;
+OUString m_sMutationProbability;
+OUString m_sLibrarySize;
+
css::uno::Sequence m_aEngineOptions;
std::vector m_aConstraints;
@@ -131,7 +176,9 @@ private:
// Used to create or read a single solver parameter based on its named
range
bool ReadParamValue(SolverParameter eParam, OUString& rValue, bool
bRemoveQuotes = false);
+bool ReadDoubleParamValue(SolverParameter eParam, OUString& rValue);
void WriteParamValue(SolverParameter eParam, OUString sValue, bool bQuoted
= false);
+void WriteDoubleParamValue(SolverParameter eParam, std::u16string_view
sValue);
// Creates or reads all constraints stored in named ranges
void ReadConstraints();
@@ -149,19 +196,46 @@ private:
// Maps solver parameters to named ranges
std::map m_mNamedRanges
-= { { SP_OBJ_CELL, "solver_opt" }, { SP_OBJ_TYPE, "solver_typ" },
-{ SP_OBJ_VAL, "solver_val" }, { SP_VAR_CELLS, "solver_adj" },
-{
core.git: sc/inc sc/qa sc/source
sc/inc/SolverSettings.hxx |1
sc/qa/uitest/data/tdf160104.ods|binary
sc/qa/uitest/solver/solver.py | 74 +
sc/source/core/data/SolverSettings.cxx | 18 ++
sc/source/ui/miscdlgs/optsolver.cxx| 97 ++---
5 files changed, 171 insertions(+), 19 deletions(-)
New commits:
commit 6c97cd3691ea0f7d9e580b1c4ea0fca81d47758a
Author: Rafael Lima
AuthorDate: Sun Mar 10 22:26:15 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Wed Mar 20 11:16:34 2024 +0100
tdf#160104 Do not mark file as modified if nothing changed in the Solver
dialog
Change-Id: I1bef38a21179bb725c7fb7a08fe90309d26239ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164616
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index 985e8d30f796..0f01f1020356 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -299,6 +299,7 @@ public:
SC_DLLPUBLIC void SaveSolverSettings();
SC_DLLPUBLIC void ResetToDefaults();
+SC_DLLPUBLIC bool TabHasSolverModel();
};
} // namespace sc
diff --git a/sc/qa/uitest/data/tdf160104.ods b/sc/qa/uitest/data/tdf160104.ods
new file mode 100644
index ..a98340f80a50
Binary files /dev/null and b/sc/qa/uitest/data/tdf160104.ods differ
diff --git a/sc/qa/uitest/solver/solver.py b/sc/qa/uitest/solver/solver.py
index faabdfb1ce50..2a164b90f6c5 100644
--- a/sc/qa/uitest/solver/solver.py
+++ b/sc/qa/uitest/solver/solver.py
@@ -58,4 +58,78 @@ class solver(UITestCase):
#verify
self.assertEqual(get_cell_by_position(calc_doc, 0, 1,
1).getValue(), 400)
+
+# Tests the isModified property on a blank Calc file
+def test_tdf160104_blank_file(self):
+with self.ui_test.create_doc_in_start_center("calc") as calc_doc:
+self.assertFalse(calc_doc.isModified())
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SolverDialog",
close_button="") as xDialog:
+xCloseBtn = xDialog.getChild("close")
+xCloseBtn.executeAction("CLICK", ())
+
+# Here isModified needs to be False because the dialog was opened
and closed with no changes
+self.assertFalse(calc_doc.isModified())
+
+# Now open the dialog again and make some changes
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SolverDialog",
close_button="") as xDialog:
+xCloseBtn = xDialog.getChild("close")
+xMin = xDialog.getChild("min")
+xChangeEdit = xDialog.getChild("changeedit")
+
+# Click the Minimize option and change variable cells
+xMin.executeAction("CLICK", ())
+xChangeEdit.executeAction("TYPE", mkPropertyValues({"TEXT":
"$A$1:$A$10"}))
+xCloseBtn.executeAction("CLICK", ())
+
+# Here isModified needs to be True because changes were made to
the dialog
+self.assertTrue(calc_doc.isModified())
+
+
+# Tests the isModified property on an existing file that contains a solver
model
+def test_tdf160104_with_file(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf160104.ods")) as
calc_doc:
+self.assertFalse(calc_doc.isModified())
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SolverDialog",
close_button="") as xDialog:
+xTargetEdit = xDialog.getChild("targetedit")
+xMax = xDialog.getChild("max")
+xChangeEdit = xDialog.getChild("changeedit")
+xRef1Edit = xDialog.getChild("ref1edit")
+xVal1Edit = xDialog.getChild("val1edit")
+xOp1List = xDialog.getChild("op1list")
+xRef2Edit = xDialog.getChild("ref2edit")
+xVal2Edit = xDialog.getChild("val2edit")
+xOp2List = xDialog.getChild("op2list")
+
+# Checks whether the solver model was loaded correctly
+self.assertEqual("$F$2",
get_state_as_dict(xTargetEdit)["Text"])
+self.assertEqual("true", get_state_as_dict(xMax)["Checked"])
+self.assertEqual("$D$2:$D$11",
get_state_as_dict(xChangeEdit)["Text"])
+self.assertEqual("$F$5", get_state_as_dict(xRef1Edit)["Text"])
+self.assertEqual("$F$8", get_state_as_dict(xVal1Edit)["Text"])
+self.assertEqual("≤",
get_state_as_dict(xOp1List)["SelectEntryText"])
+self.assertEqual("$D$2:$D$11",
get_state_as_dict(xRef2Edit)["Text"])
+self.assertEqual("", get_state_as_dict(xVal2Edit)["Text"])
+self.assertEqual("Binary",
get_state_as_dict(xOp2List)["SelectEntryText"])
+
+# Closes the dialog without making changes
+xCloseBtn = xDialog.getChild("close")
+
core.git: xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig
xmlsecurity/inc/macrosecurity.hxx|7 ++
xmlsecurity/inc/strings.hrc |1
xmlsecurity/source/dialogs/macrosecurity.cxx | 34 ++
xmlsecurity/uiconfig/ui/securitylevelpage.ui | 86 ++-
4 files changed, 127 insertions(+), 1 deletion(-)
New commits:
commit 6178387f7bcc35df9272978ec936f8b53c6da80d
Author: Rafael Lima
AuthorDate: Thu Mar 14 00:45:43 2024 +0100
Commit: Rafael Lima
CommitDate: Tue Mar 19 14:48:34 2024 +0100
tdf#159985 Warn about the need to reload file after changing macro security
level
Change-Id: I191fd5d676d6d54fb0ef15652420afdceab2fc78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164810
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Heiko Tietze
diff --git a/xmlsecurity/inc/macrosecurity.hxx
b/xmlsecurity/inc/macrosecurity.hxx
index 5d9feb94c808..162ffad3ce72 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -72,6 +72,8 @@ class MacroSecurityLevelTP : public MacroSecurityTP
{
private:
sal_uInt16 mnCurLevel;
+// Stores the security level when the dialog opens. Used to check if the
value changed
+sal_uInt16 mnInitialLevel;
std::unique_ptr m_xVeryHighRB;
std::unique_ptr m_xHighRB;
@@ -81,6 +83,11 @@ private:
std::unique_ptr m_xHighImg;
std::unique_ptr m_xMedImg;
std::unique_ptr m_xLowImg;
+std::unique_ptr m_xWarningLb;
+std::unique_ptr m_xWarningImg;
+std::unique_ptr m_xWarningBox;
+
+void SetWarningLabel(const OUString& sMsg);
DECL_LINK(RadioButtonHdl, weld::Toggleable&, void);
public:
diff --git a/xmlsecurity/inc/strings.hrc b/xmlsecurity/inc/strings.hrc
index 7e99a58d5286..b450f885df6e 100644
--- a/xmlsecurity/inc/strings.hrc
+++ b/xmlsecurity/inc/strings.hrc
@@ -64,5 +64,6 @@
#define STR_ENCRYPT
NC_("selectcertificatedialog|str_encrypt", "Encrypt")
#define STR_BROKEN_MACRO_CERTIFICATE_DATA
NC_("STR_BROKEN_MACRO_CERTIFICATE_DATA", "Macro security problem!
Broken certificate data: %{data}")
+#define STR_RELOAD_FILE_WARNING
NC_("STR_RELOAD_FILE_WARNING", "Reload the file to apply the new macro security
level")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx
b/xmlsecurity/source/dialogs/macrosecurity.cxx
index ca4df4e64c03..9432220ae5ae 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -105,6 +105,9 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(weld::Container*
pParent, MacroSecuri
, m_xHighImg(m_xBuilder->weld_widget("highimg"))
, m_xMedImg(m_xBuilder->weld_widget("medimg"))
, m_xLowImg(m_xBuilder->weld_widget("lowimg"))
+, m_xWarningLb(m_xBuilder->weld_label("warningmsg"))
+, m_xWarningImg(m_xBuilder->weld_image("warningimg"))
+, m_xWarningBox(m_xBuilder->weld_box("warningbox"))
{
m_xLowRB->connect_toggled( LINK( this, MacroSecurityLevelTP,
RadioButtonHdl ) );
m_xMediumRB->connect_toggled( LINK( this, MacroSecurityLevelTP,
RadioButtonHdl ) );
@@ -129,6 +132,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(weld::Container*
pParent, MacroSecuri
}
mnCurLevel =
static_cast(SvtSecurityOptions::GetMacroSecurityLevel());
+mnInitialLevel = mnCurLevel;
bool bReadonly = SvtSecurityOptions::IsReadOnly(
SvtSecurityOptions::EOption::MacroSecLevel );
weld::RadioButton* pCheck = nullptr;
@@ -166,6 +170,28 @@
MacroSecurityLevelTP::MacroSecurityLevelTP(weld::Container* pParent, MacroSecuri
m_xMediumRB->set_sensitive(false);
m_xLowRB->set_sensitive(false);
}
+
+SetWarningLabel("");
+// Use same font color as in InfobarType::WARNING
+m_xWarningLb->set_font_color(Color(0x70, 0x43, 0x00));
+m_xWarningImg->set_size_request(24, 24);
+}
+
+void MacroSecurityLevelTP::SetWarningLabel(const OUString& sMsg)
+{
+m_xWarningLb->set_label(sMsg);
+if (!sMsg.isEmpty())
+{
+m_xWarningLb->show();
+m_xWarningImg->show();
+m_xWarningBox->set_background(Color(0xFE, 0xEF, 0xB3));
+}
+else
+{
+m_xWarningLb->hide();
+m_xWarningImg->hide();
+m_xWarningBox->set_background(COL_TRANSPARENT);
+}
}
IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl, weld::Toggleable&, void)
@@ -183,6 +209,14 @@ IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl,
weld::Toggleable&, void)
mnCurLevel = nNewLevel;
m_pDlg->EnableReset();
}
+
+// Show warning message if a different security level is chosen
+if (nNewLevel != mnInitialLevel)
+SetWarningLabel(XsResId(STR_RELOAD_FILE_WARNING));
+else
+{
+SetWarningLabel("");
+}
}
void MacroSecurityLevelTP::ClosePage()
diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui
b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
core.git: Branch 'distro/collabora/co-24.04' - 10 commits - configure.ac external/skia pyuno/source sc/source sd/source sw/source vcl/qa vcl/qt5 vcl/win writerfilter/source
configure.ac |4 +-
external/skia/Library_skia.mk |5 ++
pyuno/source/module/pyuno.cxx |3 +
pyuno/source/module/pyuno_callable.cxx|3 +
pyuno/source/module/pyuno_iterator.cxx|6 +++
pyuno/source/module/pyuno_runtime.cxx |3 +
pyuno/source/module/pyuno_struct.cxx |3 +
sc/source/ui/miscdlgs/solveroptions.cxx |2 -
sd/source/core/drawdoc2.cxx |6 ++-
sd/source/core/sdpage.cxx |3 +
sw/source/core/layout/tabfrm.cxx |2 -
sw/source/filter/ww8/wrtw8nds.cxx | 41 +++---
vcl/qa/cppunit/pdfexport/data/tdf142133.docx |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx| 35 ++
vcl/qt5/QtInstance.cxx|5 ++
vcl/win/window/salframe.cxx |2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 23 +++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +
18 files changed, 115 insertions(+), 34 deletions(-)
New commits:
commit ae2fa89cf241942e5a80e4f3b08182bcdab138da
Author: Rafael Lima
AuthorDate: Wed Mar 13 23:30:17 2024 +0100
Commit: Andras Timar
CommitDate: Sun Mar 17 20:42:33 2024 +0100
tdf#160122 Increase height of the Solver Options dialog
Currently the Solver Options dialog (Tools - Solver and then click the
Options button) has a height of 6 rows, which is good for the Linear and Swarm
non-linear solvers, since they have 4-5 options.
However, the SCO and DEPS engines have 12 and 19 options, respectively, so
it is very unconfortable to view and scroll through these options with such a
small dialog.
This patch raises the height of the dialog to 12, so that scrolling is
minimized, making it more confortable to navigate through the solver options.
Change-Id: I51c1c6880613818dd91c6bb8494775c863e8b406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164749
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit 58f565cb2dcf6e7b7eb2eb269776993516a29bf0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164875
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 3d5b2b47c178..81f5c8b7b4ce 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -69,7 +69,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window*
pParent,
, m_xBtnEdit(m_xBuilder->weld_button("edit"))
{
m_xLbSettings->set_size_request(m_xLbSettings->get_approximate_digit_width() *
32,
-m_xLbSettings->get_height_rows(6));
+m_xLbSettings->get_height_rows(12));
m_xLbSettings->enable_toggle_buttons(weld::ColumnToggleType::Check);
commit 4756c7e6632f41ae48648f13ac463e6413f3315d
Author: Patrick Luby
AuthorDate: Sat Mar 16 14:46:29 2024 -0400
Commit: Andras Timar
CommitDate: Sun Mar 17 20:42:33 2024 +0100
tdf#160036 Enable SKSL when using Skia/Raster
Starting with the upgrade of Skia from m111 to m116, SKSL is disabled
by default for Skia/Raster so define SK_RASTER_PIPELINE_OPS_ALL to
enable it.
Change-Id: Ibd10efa0540f1e87123c341b529c8e3931e1a8fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164933
Tested-by: Jenkins
Reviewed-by: Patrick Luby
(cherry picked from commit 22dbaf45fb378107ad7daa0d7894939d6e0c7ee3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164876
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index c2163d299327..55af14cd2daf 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_add_defs,skia,\
-DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
$(if $(filter INTEL,$(CPUNAME)),$(if $(filter
WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \
$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2)
\
+-DSK_ENABLE_SKSL_IN_RASTER_PIPELINE \
))
# SK_DEBUG controls runtime checks and is controlled by config_skia.h and
depends on DBG_UTIL.
@@ -565,6 +566,8 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/analysis/SkSLReturnsInputAlpha \
UnpackedTarball/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder \
UnpackedTarball/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit \
+UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo \
+UnpackedTarball/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression \
UnpackedTarball/skia/src/sksl/codegen/SkSLGLSLCodeGenerator
core.git: Branch 'libreoffice-24-2' - sc/source
sc/source/ui/miscdlgs/solveroptions.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 765242935149dca7cb41e10462708739b71f2810
Author: Rafael Lima
AuthorDate: Wed Mar 13 23:30:17 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sun Mar 17 17:12:27 2024 +0100
tdf#160122 Increase height of the Solver Options dialog
Currently the Solver Options dialog (Tools - Solver and then click the
Options button) has a height of 6 rows, which is good for the Linear and Swarm
non-linear solvers, since they have 4-5 options.
However, the SCO and DEPS engines have 12 and 19 options, respectively, so
it is very unconfortable to view and scroll through these options with such a
small dialog.
This patch raises the height of the dialog to 12, so that scrolling is
minimized, making it more confortable to navigate through the solver options.
Change-Id: I51c1c6880613818dd91c6bb8494775c863e8b406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164749
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit 58f565cb2dcf6e7b7eb2eb269776993516a29bf0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164875
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 3d5b2b47c178..81f5c8b7b4ce 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -69,7 +69,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window*
pParent,
, m_xBtnEdit(m_xBuilder->weld_button("edit"))
{
m_xLbSettings->set_size_request(m_xLbSettings->get_approximate_digit_width() *
32,
-m_xLbSettings->get_height_rows(6));
+m_xLbSettings->get_height_rows(12));
m_xLbSettings->enable_toggle_buttons(weld::ColumnToggleType::Check);
core.git: sc/source
sc/source/ui/miscdlgs/solveroptions.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f58b9659067de7fd8fcd8391b4bf1a2513cedaf7
Author: Rafael Lima
AuthorDate: Wed Mar 13 23:30:17 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Mar 16 22:48:50 2024 +0100
tdf#160122 Increase height of the Solver Options dialog
Currently the Solver Options dialog (Tools - Solver and then click the
Options button) has a height of 6 rows, which is good for the Linear and Swarm
non-linear solvers, since they have 4-5 options.
However, the SCO and DEPS engines have 12 and 19 options, respectively, so
it is very unconfortable to view and scroll through these options with such a
small dialog.
This patch raises the height of the dialog to 12, so that scrolling is
minimized, making it more confortable to navigate through the solver options.
Change-Id: I51c1c6880613818dd91c6bb8494775c863e8b406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164749
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 3d5b2b47c178..81f5c8b7b4ce 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -69,7 +69,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window*
pParent,
, m_xBtnEdit(m_xBuilder->weld_button("edit"))
{
m_xLbSettings->set_size_request(m_xLbSettings->get_approximate_digit_width() *
32,
-m_xLbSettings->get_height_rows(6));
+m_xLbSettings->get_height_rows(12));
m_xLbSettings->enable_toggle_buttons(weld::ColumnToggleType::Check);
core.git: xmlsecurity/uiconfig
xmlsecurity/uiconfig/ui/securitylevelpage.ui | 102 +-- 1 file changed, 51 insertions(+), 51 deletions(-) New commits: commit 24cf7ffcb06c47e1084f08c7bcdcf15fb29f75ea Author: Rafael Lima AuthorDate: Sat Mar 16 15:02:32 2024 +0100 Commit: Mike Kaganski CommitDate: Sat Mar 16 20:47:28 2024 +0100 Resave securitylevelpage.ui with newer Glade Change-Id: I9a2c3b5d93453730baccec37fa0a3ac91808bad9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164873 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui b/xmlsecurity/uiconfig/ui/securitylevelpage.ui index 5292a72fcf17..911bed1c3768 100644 --- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui +++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui @@ -1,29 +1,29 @@ - + - + True -False +False True True -6 +6 vertical -6 -12 -True +6 +12 +True _Low (not recommended). All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe. True -True -False +True +False True -True -True +True +True high @@ -32,8 +32,8 @@ Use this setting only if you are certain that all documents that will be opened -1 -3 +1 +3 @@ -41,11 +41,11 @@ Use this setting only if you are certain that all documents that will be opened _Medium. Confirmation required before executing macros from untrusted sources. True -True -False +True +False True -True -True +True +True high @@ -54,8 +54,8 @@ Confirmation required before executing macros from untrusted sources. -1 -2 +1 +2 @@ -64,12 +64,12 @@ Confirmation required before executing macros from untrusted sources. Only signed macros and macros from trusted file locations are executed. Unsigned macros are disabled. True -True -False +True +False True -True +True True -True +True Only signed macros or macros from a trusted file location are allowed to run. Macros signed with untrusted certificates will require confirmation to run, when located in untrusted file locations. Trusted certificates and trusted file locations can be set on the Trusted Sources tab page. @@ -77,8 +77,8 @@ Unsigned macros are disabled. -1 -1 +1 +1 @@ -87,11 +87,11 @@ Unsigned macros are disabled. Only macros from trusted file locations are allowed to run. All other macros, regardless whether signed or not, are disabled. True -True -False +True +False True -True -True +True +True high @@ -100,60 +100,60 @@ All other macros, regardless whether signed or not, are disabled. -1 -0 +1 +0 -False -True +False +True center center -res/lock.png +res/lock.png -0 -0 +0 +0 -False -True +False +True center center -res/lock.png +res/lock.png -0 -1 +0 +1 -False -True +False +True center center -res/lock.png +res/lock.png -0 -2 +0 +2 -False -True +False +True center center -res/lock.png +res/lock.png -0 -3 +0 +3
core.git: sc/qa sc/source
sc/qa/unit/data/xlsx/tdf156814.xlsx|binary
sc/qa/unit/ucalc_solver.cxx| 48 +++
sc/source/core/data/SolverSettings.cxx | 51 +
3 files changed, 87 insertions(+), 12 deletions(-)
New commits:
commit d3049ab4786005c6bd17c66f8edcb98210bf511c
Author: Rafael Lima
AuthorDate: Fri Mar 8 21:49:47 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Tue Mar 12 15:36:28 2024 +0100
tdf#156814 Remove sheet name if range belongs to the same sheet (Solver)
When solver models are imported from XLSX, ranges come with sheet names
even when they belong to the same sheet, which clutter the solver dialog.
This patch checks when this happens and remove sheet names when the solver
model is imported.
Change-Id: I3994f1312667946aab330c734ff820e94673d018
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164610
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/qa/unit/data/xlsx/tdf156814.xlsx
b/sc/qa/unit/data/xlsx/tdf156814.xlsx
new file mode 100644
index ..49e430b41554
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf156814.xlsx differ
diff --git a/sc/qa/unit/ucalc_solver.cxx b/sc/qa/unit/ucalc_solver.cxx
index 7834597e9c07..f7db19cad59a 100644
--- a/sc/qa/unit/ucalc_solver.cxx
+++ b/sc/qa/unit/ucalc_solver.cxx
@@ -34,19 +34,19 @@ std::vector
SolverTest::CreateConstraintsModelA()
std::vector aConstraints;
ModelConstraint aConstr1;
-aConstr1.aLeftStr = "C1:C10";
+aConstr1.aLeftStr = "$C$1:$C$10";
aConstr1.nOperator = CO_LESS_EQUAL;
aConstr1.aRightStr = "100";
aConstraints.push_back(aConstr1);
ModelConstraint aConstr2;
-aConstr2.aLeftStr = "F5";
+aConstr2.aLeftStr = "$F$5";
aConstr2.nOperator = CO_EQUAL;
aConstr2.aRightStr = "500";
aConstraints.push_back(aConstr2);
ModelConstraint aConstr3;
-aConstr3.aLeftStr = "D1:D5";
+aConstr3.aLeftStr = "$D$1:$D$5";
aConstr3.nOperator = CO_BINARY;
aConstr3.aRightStr = "";
aConstraints.push_back(aConstr3);
@@ -59,15 +59,15 @@ void SolverTest::TestConstraintsModelA(SolverSettings*
pSettings)
{
std::vector aConstraints = pSettings->GetConstraints();
-CPPUNIT_ASSERT_EQUAL(OUString("C1:C10"), aConstraints[0].aLeftStr);
+CPPUNIT_ASSERT_EQUAL(OUString("$C$1:$C$10"), aConstraints[0].aLeftStr);
CPPUNIT_ASSERT_EQUAL(CO_LESS_EQUAL, aConstraints[0].nOperator);
CPPUNIT_ASSERT_EQUAL(OUString("100"), aConstraints[0].aRightStr);
-CPPUNIT_ASSERT_EQUAL(OUString("F5"), aConstraints[1].aLeftStr);
+CPPUNIT_ASSERT_EQUAL(OUString("$F$5"), aConstraints[1].aLeftStr);
CPPUNIT_ASSERT_EQUAL(CO_EQUAL, aConstraints[1].nOperator);
CPPUNIT_ASSERT_EQUAL(OUString("500"), aConstraints[1].aRightStr);
-CPPUNIT_ASSERT_EQUAL(OUString("D1:D5"), aConstraints[2].aLeftStr);
+CPPUNIT_ASSERT_EQUAL(OUString("$D$1:$D$5"), aConstraints[2].aLeftStr);
CPPUNIT_ASSERT_EQUAL(CO_BINARY, aConstraints[2].nOperator);
CPPUNIT_ASSERT_EQUAL(OUString(""), aConstraints[2].aRightStr);
}
@@ -93,19 +93,19 @@ CPPUNIT_TEST_FIXTURE(SolverTest, testSingleModel)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
pSettings->GetParameter(SP_CONSTR_COUNT).toInt32());
// Create a simple model
-pSettings->SetParameter(SP_OBJ_CELL, OUString("A1"));
+pSettings->SetParameter(SP_OBJ_CELL, OUString("$A$1"));
pSettings->SetParameter(SP_OBJ_TYPE, OUString::number(OT_MINIMIZE));
pSettings->SetParameter(SP_OBJ_VAL, OUString::number(0));
-pSettings->SetParameter(SP_VAR_CELLS, OUString("D1:D5"));
+pSettings->SetParameter(SP_VAR_CELLS, OUString("$D$1:$D$5"));
std::vector aConstraints = CreateConstraintsModelA();
pSettings->SetConstraints(aConstraints);
// Test if the model parameters were set
-CPPUNIT_ASSERT_EQUAL(OUString("A1"), pSettings->GetParameter(SP_OBJ_CELL));
+CPPUNIT_ASSERT_EQUAL(OUString("$A$1"),
pSettings->GetParameter(SP_OBJ_CELL));
CPPUNIT_ASSERT_EQUAL(static_cast(OT_MINIMIZE),
pSettings->GetParameter(SP_OBJ_TYPE).toInt32());
CPPUNIT_ASSERT_EQUAL(OUString("0"), pSettings->GetParameter(SP_OBJ_VAL));
-CPPUNIT_ASSERT_EQUAL(OUString("D1:D5"),
pSettings->GetParameter(SP_VAR_CELLS));
+CPPUNIT_ASSERT_EQUAL(OUString("$D$1:$D$5"),
pSettings->GetParameter(SP_VAR_CELLS));
// Test if the constraints were correctly set before saving
CPPUNIT_ASSERT_EQUAL(sal_Int32(3),
pSettings->GetParameter(SP_CONSTR_COUNT).toInt32());
@@ -120,11 +120,11 @@ CPPUNIT_TEST_FIXTURE(SolverTest, testSingleModel)
CPPUNIT_ASSERT(pSettings);
// Test if the model parameters remain set in the file
-CPPUNIT_ASSERT_EQUAL(OUString("A1"), pSettings->GetParameter(SP_OBJ_CELL));
+CPPUNIT_ASSERT_EQUAL(OUString("$A$1"),
pSettings->GetParameter(SP_OBJ_CELL));
CPPUNIT_ASSERT_EQUAL(static_cast(OT_MINIMIZE),
core.git: Branch 'libreoffice-24-2' - sc/inc sc/qa sc/source
sc/inc/SolverSettings.hxx | 117 -
sc/qa/unit/data/ods/tdf158735.ods |binary
sc/qa/unit/ucalc_solver.cxx| 29
sc/source/core/data/SolverSettings.cxx | 220 +
4 files changed, 356 insertions(+), 10 deletions(-)
New commits:
commit fa8351c50bd8f14830a461c09805e43c6fdb065d
Author: Rafael Lima
AuthorDate: Mon Mar 4 19:01:40 2024 +0100
Commit: Xisco Fauli
CommitDate: Thu Mar 7 12:11:37 2024 +0100
tdf#158735 Save solver settings for DEPS and SCO as well
When bug tdf#38948 was originally fixed, the solvers DEPS and SCO were not
considered. This caused a regression, because setting engine options for these
solvers made them never be saved, even in its own sheet.
This patch fixes that by incorporating the engine options for DEPS and SCO.
Change-Id: I93af712f91da2f7b1ac57ed74f6c2c2d7d411bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164376
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 04d884cc99eb66679fb254129b54488bd40e5abf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164385
Reviewed-by: Xisco Fauli
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index ec1ef994a7b8..985e8d30f796 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -39,11 +39,34 @@ enum SolverParameter
SP_LO_ENGINE, // Engine name used in LO
SP_MS_ENGINE, // Engine ID used in MSO
SP_INTEGER, // Assume all variables are integer (0: no, 1: yes)
+// LpSolve, CoinMP and SwarmSolver
SP_NON_NEGATIVE, // Assume non negativity (1: yes, 2: no)
SP_EPSILON_LEVEL, // Epsilon level
SP_LIMIT_BBDEPTH, // Branch and bound depth
SP_TIMEOUT, // Time limit to return a solution
-SP_ALGORITHM // Algorithm used by the SwarmSolver (1, 2 or 3)
+SP_ALGORITHM, // Algorithm used by the SwarmSolver (1, 2 or 3)
+// Engine options common for DEPS and SCO
+SP_SWARM_SIZE, // Size of Swarm
+SP_LEARNING_CYCLES, // Learning Cycles
+SP_GUESS_VARIABLE_RANGE, // Variable Bounds Guessing
+SP_VARIABLE_RANGE_THRESHOLD, // Variable Bounds Threshold (when guessing)
+SP_ACR_COMPARATOR, // Use ACR Comparator (instead of BCH)
+SP_RND_STARTING_POINT, // Use Random starting point
+SP_STRONGER_PRNG, // Use a stronger random generator (slower)
+SP_STAGNATION_LIMIT, // Stagnation Limit
+SP_STAGNATION_TOLERANCE, // Stagnation Tolerance
+SP_ENHANCED_STATUS, // Show enhanced solver status
+// DEPS Options
+SP_AGENT_SWITCH_RATE, // Agent Switch Rate (DE Probability)
+SP_SCALING_MIN, // DE: Min Scaling Factor (0-1.2)
+SP_SCALING_MAX, // DE: Max Scaling Factor (0-1.2)
+SP_CROSSOVER_PROB, // DE: Crossover Probability (0-1)
+SP_COGNITIVE_CONST, // Cognitive Constant
+SP_SOCIAL_CONST, // Social Constant
+SP_CONSTRICTION_COEFF, // PS: Constriction Coefficient
+SP_MUTATION_PROB, // Mutation Probability (0-0.005)
+// SCO Options
+SP_LIBRARY_SIZE, // Size of library
};
// Starts at 1 to maintain MS compatibility
@@ -123,6 +146,28 @@ private:
OUString m_sLimitBBDepth;
OUString m_sTimeout;
OUString m_sAlgorithm;
+// DEPS and SCO
+OUString m_sSwarmSize;
+OUString m_sLearningCycles;
+OUString m_sGuessVariableRange;
+OUString m_sVariableRangeThreshold;
+OUString m_sUseACRComparator;
+OUString m_sUseRandomStartingPoint;
+OUString m_sUseStrongerPRNG;
+OUString m_sStagnationLimit;
+OUString m_sTolerance;
+OUString m_sEnhancedSolverStatus;
+// DEPS only
+OUString m_sAgentSwitchRate;
+OUString m_sScalingFactorMin;
+OUString m_sScalingFactorMax;
+OUString m_sCrossoverProbability;
+OUString m_sCognitiveConstant;
+OUString m_sSocialConstant;
+OUString m_sConstrictionCoeff;
+OUString m_sMutationProbability;
+OUString m_sLibrarySize;
+
css::uno::Sequence m_aEngineOptions;
std::vector m_aConstraints;
@@ -131,7 +176,9 @@ private:
// Used to create or read a single solver parameter based on its named
range
bool ReadParamValue(SolverParameter eParam, OUString& rValue, bool
bRemoveQuotes = false);
+bool ReadDoubleParamValue(SolverParameter eParam, OUString& rValue);
void WriteParamValue(SolverParameter eParam, OUString sValue, bool bQuoted
= false);
+void WriteDoubleParamValue(SolverParameter eParam, std::u16string_view
sValue);
// Creates or reads all constraints stored in named ranges
void ReadConstraints();
@@ -149,19 +196,46 @@ private:
// Maps solver parameters to named ranges
std::map m_mNamedRanges
-= { { SP_OBJ_CELL, "solver_opt" }, { SP_OBJ_TYPE, "solver_typ" },
-{ SP_OBJ_VAL, "solver_val" }, { SP_VAR_CELLS, "solver_adj" },
-{ SP_CONSTR_COUNT, "solver_num" }, { SP_LO_ENGINE,
"solver_lo_eng" },
-{ SP_MS_ENGINE, "solver_eng" },
core.git: sc/inc sc/qa sc/source
sc/inc/SolverSettings.hxx | 117 -
sc/qa/unit/data/ods/tdf158735.ods |binary
sc/qa/unit/ucalc_solver.cxx| 29
sc/source/core/data/SolverSettings.cxx | 220 +
4 files changed, 356 insertions(+), 10 deletions(-)
New commits:
commit 04d884cc99eb66679fb254129b54488bd40e5abf
Author: Rafael Lima
AuthorDate: Mon Mar 4 19:01:40 2024 +0100
Commit: Tomaž Vajngerl
CommitDate: Wed Mar 6 04:33:24 2024 +0100
tdf#158735 Save solver settings for DEPS and SCO as well
When bug tdf#38948 was originally fixed, the solvers DEPS and SCO were not
considered. This caused a regression, because setting engine options for these
solvers made them never be saved, even in its own sheet.
This patch fixes that by incorporating the engine options for DEPS and SCO.
Change-Id: I93af712f91da2f7b1ac57ed74f6c2c2d7d411bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164376
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index ec1ef994a7b8..985e8d30f796 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -39,11 +39,34 @@ enum SolverParameter
SP_LO_ENGINE, // Engine name used in LO
SP_MS_ENGINE, // Engine ID used in MSO
SP_INTEGER, // Assume all variables are integer (0: no, 1: yes)
+// LpSolve, CoinMP and SwarmSolver
SP_NON_NEGATIVE, // Assume non negativity (1: yes, 2: no)
SP_EPSILON_LEVEL, // Epsilon level
SP_LIMIT_BBDEPTH, // Branch and bound depth
SP_TIMEOUT, // Time limit to return a solution
-SP_ALGORITHM // Algorithm used by the SwarmSolver (1, 2 or 3)
+SP_ALGORITHM, // Algorithm used by the SwarmSolver (1, 2 or 3)
+// Engine options common for DEPS and SCO
+SP_SWARM_SIZE, // Size of Swarm
+SP_LEARNING_CYCLES, // Learning Cycles
+SP_GUESS_VARIABLE_RANGE, // Variable Bounds Guessing
+SP_VARIABLE_RANGE_THRESHOLD, // Variable Bounds Threshold (when guessing)
+SP_ACR_COMPARATOR, // Use ACR Comparator (instead of BCH)
+SP_RND_STARTING_POINT, // Use Random starting point
+SP_STRONGER_PRNG, // Use a stronger random generator (slower)
+SP_STAGNATION_LIMIT, // Stagnation Limit
+SP_STAGNATION_TOLERANCE, // Stagnation Tolerance
+SP_ENHANCED_STATUS, // Show enhanced solver status
+// DEPS Options
+SP_AGENT_SWITCH_RATE, // Agent Switch Rate (DE Probability)
+SP_SCALING_MIN, // DE: Min Scaling Factor (0-1.2)
+SP_SCALING_MAX, // DE: Max Scaling Factor (0-1.2)
+SP_CROSSOVER_PROB, // DE: Crossover Probability (0-1)
+SP_COGNITIVE_CONST, // Cognitive Constant
+SP_SOCIAL_CONST, // Social Constant
+SP_CONSTRICTION_COEFF, // PS: Constriction Coefficient
+SP_MUTATION_PROB, // Mutation Probability (0-0.005)
+// SCO Options
+SP_LIBRARY_SIZE, // Size of library
};
// Starts at 1 to maintain MS compatibility
@@ -123,6 +146,28 @@ private:
OUString m_sLimitBBDepth;
OUString m_sTimeout;
OUString m_sAlgorithm;
+// DEPS and SCO
+OUString m_sSwarmSize;
+OUString m_sLearningCycles;
+OUString m_sGuessVariableRange;
+OUString m_sVariableRangeThreshold;
+OUString m_sUseACRComparator;
+OUString m_sUseRandomStartingPoint;
+OUString m_sUseStrongerPRNG;
+OUString m_sStagnationLimit;
+OUString m_sTolerance;
+OUString m_sEnhancedSolverStatus;
+// DEPS only
+OUString m_sAgentSwitchRate;
+OUString m_sScalingFactorMin;
+OUString m_sScalingFactorMax;
+OUString m_sCrossoverProbability;
+OUString m_sCognitiveConstant;
+OUString m_sSocialConstant;
+OUString m_sConstrictionCoeff;
+OUString m_sMutationProbability;
+OUString m_sLibrarySize;
+
css::uno::Sequence m_aEngineOptions;
std::vector m_aConstraints;
@@ -131,7 +176,9 @@ private:
// Used to create or read a single solver parameter based on its named
range
bool ReadParamValue(SolverParameter eParam, OUString& rValue, bool
bRemoveQuotes = false);
+bool ReadDoubleParamValue(SolverParameter eParam, OUString& rValue);
void WriteParamValue(SolverParameter eParam, OUString sValue, bool bQuoted
= false);
+void WriteDoubleParamValue(SolverParameter eParam, std::u16string_view
sValue);
// Creates or reads all constraints stored in named ranges
void ReadConstraints();
@@ -149,19 +196,46 @@ private:
// Maps solver parameters to named ranges
std::map m_mNamedRanges
-= { { SP_OBJ_CELL, "solver_opt" }, { SP_OBJ_TYPE, "solver_typ" },
-{ SP_OBJ_VAL, "solver_val" }, { SP_VAR_CELLS, "solver_adj" },
-{ SP_CONSTR_COUNT, "solver_num" }, { SP_LO_ENGINE,
"solver_lo_eng" },
-{ SP_MS_ENGINE, "solver_eng" }, { SP_INTEGER, "solver_int" },
-{ SP_NON_NEGATIVE, "solver_neg" }, { SP_EPSILON_LEVEL,
"solver_eps" },
-{ SP_LIMIT_BBDEPTH,
core.git: sc/source
sc/source/ui/view/tabvwshf.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3432dec53cfa6409dffebfdd67ce663362c71115
Author: Rafael Lima
AuthorDate: Thu Feb 22 21:36:55 2024 +0100
Commit: Mike Kaganski
CommitDate: Thu Feb 29 12:28:04 2024 +0100
tdf#159847 Fix "Duplicate Sheet" when two files have the same name
Prior to this fix, if two files were opened and had the same file name (but
in a different directory), Calc might not create the duplicate sheet in the
correct file.
Change-Id: I7cdbdd2f3dae6752a3b78bbdcb74fbecb5b24b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163763
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index f73925b23c6b..dd0a12930870 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -212,7 +212,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
// Get info about current document and selected tab
SCTAB nTab = rViewData.GetTabNo();
-OUString aDocName = GetViewData().GetDocShell()->GetTitle();
+OUString aDocName =
GetViewData().GetDocShell()->GetTitle(SFX_TITLE_FULLNAME);
sal_uInt16 nDoc = 0;
bool bCpy = true;
@@ -229,7 +229,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
pScSh->GetTitle();
-if (aDocName == pScSh->GetTitle())
+if (aDocName == pScSh->GetTitle(SFX_TITLE_FULLNAME))
{
nDoc = i;
break;
core.git: cui/source
cui/source/options/treeopt.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 263e431f76447c6933343a4a07c9ed6d193af867
Author: Rafael Lima
AuthorDate: Thu Feb 1 13:04:20 2024 +0100
Commit: Julien Nabet
CommitDate: Mon Feb 5 18:50:58 2024 +0100
tdf#159476 Remove experimental status from Basic IDE entry in Options dialog
Change-Id: Icbc9d131d90e639490f6dfd896565c994a17b172
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162829
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7d0ae590b49b..2c8abb9cfa5e 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1757,13 +1757,6 @@ void OfaTreeOptionsDialog::generalOptions(const
std::vector& vPageId
continue;
}
-// Disable Basic IDE options, if experimental features are not
enabled
-if( RID_SVXPAGE_BASICIDE_OPTIONS == nPageId )
-{
-if( ! officecfg::Office::Common::Misc::ExperimentalMode::get()
)
-continue;
-}
-
if (!vPageId.empty())
{
if (std::find(vPageId.begin(), vPageId.end(), nPageId) !=
vPageId.end())
core.git: 2 commits - basctl/sdi basctl/source basctl/uiconfig include/sfx2 include/vcl officecfg/registry sfx2/sdi svx/source vcl/source
basctl/sdi/baside.sdi |6
basctl/source/basicide/baside2.cxx|6
basctl/source/basicide/basides1.cxx |7
basctl/source/basicide/unomodel.cxx | 51 ++
basctl/source/basicide/unomodel.hxx |3
basctl/uiconfig/basicide/menubar/menubar.xml |2
include/sfx2/sfxsids.hrc |1
include/vcl/textview.hxx |3
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu|6
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |5
sfx2/sdi/sfx.sdi | 16
svx/source/tbxctrls/tbunosearchcontrollers.cxx| 20 -
vcl/source/edit/textview.cxx | 177
++
13 files changed, 298 insertions(+), 5 deletions(-)
New commits:
commit 22b5007e2740e1f461968f3c8e919326eb4d4785
Author: Rafael Lima
AuthorDate: Sat Jan 13 22:26:48 2024 +0100
Commit: Andreas Heinisch
CommitDate: Thu Feb 1 13:37:28 2024 +0100
tdf#140004 Toggle comment in the Basic IDE
This patch adds the "toggle comment" functionality to the Basic IDE.
The shortcut Ctrl + Alt + C is used to execute it.
It works similarly to other code editors such as Kate and VSCode.
Change-Id: Ifdae42b3729cc909baf87c729fe8c3cdf6428184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162005
Reviewed-by: Andreas Heinisch
Tested-by: Andreas Heinisch
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 74b425cf6db4..34f34a6362e2 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -688,6 +688,12 @@ shell basctl_Shell
ExecMethod = ExecuteDialog;
StateMethod = GetState;
]
+
+SID_TOGGLE_COMMENT
+[
+StateMethod = GetState;
+ExecMethod = ExecuteGlobal;
+]
}
interface BasicIDEDocument
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index db9b109f7947..62bbaa799815 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1066,6 +1066,12 @@ void ModulWindow::ExecuteGlobal (SfxRequest& rReq)
GetDispatcher()->Execute(SID_GOTOLINE);
}
break;
+
+case SID_TOGGLE_COMMENT:
+{
+GetEditView()->ToggleComment();
+}
+break;
}
}
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 8052845983f3..6fe3b9a562f6 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1235,6 +1235,13 @@ void Shell::GetState(SfxItemSet )
rSet.DisableItem( nWh );
}
break;
+case SID_TOGGLE_COMMENT:
+{
+// Only available in a ModulWindow if the document can be
edited
+if (pCurWin && (!dynamic_cast(pCurWin.get()) ||
pCurWin->IsReadOnly()))
+rSet.DisableItem(nWh);
+}
+break;
case SID_GOTOLINE:
{
// if this is not a module window hide the
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml
b/basctl/uiconfig/basicide/menubar/menubar.xml
index d649f968c8d9..bf41ce562bec 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -55,6 +55,7 @@
+
@@ -177,4 +178,3 @@
-
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 4c8a080c1b2f..176e500c55b3 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -670,6 +670,7 @@ class SvxZoomItem;
#define SID_BASICIDE_WATCH TypedWhichId(
SID_BASICIDE_START + 55 )
#define SID_BASICIDE_STACK TypedWhichId(
SID_BASICIDE_START + 56 )
#define SID_BASICIDE_COLOR_SCHEME_DLG ( SID_BASICIDE_START + 57 )
+#define SID_TOGGLE_COMMENT ( SID_BASICIDE_START + 58 )
#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862)
#define SID_OPTIONS_SECURITY( SID_BASICIDE_START + 863)
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 84a89e8c58d8..0de1f7c0d5a9 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -222,6 +222,9 @@ public:
boolIndentBlock();
boolUnindentBlock();
+
+// Used in the Basic IDE to toggle comment on a block of code
+voidToggleComment();
};
#endif
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
core.git: basctl/source
basctl/source/basicide/baside2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit df0c602aa6579604bc734bbfb5956261eb026b23 Author: Rafael Lima AuthorDate: Wed Jan 31 13:54:43 2024 +0100 Commit: Andreas Heinisch CommitDate: Wed Jan 31 22:58:22 2024 +0100 Related tdf#158750 Fix line highlight for all modules when color scheme changes Prior to this patch, if a library had multiple modules and the color scheme was changed (via View - Color Scheme), the line hightlight color would only update for the current module and remain unchanged for the other modules in the same library. Change-Id: Idda78c07d02534dfedcd927c37116a2617500ebc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162818 Tested-by: Jenkins Reviewed-by: Andreas Heinisch diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 98f016a57236..db9b109f7947 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1450,6 +1450,7 @@ void ModulWindow::SetEditorColorScheme(const OUString& rColorScheme) Wallpaper aBackgroundColor(GetLayout().GetSyntaxBackgroundColor()); rEditWindow.SetBackground(aBackgroundColor); rEditWindow.GetWindow(GetWindowType::Border)->SetBackground(aBackgroundColor); + rEditWindow.SetLineHighlightColor(GetShell()->GetColorConfig()->GetColorScheme(rColorScheme).m_aLineHighlightColor); // The EditEngine is created only when the module is actually opened for the first time, // therefore we need to check if it actually exists before updating its syntax highlighting
core.git: Branch 'libreoffice-7-6' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 341840f4f97ca03b3d2e416014f4f406cb8b2a2f
Author: Rafael Lima
AuthorDate: Tue Jan 23 23:36:11 2024 +0100
Commit: Xisco Fauli
CommitDate: Tue Jan 30 09:28:16 2024 +0100
tdf#159329 Fix AutoFilter arrow color in dark mode
When using dark mode, the arrow is black over a dark background. This patch
makes it use the dialog text color for better contrast.
Change-Id: Icf07d50599191417dee294e1f4c925fe1a8a7655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162460
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit b0f678ca59a65a3c302c3c3a499230fbc52ed5bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162616
Reviewed-by: Xisco Fauli
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 2ff0e4a4dc00..71654ec5b886 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -171,14 +171,7 @@ void ScCheckListMenuControl::CreateDropDown()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
-// tdf#151820 The color used for the arrow head depends on the background
color
-Color aBackgroundColor = rStyleSettings.GetWindowColor();
-Color aSpinColor;
-if (aBackgroundColor.IsDark())
-aSpinColor = rStyleSettings.GetLightColor();
-else
-aSpinColor = rStyleSettings.GetDarkShadowColor();
-
+Color aSpinColor = rStyleSettings.GetDialogTextColor();
int nWidth = (mxMenu->get_text_height() * 3) / 4;
mxDropDown->SetOutputSizePixel(Size(nWidth, nWidth));
DecorationView aDecoView(mxDropDown.get());
core.git: Branch 'distro/collabora/co-24.04' - 19 commits - basctl/source canvas/source cui/uiconfig external/onlineupdate offapi/com oox/source readlicense_oo/license sc/qa sc/source sd/source sfx2/s
basctl/source/basicide/baside2b.cxx |9
canvas/source/cairo/cairo_canvashelper.cxx|2
cui/uiconfig/ui/linetabpage.ui|1
external/onlineupdate/lo.patch| 13
offapi/com/sun/star/style/CharacterProperties.idl |8
oox/source/drawingml/chart/chartspaceconverter.cxx|3
readlicense_oo/license/CREDITS.fodt | 4851 +-
sc/qa/uitest/calc_tests8/navigator.py | 27
sc/source/ui/cctrl/checklistmenu.cxx |9
sc/source/ui/navipi/navipi.cxx|1
sd/source/ui/view/drviewsf.cxx| 15
sfx2/source/doc/guisaveas.cxx |2
svl/source/crypto/cryptosign.cxx |5
svx/source/accessibility/AccessibleShape.cxx |2
sw/inc/ndtxt.hxx |2
sw/qa/core/text/data/tdf159336.odt|binary
sw/qa/core/text/text.cxx | 35
sw/qa/uitest/data/tdf106733.fodt | 66
sw/qa/uitest/writer_tests8/tdf106733.py | 112
sw/qa/uitest/writer_tests8/tdf159102.py | 42
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/frmtool.cxx | 27
sw/source/core/layout/trvlfrm.cxx | 67
sw/source/core/text/EnhancedPDFExportHelper.cxx |5
sw/source/core/text/guess.cxx |7
sw/source/core/text/itrcrsr.cxx |5
sw/source/core/text/itrform2.cxx |2
sw/source/core/text/txtfrm.cxx|4
sw/source/core/txtnode/thints.cxx | 25
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 12
vcl/qa/cppunit/pdfexport/data/LinkPages.fodt | 138
vcl/qa/cppunit/pdfexport/pdfexport.cxx| 607 ++
vcl/qt5/QtWidget.cxx |3
xmloff/source/text/txtprmap.cxx |2
34 files changed, 3731 insertions(+), 2380 deletions(-)
New commits:
commit d48d8a41699f5a4d3cfad5d924ed9dd4ed628fcd
Author: Rafael Lima
AuthorDate: Tue Jan 23 23:36:11 2024 +0100
Commit: Andras Timar
CommitDate: Mon Jan 29 10:30:26 2024 +0100
tdf#159329 Fix AutoFilter arrow color in dark mode
When using dark mode, the arrow is black over a dark background. This patch
makes it use the dialog text color for better contrast.
Change-Id: Icf07d50599191417dee294e1f4c925fe1a8a7655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162460
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit b0f678ca59a65a3c302c3c3a499230fbc52ed5bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162615
Reviewed-by: Xisco Fauli
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index ecee4dab0600..d11d5405347e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -171,14 +171,7 @@ void ScCheckListMenuControl::CreateDropDown()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
-// tdf#151820 The color used for the arrow head depends on the background
color
-Color aBackgroundColor = rStyleSettings.GetWindowColor();
-Color aSpinColor;
-if (aBackgroundColor.IsDark())
-aSpinColor = rStyleSettings.GetLightColor();
-else
-aSpinColor = rStyleSettings.GetDarkShadowColor();
-
+Color aSpinColor = rStyleSettings.GetDialogTextColor();
int nWidth = (mxMenu->get_text_height() * 3) / 4;
mxDropDown->SetOutputSizePixel(Size(nWidth, nWidth), /*bErase*/true,
/*bAlphaMaskTransparent*/true);
DecorationView aDecoView(mxDropDown.get());
commit 3ef06c78e05fe41414720172865cfc4df5f1ba26
Author: Oliver Specht
AuthorDate: Tue Dec 12 15:51:42 2023 +0100
Commit: Andras Timar
CommitDate: Mon Jan 29 10:30:26 2024 +0100
tdf#158652 notify navigator on insert/edit/delete comment
links changes of the drawing engine to comments as it was
done before with pictures, shapes and OLE objects
ui unit test included
Change-Id: I4fde3a82b80e73758fb3da94ed2553453d09e9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160624
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0097f8595791f4bbf499ebd423f4f80ec8e38dbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162381
Reviewed-by: Caolán McNamara
diff --git a/sc/qa/uitest/calc_tests8/navigator.py
b/sc/qa/uitest/calc_tests8/navigator.py
index ec8fa2ae9a2e..9c1769dcf49d 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -10,6 +10,7 @@
from uitest.framework import UITestCase
from
core.git: Branch 'libreoffice-24-2' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit d60520f8aabefd8f2893b8656c555c25be93c16c
Author: Rafael Lima
AuthorDate: Tue Jan 23 23:36:11 2024 +0100
Commit: Xisco Fauli
CommitDate: Mon Jan 29 10:22:19 2024 +0100
tdf#159329 Fix AutoFilter arrow color in dark mode
When using dark mode, the arrow is black over a dark background. This patch
makes it use the dialog text color for better contrast.
Change-Id: Icf07d50599191417dee294e1f4c925fe1a8a7655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162460
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit b0f678ca59a65a3c302c3c3a499230fbc52ed5bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162615
Reviewed-by: Xisco Fauli
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 92e7096fc25a..578c248b7f9c 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -171,14 +171,7 @@ void ScCheckListMenuControl::CreateDropDown()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
-// tdf#151820 The color used for the arrow head depends on the background
color
-Color aBackgroundColor = rStyleSettings.GetWindowColor();
-Color aSpinColor;
-if (aBackgroundColor.IsDark())
-aSpinColor = rStyleSettings.GetLightColor();
-else
-aSpinColor = rStyleSettings.GetDarkShadowColor();
-
+Color aSpinColor = rStyleSettings.GetDialogTextColor();
int nWidth = (mxMenu->get_text_height() * 3) / 4;
mxDropDown->SetOutputSizePixel(Size(nWidth, nWidth), /*bErase*/true,
/*bAlphaMaskTransparent*/true);
DecorationView aDecoView(mxDropDown.get());
core.git: basctl/source
basctl/source/basicide/baside2b.cxx |5 +
basctl/source/basicide/linenumberwindow.cxx |3 +++
2 files changed, 8 insertions(+)
New commits:
commit 80480fb5ecc18a0a9b6c45cc35eba721f636
Author: Rafael Lima
AuthorDate: Wed Jan 24 22:42:47 2024 +0100
Commit: Hossein
CommitDate: Fri Jan 26 17:05:48 2024 +0100
tdf#153853 Line numbering and breakpoint should be on the left (RTL)
As requested by the user in the ticket, the Line Numering and Breakpoint
windows should be on the left side, even on RTL locales.
Change-Id: Iad2ba8efa0a23a13cf88c2fa277c4eed45002aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162540
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 9ee9c70c23ac..e5fd31d22a21 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2050,6 +2050,10 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow*
pParent ) :
aEWVScrollBar(VclPtr::Create(this, false)),
aEWHScrollBar(VclPtr::Create(this, true))
{
+// tdf#153853 The line numbering and breakpoint windows should appear on
+// the left, even on RTL locales
+EnableRTL(false);
+
aEdtWindow->Show();
aBrkWindow->Show();
@@ -2858,6 +2862,7 @@ CodeCompleteWindow::CodeCompleteWindow(EditorWindow* pPar)
m_xListBox->connect_changed(LINK(this, CodeCompleteWindow, ImplSelectHdl));
m_xListBox->connect_key_press(LINK(this, CodeCompleteWindow, KeyInputHdl));
m_xListBox->make_sorted();
+m_xListBox->set_direction(false);
m_xListBox->set_size_request(150, 150); // default, this will adopt the
line length
SetSizePixel(m_xContainer->get_preferred_size());
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index 7b4b07da726f..80fff0872f10 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -21,6 +21,9 @@ LineNumberWindow::LineNumberWindow(vcl::Window* pParent,
ModulWindow* pModulWind
, m_pModulWindow(pModulWindow)
, m_nCurYOffset(0)
{
+// tdf#153853 The line number window does not need to be affected by RTL
+EnableRTL(false);
+
const Wallpaper
aBackground(GetSettings().GetStyleSettings().GetWindowColor());
SetBackground(aBackground);
GetWindow(GetWindowType::Border)->SetBackground(aBackground);
core.git: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit b0f678ca59a65a3c302c3c3a499230fbc52ed5bd
Author: Rafael Lima
AuthorDate: Tue Jan 23 23:36:11 2024 +0100
Commit: Rafael Lima
CommitDate: Fri Jan 26 14:37:36 2024 +0100
tdf#159329 Fix AutoFilter arrow color in dark mode
When using dark mode, the arrow is black over a dark background. This patch
makes it use the dialog text color for better contrast.
Change-Id: Icf07d50599191417dee294e1f4c925fe1a8a7655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162460
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index ecee4dab0600..d11d5405347e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -171,14 +171,7 @@ void ScCheckListMenuControl::CreateDropDown()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
-// tdf#151820 The color used for the arrow head depends on the background
color
-Color aBackgroundColor = rStyleSettings.GetWindowColor();
-Color aSpinColor;
-if (aBackgroundColor.IsDark())
-aSpinColor = rStyleSettings.GetLightColor();
-else
-aSpinColor = rStyleSettings.GetDarkShadowColor();
-
+Color aSpinColor = rStyleSettings.GetDialogTextColor();
int nWidth = (mxMenu->get_text_height() * 3) / 4;
mxDropDown->SetOutputSizePixel(Size(nWidth, nWidth), /*bErase*/true,
/*bAlphaMaskTransparent*/true);
DecorationView aDecoView(mxDropDown.get());
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/gotopagedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit cd01f035c4c3e20f890dd48b7a734bf0513ab667 Author: Rafael Lima AuthorDate: Wed Jan 24 01:09:31 2024 +0100 Commit: Rafael Lima CommitDate: Thu Jan 25 13:48:39 2024 +0100 tdf#159349 Dialog "Go to Page" in Writer should not be resizable Change-Id: Ica252b9e8c1ba4f7e5218d2264dd31c18eda06d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162462 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/gotopagedialog.ui b/sw/uiconfig/swriter/ui/gotopagedialog.ui index f40abed5018d..b57e88fc5a06 100644 --- a/sw/uiconfig/swriter/ui/gotopagedialog.ui +++ b/sw/uiconfig/swriter/ui/gotopagedialog.ui @@ -6,6 +6,7 @@ False 6 Go to Page +False True 0 0
core.git: basctl/uiconfig
basctl/uiconfig/basicide/ui/gotolinedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 52188252bb5d44e15266b84b771599a453438ba6 Author: Rafael Lima AuthorDate: Wed Jan 24 00:46:48 2024 +0100 Commit: Rafael Lima CommitDate: Wed Jan 24 12:11:08 2024 +0100 Related tdf#158749 The "Go to Line" dialog should not be resizable Change-Id: I93c5c1b4a2832b60e194abd7e7d528362885bb24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162461 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/basctl/uiconfig/basicide/ui/gotolinedialog.ui b/basctl/uiconfig/basicide/ui/gotolinedialog.ui index fdef2dec1f19..84960ce7d4e0 100644 --- a/basctl/uiconfig/basicide/ui/gotolinedialog.ui +++ b/basctl/uiconfig/basicide/ui/gotolinedialog.ui @@ -6,6 +6,7 @@ False 6 Go to Line +False True 0 0
core.git: basctl/inc basctl/Library_basctl.mk basctl/sdi basctl/source basctl/uiconfig
basctl/Library_basctl.mk |1
basctl/inc/strings.hrc|1
basctl/sdi/baside.sdi |1
basctl/source/basicide/LineStatusControl.cxx | 45
basctl/source/basicide/baside2.cxx| 12 +++
basctl/source/basicide/basidesh.cxx |2
basctl/source/basicide/moduldl2.cxx | 31 +++-
basctl/source/basicide/moduldlg.hxx |8 +-
basctl/source/inc/LineStatusControl.hxx | 30
basctl/uiconfig/basicide/ui/gotolinedialog.ui | 92 +++---
10 files changed, 162 insertions(+), 61 deletions(-)
New commits:
commit d9d9ec70395ed5ad8ac4b985b8c9215af7436258
Author: Rafael Lima
AuthorDate: Mon Jan 15 18:08:12 2024 +0100
Commit: Rafael Lima
CommitDate: Tue Jan 23 12:11:33 2024 +0100
tdf#158749 Open "Go to Line" dialog from the statusbar in Basic IDE
With this change, if the user clicks the StatusGetPosition item in the
status bar, the Go To Line dialog will be shown.
Change-Id: Iba75e2dbf6ba83fce24e1af237bdf9813d4ecb69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162108
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 13d3bce29e41..cb41fa9e461c 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/iderdll \
basctl/source/basicide/layout \
basctl/source/basicide/linenumberwindow \
+ basctl/source/basicide/LineStatusControl \
basctl/source/basicide/localizationmgr \
basctl/source/basicide/macrodlg \
basctl/source/basicide/moduldl2 \
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 44efc2f52ed8..ee83fbb543b0 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -113,6 +113,7 @@
#define RID_STR_READONLYNC_("RID_STR_READONLY",
"Read-only")
#define RID_STR_MODULE_READONLY NC_("RID_STR_READONLY_WARNING",
"This module is read-only and cannot be edited.")
#define RID_STR_DIALOG_READONLY NC_("RID_STR_READONLY_WARNING",
"This dialog is read-only and cannot be edited.")
+#define RID_LINE_STATUS_CONTROL NC_("RID_LINE_STATUS_CONTROL",
"Current line and character. Click to open 'Go to Line' dialog.")
// Color scheme names
#define RID_STR_COLORSCHEME_DEFAULT NC_("RID_STR_COLORSCHEME_DEFAULT",
"Default")
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 40ddd8b3bfd7..74b425cf6db4 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -618,6 +618,7 @@ shell basctl_Shell
SID_BASICIDE_STAT_POS
[
+ExecMethod = ExecuteGlobal;
StateMethod = GetState;
]
diff --git a/basctl/source/basicide/LineStatusControl.cxx
b/basctl/source/basicide/LineStatusControl.cxx
new file mode 100644
index ..fd716b3901f7
--- /dev/null
+++ b/basctl/source/basicide/LineStatusControl.cxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+namespace basctl
+{
+SFX_IMPL_STATUSBAR_CONTROL(LineStatusControl, SfxStringItem);
+
+LineStatusControl::LineStatusControl(sal_uInt16 _nSlotId, sal_uInt16 _nId,
StatusBar& rStb)
+: SfxStatusBarControl(_nSlotId, _nId, rStb)
+{
+}
+
+LineStatusControl::~LineStatusControl() {}
+
+void LineStatusControl::StateChangedAtStatusBarControl(sal_uInt16 /*nSID*/,
SfxItemState eState,
+ const SfxPoolItem*
pState)
+{
+if (eState == SfxItemState::DEFAULT)
+{
+// Can access pState
+GetStatusBar().SetItemText(GetId(), static_cast(pState)->GetValue());
+GetStatusBar().SetQuickHelpText(GetId(),
IDEResId(RID_LINE_STATUS_CONTROL));
+}
+else
+{
+GetStatusBar().SetItemText(GetId(), u""_ustr);
+GetStatusBar().SetQuickHelpText(GetId(), u""_ustr);
+}
+}
+
+} // namespace basctl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 74c25d6f4631..98f016a57236 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -25,6 +25,7 @@
#include
#include
#include "moduldlg.hxx"
+#include
#include
#include
#include
@@ -1027,12 +1028,15 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
break;
case SID_GOTOLINE:
{
-GotoLineDialog aGotoDlg(GetFrameWeld());
+
core.git: Branch 'libreoffice-7-6' - basctl/source
basctl/source/dlged/dlged.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3fd80b31eb997847e04571b21ec512928a70bf81 Author: Rafael Lima AuthorDate: Wed Jan 17 20:33:43 2024 +0100 Commit: Xisco Fauli CommitDate: Mon Jan 22 22:18:48 2024 +0100 tdf#159247 Fix crash while adding control with default properties (Dialog Editor) Controls created using the Ctrl+toolbar (which adds a control with default properties) did not have a parent form, which causes the crash. Change-Id: Ic2f469e6656a93bbed25d86092384f81b21aaca5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162217 Tested-by: Jenkins Reviewed-by: Patrick Luby Reviewed-by: Rafael Lima (cherry picked from commit c4e5b1b934fc3c59fb35ae6c02a0ddf8501a6d28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162278 Reviewed-by: Xisco Fauli (cherry picked from commit 41146e08e1dda001a7c490f6a28aad09174b4d65) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162282 diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 1917e3ff4a56..26db2effb039 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -623,6 +623,8 @@ void DlgEditor::CreateDefaultObject() // set default property values pDlgEdObj->SetDefaults(); +// set the form to which the new object belongs +pDlgEdObj->SetDlgEdForm(pDlgEdForm.get()); // insert object into drawing page SdrPageView* pPageView = pDlgEdView->GetSdrPageView();
core.git: Branch 'libreoffice-24-2-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df5fea3fab250a11b37d0803716d740e4fab2ba6 Author: Rafael Lima AuthorDate: Mon Jan 22 14:36:30 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Jan 22 14:36:30 2024 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2-0' to c2520523383ab38a49b9f61cc05b74ed49de046c - Silence strings for translation in sf_dataset.xhp Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit e464f139740062a8da409d74c2942205dbe99aa0) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161999 (cherry picked from commit 8a46af6d1523f0092c0a000cce688ec4916b9ef9) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162373 Reviewed-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index f8dfcc874016..c2520523383a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f8dfcc8740164aad277abb73584b2d103ed3b189 +Subproject commit c2520523383ab38a49b9f61cc05b74ed49de046c
help.git: Branch 'libreoffice-24-2-0' - source/text
source/text/sbasic/shared/03/sf_dataset.xhp | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit c2520523383ab38a49b9f61cc05b74ed49de046c
Author: Rafael Lima
AuthorDate: Thu Jan 11 22:12:05 2024 +0100
Commit: Christian Lohmaier
CommitDate: Mon Jan 22 14:36:29 2024 +0100
Silence strings for translation in sf_dataset.xhp
Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit e464f139740062a8da409d74c2942205dbe99aa0)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161999
(cherry picked from commit 8a46af6d1523f0092c0a000cce688ec4916b9ef9)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162373
Reviewed-by: Christian Lohmaier
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
index 47158a535e..8f3d509b0e 100644
--- a/source/text/sbasic/shared/03/sf_dataset.xhp
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -515,11 +515,11 @@
- currId =
oDataset.GetValue(FieldName := "ID")
+ currId = oDataset.GetValue(FieldName :=
"ID")
- curr_id =
dataset.GetValue(fieldname = "ID")
+ curr_id = dataset.GetValue(fieldname =
"ID")
@@ -559,7 +559,7 @@
dataset =
database.CreateDataset("Customers")
new_data = {"Name":
"John", "Age": 30, "City": "Chicago"}
- new_id =
dataset.Insert(new_data)
+ new_id = dataset.Insert(new_data)
The following calls
are accepted in Python:
@@ -588,11 +588,11 @@
- oDataset.MoveFirst()
+ oDataset.MoveFirst()
- dataset.MoveFirst()
+ dataset.MoveFirst()
@@ -618,13 +618,13 @@
- oDataset.MoveNext()
- oDataset.MoveNext(5)
+ oDataset.MoveNext()
+ oDataset.MoveNext(5)
- dataset.MoveNext()
- dataset.MoveNext(5)
+ dataset.MoveNext()
+ dataset.MoveNext(5)
@@ -647,13 +647,13 @@
- oDataset.Reload()
+ oDataset.Reload()
oDataset.Reload(Filter := "[Name] = 'John'", OrderBy
:= "Age")
- dataset.Reload()
- dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age"
+ dataset.Reload()
+ dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age")
@@ -675,10 +675,10 @@
The example below
updates the current record using a Dictionary.
- oNewValues =
CreateScriptService("Dictionary")
+ oNewValues =
CreateScriptService("Dictionary")
oNewValues.Add("Age", 51)
oNewValues.Add("City", "New York")
- oDataset.Update(oNewValues)
+ oDataset.Update(oNewValues)
The same result can
be achieved by passing all pairs of fields and values as arguments:
@@ -687,7 +687,7 @@
new_values = {"Age":
51, "City": "New York"}
- dataset.Update(new_values)
+ dataset.Update(new_values)
dataset.Update("Age", 51, "City", "New
York")
core.git: Branch 'distro/collabora/co-24.04' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c9b23c7fe074ad8c9a86fea95e26a6ee0049ea5 Author: Rafael Lima AuthorDate: Sat Jan 20 19:39:58 2024 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 20 19:39:58 2024 +0100 Update git submodules * Update helpcontent2 from branch 'distro/collabora/co-24.04' to 3a01a710608f9237d25f509056cc41ad73e43da6 - Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit d6168024a68482349db0c02713e79d37a31519ce) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162137 Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index d529ecdee07d..3a01a710608f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d529ecdee07d04f261fd13d05ecf2e0ee9f18a4b +Subproject commit 3a01a710608f9237d25f509056cc41ad73e43da6
help.git: Branch 'distro/collabora/co-24.04' - source/text
source/text/sbasic/shared/03/sf_database.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 3a01a710608f9237d25f509056cc41ad73e43da6 Author: Rafael Lima AuthorDate: Thu Jan 11 13:23:18 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jan 16 16:38:05 2024 +0100 Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit d6168024a68482349db0c02713e79d37a31519ce) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162137 Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_database.xhp b/source/text/sbasic/shared/03/sf_database.xhp index 852fb6a0f4..b898e0549b 100644 --- a/source/text/sbasic/shared/03/sf_database.xhp +++ b/source/text/sbasic/shared/03/sf_database.xhp @@ -68,10 +68,10 @@ -NONE +NONE -0 +0 Transaction handling is disabled and the database is set to the default auto-commit mode. @@ -79,10 +79,10 @@ -READ_UNCOMMITTED +READ_UNCOMMITTED -1 +1 Dirty reads, non-repeatable reads and phantom reads can occur. @@ -91,10 +91,10 @@ -READ_COMMITTED +READ_COMMITTED -2 +2 Dirty reads are prevented, however non-repeatable reads and phantom reads can occur. @@ -103,10 +103,10 @@ -REPEATABLE_READ +REPEATABLE_READ -4 +4 Dirty reads and non-repeatable reads are prevented. However, phantom reads can occur. @@ -115,10 +115,10 @@ -SERIALIZABLE +SERIALIZABLE -8 +8 Dirty reads, non-repeatable reads and phantom reads are prevented.
core.git: Branch 'libreoffice-24-2' - basctl/source
basctl/source/dlged/dlged.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8472ffa70887b8f68d7e8f17faef377a83b0695e Author: Rafael Lima AuthorDate: Wed Jan 17 20:33:43 2024 +0100 Commit: Xisco Fauli CommitDate: Fri Jan 19 17:08:20 2024 +0100 tdf#159247 Fix crash while adding control with default properties (Dialog Editor) Controls created using the Ctrl+toolbar (which adds a control with default properties) did not have a parent form, which causes the crash. Change-Id: Ic2f469e6656a93bbed25d86092384f81b21aaca5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162217 Tested-by: Jenkins Reviewed-by: Patrick Luby Reviewed-by: Rafael Lima (cherry picked from commit c4e5b1b934fc3c59fb35ae6c02a0ddf8501a6d28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162278 Reviewed-by: Xisco Fauli diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 2eb099718b5b..a91a6511bd50 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -620,6 +620,8 @@ void DlgEditor::CreateDefaultObject() // set default property values pDlgEdObj->SetDefaults(); +// set the form to which the new object belongs +pDlgEdObj->SetDlgEdForm(pDlgEdForm.get()); // insert object into drawing page SdrPageView* pPageView = pDlgEdView->GetSdrPageView();
core.git: basctl/source
basctl/source/dlged/dlged.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit c4e5b1b934fc3c59fb35ae6c02a0ddf8501a6d28 Author: Rafael Lima AuthorDate: Wed Jan 17 20:33:43 2024 +0100 Commit: Rafael Lima CommitDate: Fri Jan 19 13:23:55 2024 +0100 tdf#159247 Fix crash while adding control with default properties (Dialog Editor) Controls created using the Ctrl+toolbar (which adds a control with default properties) did not have a parent form, which causes the crash. Change-Id: Ic2f469e6656a93bbed25d86092384f81b21aaca5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162217 Tested-by: Jenkins Reviewed-by: Patrick Luby Reviewed-by: Rafael Lima diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index be3c4cc1584f..1aa9ca380416 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -620,6 +620,8 @@ void DlgEditor::CreateDefaultObject() // set default property values pDlgEdObj->SetDefaults(); +// set the form to which the new object belongs +pDlgEdObj->SetDlgEdForm(pDlgEdForm.get()); // insert object into drawing page SdrPageView* pPageView = pDlgEdView->GetSdrPageView();
core.git: basctl/uiconfig
basctl/uiconfig/basicide/ui/colorscheme.ui |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 950af5a45723d16cc5e91324f021a2e77470f2ce Author: Rafael Lima AuthorDate: Wed Jan 17 19:59:08 2024 +0100 Commit: Caolán McNamara CommitDate: Thu Jan 18 09:52:14 2024 +0100 tdf#159221 Fix color scheme names under Gtk3 (Basic IDE) Color scheme names were not appearing in the "Color Scheme" dialog in the Basic IDE under gtk3 (View - Color Scheme). This patch fixes that. Change-Id: I9b019f3ed867ca6f45b53d67a3dc01139251391e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162215 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/basctl/uiconfig/basicide/ui/colorscheme.ui b/basctl/uiconfig/basicide/ui/colorscheme.ui index 709f946d854a..7cc51fd7602f 100644 --- a/basctl/uiconfig/basicide/ui/colorscheme.ui +++ b/basctl/uiconfig/basicide/ui/colorscheme.ui @@ -4,10 +4,10 @@ - - + + @@ -179,6 +179,9 @@ + +0 +
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 66f829f1f41800ca9e31f0dd82fa78fdad02a77a Author: Rafael Lima AuthorDate: Tue Jan 16 16:38:06 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Jan 16 16:38:06 2024 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 3a01a710608f9237d25f509056cc41ad73e43da6 - Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit d6168024a68482349db0c02713e79d37a31519ce) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162137 Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index d529ecdee07d..3a01a710608f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d529ecdee07d04f261fd13d05ecf2e0ee9f18a4b +Subproject commit 3a01a710608f9237d25f509056cc41ad73e43da6
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_database.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 3a01a710608f9237d25f509056cc41ad73e43da6 Author: Rafael Lima AuthorDate: Thu Jan 11 13:23:18 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jan 16 16:38:05 2024 +0100 Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit d6168024a68482349db0c02713e79d37a31519ce) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162137 Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_database.xhp b/source/text/sbasic/shared/03/sf_database.xhp index 852fb6a0f4..b898e0549b 100644 --- a/source/text/sbasic/shared/03/sf_database.xhp +++ b/source/text/sbasic/shared/03/sf_database.xhp @@ -68,10 +68,10 @@ -NONE +NONE -0 +0 Transaction handling is disabled and the database is set to the default auto-commit mode. @@ -79,10 +79,10 @@ -READ_UNCOMMITTED +READ_UNCOMMITTED -1 +1 Dirty reads, non-repeatable reads and phantom reads can occur. @@ -91,10 +91,10 @@ -READ_COMMITTED +READ_COMMITTED -2 +2 Dirty reads are prevented, however non-repeatable reads and phantom reads can occur. @@ -103,10 +103,10 @@ -REPEATABLE_READ +REPEATABLE_READ -4 +4 Dirty reads and non-repeatable reads are prevented. However, phantom reads can occur. @@ -115,10 +115,10 @@ -SERIALIZABLE +SERIALIZABLE -8 +8 Dirty reads, non-repeatable reads and phantom reads are prevented.
core.git: extensions/inc include/svx
extensions/inc/strings.hrc |2 +-
include/svx/strings.hrc|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 83c1df8e524cc74c6d1afcadb3cccba5ef2eb123
Author: Rafael Lima
AuthorDate: Fri Jan 12 14:56:40 2024 +0100
Commit: Mike Kaganski
CommitDate: Mon Jan 15 02:17:15 2024 +0100
tdf#159151 Fix double space in Tree Control
Change-Id: I400b0f84d52f365636ab86410abde330f3c05cbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161947
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc
index e124f4a635be..a14f66ef78a2 100644
--- a/extensions/inc/strings.hrc
+++ b/extensions/inc/strings.hrc
@@ -283,7 +283,7 @@
#define RID_STR_PROPTITLE_NUMERICFIELD
NC_("RID_STR_PROPTITLE_NUMERICFIELD", "Numeric Field")
#define RID_STR_PROPTITLE_CURRENCYFIELD
NC_("RID_STR_PROPTITLE_CURRENCYFIELD", "Currency Field")
#define RID_STR_PROPTITLE_PATTERNFIELD
NC_("RID_STR_PROPTITLE_PATTERNFIELD", "Pattern Field")
-#define RID_STR_PROPTITLE_DBGRID
NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ")
+#define RID_STR_PROPTITLE_DBGRID
NC_("RID_STR_PROPTITLE_DBGRID", "Table Control")
#define STR_DETAIL_FORM NC_("STR_DETAIL_FORM", "Sub
Form")
#define STR_MASTER_FORM NC_("STR_MASTER_FORM", "Master
Form")
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index bc42cae37ea4..2630cc98a5e9 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1230,7 +1230,7 @@
#define RID_STR_PROPTITLE_IMAGEBUTTON
NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button")
#define RID_STR_PROPTITLE_IMAGECONTROL
NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control")
#define RID_STR_PROPTITLE_FILECONTROL
NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection")
-#define RID_STR_PROPTITLE_DBGRID
NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ")
+#define RID_STR_PROPTITLE_DBGRID
NC_("RID_STR_PROPTITLE_DBGRID", "Table Control")
#define RID_STR_PROPTITLE_SCROLLBAR
NC_("RID_STR_PROPTITLE_SCROLLBAR", "Scrollbar")
#define RID_STR_PROPTITLE_SPINBUTTON
NC_("RID_STR_PROPTITLE_SPINBUTTON", "Spin Button")
#define RID_STR_PROPTITLE_NAVBAR
NC_("RID_STR_PROPTITLE_NAVBAR", "Navigation Bar")
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6028845f24b4271cc6578e4d9d59d8fbc08974db Author: Rafael Lima AuthorDate: Mon Jan 15 01:18:34 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Jan 15 01:18:34 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d33c78198fbb0d56f08eb265d6ce432b1a7f66b1 - Fix strings in sf_dialogcontrol.xhp Change-Id: Idf185b763d6a566d39bf7403015fc961d53ab614 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161935 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 85b7b1975b0b..d33c78198fbb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 85b7b1975b0b8a9afd1abfc94c69f1152400ce04 +Subproject commit d33c78198fbb0d56f08eb265d6ce432b1a7f66b1
help.git: source/text
source/text/sbasic/shared/03/sf_dialogcontrol.xhp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d33c78198fbb0d56f08eb265d6ce432b1a7f66b1 Author: Rafael Lima AuthorDate: Thu Jan 11 19:49:32 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 15 01:18:34 2024 +0100 Fix strings in sf_dialogcontrol.xhp Change-Id: Idf185b763d6a566d39bf7403015fc961d53ab614 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161935 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_dialogcontrol.xhp b/source/text/sbasic/shared/03/sf_dialogcontrol.xhp index 95badd3d29..2e93839ff5 100644 --- a/source/text/sbasic/shared/03/sf_dialogcontrol.xhp +++ b/source/text/sbasic/shared/03/sf_dialogcontrol.xhp @@ -109,7 +109,7 @@ ListBox NumericField PatternField ProgressBar RadioButton ScrollBar - TableControl TextField TimeField TreeControl +TableControl TextField TimeField TreeControl @@ -148,7 +148,7 @@ Button, … -The Border property refers to the surrounding of the control: 3D, FLAT or NONE. +The Border property refers to the surrounding of the control: "3D", "FLAT" or "NONE". @@ -799,7 +799,7 @@ - There's no Value property for GroupBox, Hyperlink, ImageControl and TreeControl dialog controls. + There is no Value property for GroupBox, Hyperlink, ImageControl and TreeControl dialog controls. Event properties
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb5ae2ed78bdf94c56c581da21bb139554e0d6b1 Author: Rafael Lima AuthorDate: Mon Jan 15 01:18:13 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Jan 15 01:18:13 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 85b7b1975b0b8a9afd1abfc94c69f1152400ce04 - Fix sentences in sf_document.xhp Change-Id: Ia3a3090e243c719255e3b7de02d26acc3bd4dc87 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161936 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index be416c32550a..85b7b1975b0b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit be416c32550aa2fe0c0cfa94b437848a280261bb +Subproject commit 85b7b1975b0b8a9afd1abfc94c69f1152400ce04
help.git: source/text
source/text/sbasic/shared/03/sf_document.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 85b7b1975b0b8a9afd1abfc94c69f1152400ce04 Author: Rafael Lima AuthorDate: Thu Jan 11 20:13:08 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 15 01:18:13 2024 +0100 Fix sentences in sf_document.xhp Change-Id: Ia3a3090e243c719255e3b7de02d26acc3bd4dc87 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161936 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index 3397dd67b7..3f1776e72d 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -353,7 +353,7 @@ UNO Object -A com.sun.star.XXX.DocumentSettings UNO object - where XXX is sheet, text, drawing or presentation - that gives access to UNO internal properties, that are specific to the document's type. +A com.sun.star.XXX.DocumentSettings UNO object, where XXX is either sheet, text, drawing or presentation. This object gives access to the internal UNO properties that are specific to the document's type. @@ -540,7 +540,7 @@ family: One of the style families present in the actual document, as a case-sensitive string. Valid family names can be retrieved using StyleFamilies property. - stylelist: A single style name as a string or an array of style names. The style names may be localized or not. The StylesList is typically the output of the execution of a Styles() method. + stylelist: A single style name as a string or an array of style names. The style names may be localized or not. The StylesList is typically the output of the execution of a Styles() method. @@ -586,7 +586,7 @@ doc.Echo(echoon = False, hourglass = True) -... +... doc.Echo() @@ -661,7 +661,7 @@ filename: The file from which to load the styles in the FileSystem notation. The file is presumed to be of the same document type as the actual document. - families: One of the style families present in the actual document, as a case-sensitive string or an array of such strings. Default = all families. + families: One of the style families present in the actual document, as a case-sensitive string or an array of such strings. Leave this argument blank to import all families. overwrite: When True, the actual styles may be overwritten. Default is False. @@ -970,14 +970,14 @@ - + XStyles - Document service;XStyles XStyles - This method returns the UNO representation of a given style for all document types except Base. Nothing is returned when the StyleName does not exist in the given Family. + This method returns the UNO representation of a given style for all document types except Base. Nothing is returned when the StyleName does not exist in the given family. svc.XStyles(family: str, stylename: str): uno
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3d64e6fbdaccf558cdbd1ac4da8d53c623ebb56 Author: Rafael Lima AuthorDate: Sat Jan 13 20:14:15 2024 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 13 20:14:15 2024 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 8a46af6d1523f0092c0a000cce688ec4916b9ef9 - Silence strings for translation in sf_dataset.xhp Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit e464f139740062a8da409d74c2942205dbe99aa0) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161999 diff --git a/helpcontent2 b/helpcontent2 index 4a851d785063..8a46af6d1523 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4a851d785063f7286f134810ef87ee5e945a3ba7 +Subproject commit 8a46af6d1523f0092c0a000cce688ec4916b9ef9
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_dataset.xhp | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 8a46af6d1523f0092c0a000cce688ec4916b9ef9
Author: Rafael Lima
AuthorDate: Thu Jan 11 22:12:05 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jan 13 20:14:14 2024 +0100
Silence strings for translation in sf_dataset.xhp
Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit e464f139740062a8da409d74c2942205dbe99aa0)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161999
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
index 47158a535e..8f3d509b0e 100644
--- a/source/text/sbasic/shared/03/sf_dataset.xhp
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -515,11 +515,11 @@
- currId =
oDataset.GetValue(FieldName := "ID")
+ currId = oDataset.GetValue(FieldName :=
"ID")
- curr_id =
dataset.GetValue(fieldname = "ID")
+ curr_id = dataset.GetValue(fieldname =
"ID")
@@ -559,7 +559,7 @@
dataset =
database.CreateDataset("Customers")
new_data = {"Name":
"John", "Age": 30, "City": "Chicago"}
- new_id =
dataset.Insert(new_data)
+ new_id = dataset.Insert(new_data)
The following calls
are accepted in Python:
@@ -588,11 +588,11 @@
- oDataset.MoveFirst()
+ oDataset.MoveFirst()
- dataset.MoveFirst()
+ dataset.MoveFirst()
@@ -618,13 +618,13 @@
- oDataset.MoveNext()
- oDataset.MoveNext(5)
+ oDataset.MoveNext()
+ oDataset.MoveNext(5)
- dataset.MoveNext()
- dataset.MoveNext(5)
+ dataset.MoveNext()
+ dataset.MoveNext(5)
@@ -647,13 +647,13 @@
- oDataset.Reload()
+ oDataset.Reload()
oDataset.Reload(Filter := "[Name] = 'John'", OrderBy
:= "Age")
- dataset.Reload()
- dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age"
+ dataset.Reload()
+ dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age")
@@ -675,10 +675,10 @@
The example below
updates the current record using a Dictionary.
- oNewValues =
CreateScriptService("Dictionary")
+ oNewValues =
CreateScriptService("Dictionary")
oNewValues.Add("Age", 51)
oNewValues.Add("City", "New York")
- oDataset.Update(oNewValues)
+ oDataset.Update(oNewValues)
The same result can
be achieved by passing all pairs of fields and values as arguments:
@@ -687,7 +687,7 @@
new_values = {"Age":
51, "City": "New York"}
- dataset.Update(new_values)
+ dataset.Update(new_values)
dataset.Update("Age", 51, "City", "New
York")
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f21fb5f530d40b4decdb5b9c153412f195293df2 Author: Rafael Lima AuthorDate: Sat Jan 13 19:42:21 2024 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 13 19:42:21 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b8c6c19ab2fac10cdade1ae96721422814b19be3 - Silence strings for translation in sf_dataset.xhp Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 2039fbabf053..b8c6c19ab2fa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2039fbabf053a19c9eaeee3db95dc8d710dfeb69 +Subproject commit b8c6c19ab2fac10cdade1ae96721422814b19be3
help.git: source/text
source/text/sbasic/shared/03/sf_dataset.xhp | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit b8c6c19ab2fac10cdade1ae96721422814b19be3
Author: Rafael Lima
AuthorDate: Thu Jan 11 22:12:05 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jan 13 19:42:20 2024 +0100
Silence strings for translation in sf_dataset.xhp
Change-Id: I62754d87b3feef4b54f7de43ec041c20c9ad07b2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161940
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
index e63f16e3df..1d55a5dd5a 100644
--- a/source/text/sbasic/shared/03/sf_dataset.xhp
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -515,11 +515,11 @@
- currId =
oDataset.GetValue(FieldName := "ID")
+ currId = oDataset.GetValue(FieldName :=
"ID")
- curr_id =
dataset.GetValue(fieldname = "ID")
+ curr_id = dataset.GetValue(fieldname =
"ID")
@@ -559,7 +559,7 @@
dataset =
database.CreateDataset("Customers")
new_data = {"Name":
"John", "Age": 30, "City": "Chicago"}
- new_id =
dataset.Insert(new_data)
+ new_id = dataset.Insert(new_data)
The following calls
are accepted in Python:
@@ -588,11 +588,11 @@
- oDataset.MoveFirst()
+ oDataset.MoveFirst()
- dataset.MoveFirst()
+ dataset.MoveFirst()
@@ -618,13 +618,13 @@
- oDataset.MoveNext()
- oDataset.MoveNext(5)
+ oDataset.MoveNext()
+ oDataset.MoveNext(5)
- dataset.MoveNext()
- dataset.MoveNext(5)
+ dataset.MoveNext()
+ dataset.MoveNext(5)
@@ -647,13 +647,13 @@
- oDataset.Reload()
+ oDataset.Reload()
oDataset.Reload(Filter := "[Name] = 'John'", OrderBy
:= "Age")
- dataset.Reload()
- dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age"
+ dataset.Reload()
+ dataset.Reload(Filter = "[Name] = 'John'", OrderBy =
"Age")
@@ -675,10 +675,10 @@
The example below
updates the current record using a Dictionary.
- oNewValues =
CreateScriptService("Dictionary")
+ oNewValues =
CreateScriptService("Dictionary")
oNewValues.Add("Age", 51)
oNewValues.Add("City", "New York")
- oDataset.Update(oNewValues)
+ oDataset.Update(oNewValues)
The same result can
be achieved by passing all pairs of fields and values as arguments:
@@ -687,7 +687,7 @@
new_values = {"Age":
51, "City": "New York"}
- dataset.Update(new_values)
+ dataset.Update(new_values)
dataset.Update("Age", 51, "City", "New
York")
help.git: Changes to 'distro/collabora/co-24.04'
New branch 'distro/collabora/co-24.04' available with the following commits:
help.git: Changes to 'refs/tags/co-24.04-branch-point'
Tag 'co-24.04-branch-point' created by Andras Timar at 2024-01-12 16:25 + co-24.04-branch-point Changes since libreoffice-24-2-branch-point-29: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a0513ce48ed6da73eec22ba20ea8a7dcce8ec1d Author: Rafael Lima AuthorDate: Thu Jan 11 22:03:23 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 22:03:23 2024 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 4a851d785063f7286f134810ef87ee5e945a3ba7 - Silence string for translation in sf_intro.xhp Change-Id: I12d48417dc979e85138b78f906fae3486f9673b4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161938 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 3ed389a88b0650556d19ad64ad7b6f66ef4bee0d) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161939 Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index c903a5157e0b..4a851d785063 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c903a5157e0b9fe44a624965b642d1af57ec2b28 +Subproject commit 4a851d785063f7286f134810ef87ee5e945a3ba7
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_intro.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a851d785063f7286f134810ef87ee5e945a3ba7 Author: Rafael Lima AuthorDate: Thu Jan 11 21:25:11 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Jan 11 22:03:23 2024 +0100 Silence string for translation in sf_intro.xhp Change-Id: I12d48417dc979e85138b78f906fae3486f9673b4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161938 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 3ed389a88b0650556d19ad64ad7b6f66ef4bee0d) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161939 Tested-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_intro.xhp b/source/text/sbasic/shared/03/sf_intro.xhp index dced4f25b9..02e8d5a864 100644 --- a/source/text/sbasic/shared/03/sf_intro.xhp +++ b/source/text/sbasic/shared/03/sf_intro.xhp @@ -191,7 +191,7 @@ In this case, set the environment variable PYTHONPATH as follows before starting the Python interpreter: - export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages + export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages The location of these files will be different for each operating system and %PRODUCTNAME installation method.
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa86997621e490fb490828e6a86f42e209d21283 Author: Rafael Lima AuthorDate: Thu Jan 11 22:02:42 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 22:02:42 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 04877b3bb878e30f8df562a35bc97163ee6be9ff - Silence string for translation in sf_intro.xhp Change-Id: I12d48417dc979e85138b78f906fae3486f9673b4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161938 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 46e73230cf1f..04877b3bb878 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 46e73230cf1f0b3c9f21391099c2e15d8a54db3b +Subproject commit 04877b3bb878e30f8df562a35bc97163ee6be9ff
help.git: source/text
source/text/sbasic/shared/03/sf_intro.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04877b3bb878e30f8df562a35bc97163ee6be9ff Author: Rafael Lima AuthorDate: Thu Jan 11 21:25:11 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Jan 11 22:02:41 2024 +0100 Silence string for translation in sf_intro.xhp Change-Id: I12d48417dc979e85138b78f906fae3486f9673b4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161938 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_intro.xhp b/source/text/sbasic/shared/03/sf_intro.xhp index dced4f25b9..02e8d5a864 100644 --- a/source/text/sbasic/shared/03/sf_intro.xhp +++ b/source/text/sbasic/shared/03/sf_intro.xhp @@ -191,7 +191,7 @@ In this case, set the environment variable PYTHONPATH as follows before starting the Python interpreter: - export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages + export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages The location of these files will be different for each operating system and %PRODUCTNAME installation method.
core.git: basctl/source officecfg/registry
basctl/source/basicide/BasicColorConfig.cxx | 31 --
basctl/source/basicide/baside2.cxx |1
basctl/source/basicide/baside2.hxx |7 +
basctl/source/basicide/baside2b.cxx | 51 +++
basctl/source/basicide/linenumberwindow.cxx | 26 +
basctl/source/basicide/linenumberwindow.hxx |1
basctl/source/inc/colorscheme.hxx|1
officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu | 30 ++
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs | 10 ++
9 files changed, 149 insertions(+), 9 deletions(-)
New commits:
commit bf410be4502c2d78e38856c455833681c6b8a151
Author: Rafael Lima
AuthorDate: Wed Jan 10 20:34:55 2024 +0100
Commit: Andreas Heinisch
CommitDate: Thu Jan 11 19:56:08 2024 +0100
tdf#158750 Highlight the line where the cursor is positioned (Basic IDE)
This patch implements support for highlighting the selected line in the
code editor, similar to what Kate, VSCode, etc do.
If the cursor is positioned in a single line and nothing is selected, then
a highlight color is applied to the line. The line number window also
highlights the selected line.
Change-Id: I2047d79500cd783b122b6752bb00996de0a7c702
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161861
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/basctl/source/basicide/BasicColorConfig.cxx
b/basctl/source/basicide/BasicColorConfig.cxx
index 21ff95bc0f8e..ab17b164934b 100644
--- a/basctl/source/basicide/BasicColorConfig.cxx
+++ b/basctl/source/basicide/BasicColorConfig.cxx
@@ -49,13 +49,16 @@ ColorScheme BasicColorConfig::GetColorScheme(const
OUString& rScheme)
return GetAutomaticColorScheme();
}
-std::vector aVecPropNames = {
-OUString(rScheme + "/GenericColor/Color"), OUString(rScheme +
"/IdentifierColor/Color"),
-OUString(rScheme + "/NumberColor/Color"),OUString(rScheme +
"/StringColor/Color"),
-OUString(rScheme + "/CommentColor/Color"), OUString(rScheme +
"/ErrorColor/Color"),
-OUString(rScheme + "/OperatorColor/Color"), OUString(rScheme +
"/KeywordColor/Color"),
-OUString(rScheme + "/BackgroundColor/Color")
-};
+std::vector aVecPropNames = { OUString(rScheme +
"/GenericColor/Color"),
+OUString(rScheme +
"/IdentifierColor/Color"),
+OUString(rScheme +
"/NumberColor/Color"),
+OUString(rScheme +
"/StringColor/Color"),
+OUString(rScheme +
"/CommentColor/Color"),
+OUString(rScheme +
"/ErrorColor/Color"),
+OUString(rScheme +
"/OperatorColor/Color"),
+OUString(rScheme +
"/KeywordColor/Color"),
+OUString(rScheme +
"/BackgroundColor/Color"),
+OUString(rScheme +
"/LineHighlightColor/Color") };
css::uno::Sequence aPropNames(aVecPropNames.size());
OUString* pPropNames = aPropNames.getArray();
@@ -77,12 +80,22 @@ ColorScheme BasicColorConfig::GetColorScheme(const
OUString& rScheme)
aColors[6] >>= aColorScheme.m_aOperatorColor;
aColors[7] >>= aColorScheme.m_aKeywordColor;
aColors[8] >>= aColorScheme.m_aBackgroundColor;
+aColors[9] >>= aColorScheme.m_aLineHighlightColor;
return aColorScheme;
}
ColorScheme BasicColorConfig::GetAutomaticColorScheme()
{
+// Application Colors do not define a line highlight color, so here we
adjust
+// the background color to get a highlight color
+Color aBackgroundColor =
aColorConfig.GetColorValue(svtools::BASICEDITOR).nColor;
+Color aHighlightColor(aBackgroundColor);
+if (aBackgroundColor.IsDark())
+aHighlightColor.ApplyTintOrShade(1000);
+else
+aHighlightColor.ApplyTintOrShade(-1000);
+
ColorScheme aScheme = { DEFAULT_SCHEME,
false,
aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor,
@@ -93,7 +106,9 @@ ColorScheme BasicColorConfig::GetAutomaticColorScheme()
aColorConfig.GetColorValue(svtools::BASICERROR).nColor,
aColorConfig.GetColorValue(svtools::BASICOPERATOR).nColor,
aColorConfig.GetColorValue(svtools::BASICKEYWORD).nColor,
-
aColorConfig.GetColorValue(svtools::BASICEDITOR).nColor };
+aBackgroundColor,
+aHighlightColor };
+
return aScheme;
}
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 45f3398c9a816f70815cf38620cf5db2ce66431c Author: Rafael Lima AuthorDate: Thu Jan 11 19:50:54 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 19:50:54 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 46e73230cf1f0b3c9f21391099c2e15d8a54db3b - Improve sentences and fix strings in sf_dialog.xhp Change-Id: Ic710fe6e92f73b5f247d881046b71a165ec6812f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161933 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 163b2d43d3e7..46e73230cf1f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 163b2d43d3e746a5c71c77b61e9e5dba4a34c039 +Subproject commit 46e73230cf1f0b3c9f21391099c2e15d8a54db3b
help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp | 152 ++---
1 file changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 46e73230cf1f0b3c9f21391099c2e15d8a54db3b
Author: Rafael Lima
AuthorDate: Thu Jan 11 18:54:02 2024 +0100
Commit: Olivier Hallot
CommitDate: Thu Jan 11 19:50:54 2024 +0100
Improve sentences and fix strings in sf_dialog.xhp
Change-Id: Ic710fe6e92f73b5f247d881046b71a165ec6812f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161933
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp
b/source/text/sbasic/shared/03/sf_dialog.xhp
index 37b1f9078d..1c6f0110de 100644
--- a/source/text/sbasic/shared/03/sf_dialog.xhp
+++ b/source/text/sbasic/shared/03/sf_dialog.xhp
@@ -552,8 +552,8 @@
Sub
TriggerEvent(oEvent As Object)
Dim oDialog1 As Object, oDialog2 As Object, lExec As Long
-
Set oDialog1 = CreateScriptService(DialogEvent, oEvent) The
dialog that caused the event
-
Set oDialog2 = CreateScriptService(Dialog, ...) Open a
second dialog
+
Set oDialog1 = CreateScriptService("DialogEvent", oEvent) The dialog
that caused the event
+
Set oDialog2 = CreateScriptService("Dialog", ...) Open a second
dialog
oDialog2.Center(oDialog1)
lExec = oDialog2.Execute()
Select Case lExec
@@ -589,7 +589,7 @@
- Set myButton2 =
oDlg.CloneControl(Button1, Button2, 30, 30)
+ Set myButton2 = oDlg.CloneControl("Button1",
"Button2", 30, 30)
@@ -637,7 +637,7 @@
Dialog service;CreateButton
CreateButton
- Create a new control
of type Button in the current dialog.
+ Creates a new
control of type Button in the current dialog.
svc.CreateButton(ControlName: str, Place: any,
Toggle: bool = False, Push: str = ""): svc
@@ -651,7 +651,7 @@
All elements are
expressed in Map
AppFont units.
Toggle:
when True a Toggle button is created. Default =
False
- Push:
OK, CANCEL or (default)
+ Push:
"OK", "CANCEL" or "" (default)
An instance of
SFDialogs.DialogControl
service or Nothing.
@@ -659,7 +659,7 @@
- Set
myButton = oDlg.CreateButton(Button1, Array(20, 20, 60,
15))
+ Set
myButton = oDlg.CreateButton("Button1", Array(20, 20, 60, 15))
@@ -673,7 +673,7 @@
Dialog service;CreateCheckBox
CreateCheckBox
- Create a new control
of type CheckBox in the current dialog.
+ Creates a new
control of type CheckBox in the current dialog.
svc.CreateCheckBox(ControlName: str, Place: any,
Multiline: bool = False): svc
@@ -682,7 +682,7 @@
- Set
myCheckBox = oDlg.CreateCheckBox(CheckBox1, Array(20, 20, 60, 15),
MultiLine := True)
+ Set
myCheckBox = oDlg.CreateCheckBox("CheckBox1", Array(20, 20, 60, 15), MultiLine
:= True)
@@ -696,18 +696,18 @@
Dialog service;CreateComboBox
CreateComboBox
- Create a new control
of type ComboBox in the current dialog.
+ Creates a new
control of type ComboBox in the current dialog.
svc.CreateComboBox(ControlName: str, Place: any,
Border: str = "3D", DropDown: bool = True, LineCount: num = 5):
svc
- Border:
3D (default) or FLAT or NONE
+ Border:
"3D" (default), "FLAT" or "NONE"
DropDown: When True
(default), a drop down button is displayed
LineCount: Specifies the maximum line
count displayed in the drop down (default = 5)
- Set
myComboBox = oDlg.CreateComboBox(ComboBox1, Array(20, 20, 60, 15),
Dropdown := True)
+ Set
myComboBox = oDlg.CreateComboBox("ComboBox1", Array(20, 20, 60, 15), Dropdown
:= True)
@@ -721,11 +721,11 @@
Dialog service;CreateCurrencyField
CreateCurrencyField
- Create a new control
of type CurrencyField in the current dialog.
+ Creates a new
control of type CurrencyField in the current
dialog.
svc.CreateCurrencyField(ControlName: str, Place:
any, Border ="3D", SpinButton: bool = False, MinValue: num = -100,
MaxValue: num = +100, Increment: num = 1, Accuracy: num = 2):
svc
- Border:
3D (default) or FLAT or NONE
+ Border:
"3D" (default), "FLAT" or "NONE"
SpinButton: when
True (default = False), a spin button is
present
MinValue: the smallest value that can
be entered in the control. Default = -100
MaxValue: the largest value that can be
entered in the control. Default = +100
@@ -735,7 +735,7 @@
- Set
myCurrencyField = oDlg.CreateCurrencyField(CurrencyField1,
Array(20, 20, 60, 15), SpinButton := True)
+ Set
myCurrencyField = oDlg.CreateCurrencyField("CurrencyField1", Array(20, 20, 60,
15), SpinButton := True)
@@ -749,11 +749,11 @@
Dialog service;CreateDateField
CreateDateField
- Create a new control
of type DateField in
core.git: basctl/source officecfg/registry
basctl/source/basicide/baside2.cxx | 10
basctl/source/basicide/basides1.cxx | 27 ---
basctl/source/basicide/basidesh.cxx |6 ++
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs | 18 +++
4 files changed, 56 insertions(+), 5 deletions(-)
New commits:
commit c0075bf84ecb64186f42c861985af43e120101f9
Author: Rafael Lima
AuthorDate: Tue Jan 9 23:01:02 2024 +0100
Commit: Andreas Heinisch
CommitDate: Thu Jan 11 19:49:28 2024 +0100
tdf#155381 Remember the visibility of UI components in the Basic IDE
This patch remembers the visibility of the Object Catalog, Watched
Expressions and Stack Window in the Basic IDE.
Change-Id: I2fea038ffc56af45cd6570feeb14ab84307f8cef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161852
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 8eebbdb44e8d..a36cec6fe245 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1458,6 +1458,16 @@ ModulWindowLayout::ModulWindowLayout (vcl::Window*
pParent, ObjectCatalog& rObje
// Get active color scheme from the registry
m_sColorSchemeId =
GetShell()->GetColorConfig()->GetCurrentColorSchemeName();
aSyntaxColors.ApplyColorScheme(m_sColorSchemeId, true);
+
+// Initialize the visibility of the Stack Window
+bool bStackVisible =
::officecfg::Office::BasicIDE::EditorSettings::StackWindow::get();
+if (!bStackVisible)
+aStackWindow->Show(bStackVisible);
+
+// Initialize the visibility of the Watched Expressions window
+bool bWatchVisible =
::officecfg::Office::BasicIDE::EditorSettings::WatchWindow::get();
+if (!bWatchVisible)
+aWatchWindow->Show(bWatchVisible);
}
ModulWindowLayout::~ModulWindowLayout()
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 507902a34d0a..8052845983f3 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -423,14 +423,21 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break;
case SID_BASICIDE_OBJCAT:
-// toggling object catalog
-aObjectCatalog->Show(!aObjectCatalog->IsVisible());
+{
+// Toggle the visibility of the object catalog
+bool bVisible = aObjectCatalog->IsVisible();
+aObjectCatalog->Show(!bVisible);
if (pLayout)
pLayout->ArrangeWindows();
// refresh the button state
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_BASICIDE_OBJCAT);
-break;
+
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::BasicIDE::EditorSettings::ObjectCatalog::set(!bVisible,
batch);
+batch->commit();
+}
+break;
case SID_BASICIDE_WATCH:
{
@@ -438,9 +445,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
if (!dynamic_cast(pLayout.get()))
return;
-
pModulLayout->ShowWatchWindow(!pModulLayout->IsWatchWindowVisible());
+bool bVisible = pModulLayout->IsWatchWindowVisible();
+pModulLayout->ShowWatchWindow(!bVisible);
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_BASICIDE_WATCH);
+
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::BasicIDE::EditorSettings::WatchWindow::set(!bVisible, batch);
+batch->commit();
}
break;
@@ -450,9 +462,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
if (!dynamic_cast(pLayout.get()))
return;
-
pModulLayout->ShowStackWindow(!pModulLayout->IsStackWindowVisible());
+bool bVisible = pModulLayout->IsStackWindowVisible();
+pModulLayout->ShowStackWindow(!bVisible);
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_BASICIDE_STACK);
+
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::BasicIDE::EditorSettings::StackWindow::set(!bVisible, batch);
+batch->commit();
}
break;
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index e64e34e0ff59..420a51a2de8b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -75,6 +75,7 @@
#include
#include
#include
+#include
namespace basctl
{
@@ -211,6 +212,11 @@ void Shell::Init()
InitTabBar();
InitZoomLevel();
+// Initialize the visibility of the Object Catalog
+bool bObjCatVisible =
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c0463e38d138e0e502bc9c8ae9a01f4809ef5df Author: Rafael Lima AuthorDate: Thu Jan 11 19:37:56 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 19:37:56 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to abbdd32a5cd87a4f21ba17e4ea9de6fd224b8ed4 - Fix strings in sf_dataset.xhp Change-Id: Ifdee53dc4a92d9f889e9dc92943331659d28775b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161931 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d6168024a684..abbdd32a5cd8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d6168024a68482349db0c02713e79d37a31519ce +Subproject commit abbdd32a5cd87a4f21ba17e4ea9de6fd224b8ed4
help.git: source/text
source/text/sbasic/shared/03/sf_dataset.xhp | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit abbdd32a5cd87a4f21ba17e4ea9de6fd224b8ed4
Author: Rafael Lima
AuthorDate: Thu Jan 11 14:12:23 2024 +0100
Commit: Olivier Hallot
CommitDate: Thu Jan 11 19:37:56 2024 +0100
Fix strings in sf_dataset.xhp
Change-Id: Ifdee53dc4a92d9f889e9dc92943331659d28775b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161931
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
index a3b7ae61a3..e63f16e3df 100644
--- a/source/text/sbasic/shared/03/sf_dataset.xhp
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -134,7 +134,7 @@
Dictionary service
- Returns a
Dictionary with the default values used for each field in
the dataset. The fields or columns in the dataset are the keys in the
dictionary.
+ Returns a
Dictionary with the default values used for each field in
the dataset. The fields or columns in the dataset are the keys in the
dictionary.
The
database field types are converted to their corresponding Basic/Python data
types. When the field type is undefined, the default value is
Null if the field is nullable or
Empty.
@@ -379,7 +379,7 @@
Dataset service;CreateDataset
CreateDataset
-Returns a
Dataset service instance from an existing dataset by
applying the specified filter and order by statements.
+Returns a
Dataset service instance from an existing dataset by
applying the specified filter and ORDER BY
statements.
svc.CreateDataset(opt filter: str, opt orderby: str): svc
@@ -393,17 +393,17 @@
' Use an empty
string to remove the current filter
oNewDataset = oDataset.CreateDataset(Filter :=
"")
' Examples of
common filters
- oNewDataset = oDataset.CreateDataset(Filter :=
"[Name] = 'John'")
- oNewDataset = oDataset.CreateDataset(Filter :=
"[Name] LIKE 'A'")
+ oNewDataset =
oDataset.CreateDataset(Filter := "[Name] = 'John'")
+ oNewDataset =
oDataset.CreateDataset(Filter := "[Name] LIKE 'A'")
' It is possible to
append additional conditions to the current filter
- oNewDataset = oDataset.CreateDataset(Filter := "("
oDataset.Filter ") AND [Name] LIKE 'A'")
+ oNewDataset =
oDataset.CreateDataset(Filter := "(" oDataset.Filter ") AND [Name]
LIKE 'A'")
new_dataset = dataset.CreateDataset(filter =
"")
- new_dataset = dataset.CreateDataset(filter = "[Name]
= 'John'")
- new_dataset = dataset.CreateDataset(filter = "[Name]
LIKE 'A'")
- new_dataset = dataset.CreateDataset(filter =
f"({dataset.Filter}) AND [Name] LIKE 'A'")
+ new_dataset =
dataset.CreateDataset(filter = "[Name] = 'John'")
+ new_dataset =
dataset.CreateDataset(filter = "[Name] LIKE 'A'")
+ new_dataset =
dataset.CreateDataset(filter = f"({dataset.Filter}) AND [Name] LIKE
'A'")
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 89d0ab74e58fdbc0f305a6fec6bd5da677599691 Author: Rafael Lima AuthorDate: Thu Jan 11 14:20:37 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jan 11 14:20:37 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d6168024a68482349db0c02713e79d37a31519ce - Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b85bb4516175..d6168024a684 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b85bb4516175e71903a9c5db583724231fa60471 +Subproject commit d6168024a68482349db0c02713e79d37a31519ce
help.git: source/text
source/text/sbasic/shared/03/sf_database.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit d6168024a68482349db0c02713e79d37a31519ce Author: Rafael Lima AuthorDate: Thu Jan 11 13:23:18 2024 +0100 Commit: Olivier Hallot CommitDate: Thu Jan 11 14:20:36 2024 +0100 Silence strings for translation in sf_database.xhp Change-Id: Ibbccb617adbb97da9f892ead789db8f643f78f83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161930 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03/sf_database.xhp b/source/text/sbasic/shared/03/sf_database.xhp index 852fb6a0f4..b898e0549b 100644 --- a/source/text/sbasic/shared/03/sf_database.xhp +++ b/source/text/sbasic/shared/03/sf_database.xhp @@ -68,10 +68,10 @@ -NONE +NONE -0 +0 Transaction handling is disabled and the database is set to the default auto-commit mode. @@ -79,10 +79,10 @@ -READ_UNCOMMITTED +READ_UNCOMMITTED -1 +1 Dirty reads, non-repeatable reads and phantom reads can occur. @@ -91,10 +91,10 @@ -READ_COMMITTED +READ_COMMITTED -2 +2 Dirty reads are prevented, however non-repeatable reads and phantom reads can occur. @@ -103,10 +103,10 @@ -REPEATABLE_READ +REPEATABLE_READ -4 +4 Dirty reads and non-repeatable reads are prevented. However, phantom reads can occur. @@ -115,10 +115,10 @@ -SERIALIZABLE +SERIALIZABLE -8 +8 Dirty reads, non-repeatable reads and phantom reads are prevented.
core.git: sc/source
sc/source/ui/view/output.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit bd88a9ec95bf2eba157bbdd6ccfd72cc468399bf Author: Rafael Lima AuthorDate: Tue Jan 9 19:19:38 2024 +0100 Commit: Rafael Lima CommitDate: Wed Jan 10 20:29:19 2024 +0100 tdf#159075 Fix drawing comment triangle in Calc Change-Id: I82779ecd3ca4cf7ad95ab8f927c1a5e371613bf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161768 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 23f3cecb539f..edad3a96f0b6 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2519,7 +2519,9 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext& rRenderContext) } // DPI/ZOOM 100/100 => 10, 100/50 => 7, 100/150 => 13 // DPI/ZOOM 150/100 => 13, 150/50 => 8.5, 150/150 => 17.5 -const double nSize( rRenderContext.GetDPIScaleFactor() * aZoomX * 6 + 4); +const double fSize(rRenderContext.GetDPIScaleFactor() * aZoomX * 6 + 4); +// Make sure we have an integer size to draw a proper triangle +sal_Int16 nSize = static_cast(fSize); Point aPoints[3]; aPoints[0] = Point(nMarkX, nPosY); aPoints[0].setX( bLayoutRTL ? aPoints[0].X() + nSize : aPoints[0].X() - nSize );
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7afd11f8e476884662c18db85445752cc030b2e2 Author: Rafael Lima AuthorDate: Wed Jan 10 15:29:29 2024 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 10 15:29:29 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b85bb4516175e71903a9c5db583724231fa60471 - tdf#156925 Document the Color Scheme dialog Change-Id: Ida045c1f2884b70b1f9a961eb2c17e8553b8f25b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161850 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 88e571fc83ad..b85bb4516175 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 88e571fc83adaad9c813df8cacc0cdfdef59174f +Subproject commit b85bb4516175e71903a9c5db583724231fa60471
help.git: AllLangHelp_sbasic.mk source/text
AllLangHelp_sbasic.mk |1 source/text/sbasic/shared/color_scheme.xhp | 52 + source/text/shared/optionen/01012000.xhp |2 - 3 files changed, 54 insertions(+), 1 deletion(-) New commits: commit b85bb4516175e71903a9c5db583724231fa60471 Author: Rafael Lima AuthorDate: Tue Jan 9 20:55:08 2024 +0100 Commit: Olivier Hallot CommitDate: Wed Jan 10 15:29:29 2024 +0100 tdf#156925 Document the Color Scheme dialog Change-Id: Ida045c1f2884b70b1f9a961eb2c17e8553b8f25b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161850 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 8f89b33ffb..c4c51f9b1a 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -407,6 +407,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/CallByName \ helpcontent2/source/text/sbasic/shared/classmodule \ helpcontent2/source/text/sbasic/shared/collection \ +helpcontent2/source/text/sbasic/shared/color_scheme \ helpcontent2/source/text/sbasic/shared/compatible \ helpcontent2/source/text/sbasic/shared/compatibilitymode \ helpcontent2/source/text/sbasic/shared/Compiler_options \ diff --git a/source/text/sbasic/shared/color_scheme.xhp b/source/text/sbasic/shared/color_scheme.xhp new file mode 100644 index 00..14b5795f40 --- /dev/null +++ b/source/text/sbasic/shared/color_scheme.xhp @@ -0,0 +1,52 @@ + + + + + + +Color Scheme +/text/sbasic/shared/color_scheme.xhp + + + + + +Basic IDE;Color schemes + + + + Color Scheme + Changes the color scheme to be used in the Basic IDE code editor. + + +Choose View - Color Scheme. + + + Basic IDE Color Options + Choose whether to use the Application Colors or a specific color scheme: + + + Use Application Colors: Select this option to use the colors defined in the Application Colors dialog. + + + Choose Color Scheme: Select this option to use one of the available color schemes in the dialog. + + + + Color Schemes + Lists the available color schemes that can be applied to the Basic IDE code editor. + When the option Choose Color Scheme is selected, the list of color schemes is enabled. Choose one of the available color schemes and click OK to apply it. + New color schemes can be installed via extensions. Visit the https://extensions.libreoffice.org;>Extensions website to download additional Basic IDE color schemes. + + + + + + diff --git a/source/text/shared/optionen/01012000.xhp b/source/text/shared/optionen/01012000.xhp index 906e19e736..1def34b67d 100644 --- a/source/text/shared/optionen/01012000.xhp +++ b/source/text/shared/optionen/01012000.xhp @@ -38,7 +38,7 @@ -Application Colors +Application Colors Sets the colors for the $[officename] user interface. You can save the current settings as color scheme and load them later.
core.git: sc/source sc/uiconfig
sc/source/ui/navipi/content.cxx | 13 -
sc/uiconfig/scalc/ui/dropmenu.ui |8
2 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit ba3627ba899adb896855fddee9a0fdd8968b603a
Author: Rafael Lima
AuthorDate: Tue Jan 9 14:15:21 2024 +0100
Commit: Rafael Lima
CommitDate: Wed Jan 10 12:57:34 2024 +0100
tdf#158704 Add "Delete Comment" command to the Navigator context menu
Change-Id: Ied128145ab0e171e536233dda2d31ec3eace1543
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161766
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Rafael Lima
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6c472e97dc2e..af8b64b6fdba 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -601,9 +601,12 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
sActive = sId;
xDocMenu->set_active(sActive, true);
-// Edit Comments entry is only visible for comments
+// Edit/Delete Comments are only visible for comments
if (nType != ScContentId::NOTE)
+{
xPop->set_visible("edit", false);
+xPop->set_visible("delete", false);
+}
OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)));
if (sIdent == "hyperlink")
@@ -632,6 +635,14 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
bDone = true;
}
}
+else if (sIdent == "delete")
+{
+ScAddress aPos = GetNotePos(nChild);
+pParentWindow->SetCurrentTable(aPos.Tab());
+pParentWindow->SetCurrentCell(aPos.Col(), aPos.Row());
+ScTabViewShell* pScTabViewShell =
ScNavigatorDlg::GetTabViewShell();
+pScTabViewShell->DeleteContents(InsertDeleteFlags::NOTE);
+}
}
break;
default: break;
diff --git a/sc/uiconfig/scalc/ui/dropmenu.ui b/sc/uiconfig/scalc/ui/dropmenu.ui
index 7ed44d4093d0..cc585c5ab735 100644
--- a/sc/uiconfig/scalc/ui/dropmenu.ui
+++ b/sc/uiconfig/scalc/ui/dropmenu.ui
@@ -86,5 +86,13 @@
True
+
+
+True
+False
+Delete Comment
+True
+
+
core.git: sc/source
sc/source/ui/navipi/content.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9df028306fa75726eeda491f4d643d2a1073b33f Author: Rafael Lima AuthorDate: Tue Jan 9 13:34:39 2024 +0100 Commit: Rafael Lima CommitDate: Wed Jan 10 12:32:31 2024 +0100 tdf#158763 Focus the document after clicking Edit Comment This patch is needed to make the gtk3 backend focus the document after the Edit Comment is clicked in the Navigator sidebar. It already worked in gen and kf5. Change-Id: Ic46be72e6ee7df71f2031e1c6b5f0bf153a8a8c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161765 Tested-by: Jenkins Tested-by: Gabor Kelemen Reviewed-by: Rafael Lima diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 9e1cc51afd44..6c472e97dc2e 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -629,6 +629,7 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) GetManualOrCurrent()->GetDocFunc().ShowNote(aPos, true); ScTabViewShell* pScTabViewShell = ScNavigatorDlg::GetTabViewShell(); pScTabViewShell->EditNote(); +bDone = true; } } }
core.git: basctl/inc basctl/Library_basctl.mk basctl/sdi basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk include/sfx2 officecfg/registry svx/sdi
basctl/Library_basctl.mk |2
basctl/UIConfig_basicide.mk |1
basctl/inc/strings.hrc|9
basctl/sdi/baside.sdi |6
basctl/source/basicide/BasicColorConfig.cxx | 114
basctl/source/basicide/ColorSchemeDialog.cxx | 148
+
basctl/source/basicide/baside2.cxx| 153
+++--
basctl/source/basicide/baside2.hxx| 14
basctl/source/basicide/basides1.cxx | 53 +
basctl/source/basicide/basidesh.cxx |4
basctl/source/inc/BasicColorConfig.hxx| 99
+++
basctl/source/inc/ColorSchemeDialog.hxx | 57 ++
basctl/source/inc/basidesh.hxx|6
basctl/source/inc/colorscheme.hxx | 44 +
basctl/uiconfig/basicide/menubar/menubar.xml |1
basctl/uiconfig/basicide/ui/colorscheme.ui| 214
+++
include/sfx2/sfxsids.hrc |1
officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu| 284
++
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |8
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs | 122
svx/sdi/svx.sdi | 17
21 files changed, 1300 insertions(+), 57 deletions(-)
New commits:
commit 076e21f4e3c47f8be5218ab683f972eef1de3e18
Author: Rafael Lima
AuthorDate: Wed Aug 23 15:23:25 2023 +0200
Commit: Rafael Lima
CommitDate: Mon Jan 8 19:13:38 2024 +0100
tdf#156925 Add Color Scheme selector to the Basic IDE
This patch implements a color scheme selector for the Basic IDE. With this
new feature the user can either:
1) Choose to stick with "Application Colors", meaning that the colors
defined in "Tools - Options - Application Colors" are applied.
2) Use one of the available color schemes in the dialog
To access the color scheme dialog, go to View - Color Scheme.
A color schema was defined in the "BasicIDE.xcs" file and six color schemes
were defined in "BasicIDE.xcu" to be shipped with LibreOffice.
This way, it is possible to install more color schemes via extensions;
Change-Id: I5d382d19f982d02ba3c0fda5d1596aed2c38f13c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155928
Tested-by: Jenkins
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
Reviewed-by: Andreas Heinisch
Reviewed-by: Rafael Lima
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index bbd9a0047578..13d3bce29e41 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -99,6 +99,8 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/macrodlg \
basctl/source/basicide/moduldl2 \
basctl/source/basicide/moduldlg \
+ basctl/source/basicide/BasicColorConfig \
+ basctl/source/basicide/ColorSchemeDialog \
basctl/source/basicide/ObjectCatalog \
basctl/source/basicide/sbxitem \
basctl/source/basicide/scriptdocument \
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 2c23fbfb58af..217ea6c01708 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/breakpointmenus \
basctl/uiconfig/basicide/ui/codecomplete \
+ basctl/uiconfig/basicide/ui/colorscheme \
basctl/uiconfig/basicide/ui/combobox \
basctl/uiconfig/basicide/ui/defaultlanguage \
basctl/uiconfig/basicide/ui/deletelangdialog \
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 324b6ba1d44b..44efc2f52ed8 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -114,6 +114,15 @@
#define RID_STR_MODULE_READONLY NC_("RID_STR_READONLY_WARNING",
"This module is read-only and cannot be edited.")
#define RID_STR_DIALOG_READONLY NC_("RID_STR_READONLY_WARNING",
"This dialog is read-only and cannot be edited.")
+// Color scheme names
+#define RID_STR_COLORSCHEME_DEFAULT NC_("RID_STR_COLORSCHEME_DEFAULT",
"Default")
+#define RID_STR_COLORSCHEME_LIGHT NC_("RID_STR_COLORSCHEME_LIGHT",
"%PRODUCTNAME Light")
+#define RID_STR_COLORSCHEME_DARKNC_("RID_STR_COLORSCHEME_DARK",
"%PRODUCTNAME Dark")
+#define RID_STR_COLORSCHEME_BREEZE_LIGHT
NC_("RID_STR_COLORSCHEME_BREEZE_LIGHT", "Breeze Light")
+#define
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2217934a466052747b02ae855609639326f8a81b Author: Rafael Lima AuthorDate: Tue Dec 19 20:00:14 2023 +0100 Commit: Gerrit Code Review CommitDate: Tue Dec 19 20:00:14 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 1afd64c6b742bcd7a1b0fd7d8bb16c7a54e91aa0 - tdf#142926 Add HID to new Built-in help page Now that the change to the dialog has been merged (see [1]), this patch adds the appropriate target HID to the help page. This does not need to be cherry-picked to 24.2, since the change to the dialog will only be present in 24.8. [1] c48952eb6b6f65affcda75ee74c292008be9c455 Change-Id: I5097264191af59a1585fec5f03acc82b708c401d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160948 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 64d940a42d41..1afd64c6b742 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 64d940a42d41a4b77deacbfdb344cecf94975cf4 +Subproject commit 1afd64c6b742bcd7a1b0fd7d8bb16c7a54e91aa0
help.git: source/text
source/text/shared/guide/builtin_help.xhp |1 + 1 file changed, 1 insertion(+) New commits: commit 1afd64c6b742bcd7a1b0fd7d8bb16c7a54e91aa0 Author: Rafael Lima AuthorDate: Tue Dec 19 15:18:28 2023 +0100 Commit: Olivier Hallot CommitDate: Tue Dec 19 20:00:14 2023 +0100 tdf#142926 Add HID to new Built-in help page Now that the change to the dialog has been merged (see [1]), this patch adds the appropriate target HID to the help page. This does not need to be cherry-picked to 24.2, since the change to the dialog will only be present in 24.8. [1] c48952eb6b6f65affcda75ee74c292008be9c455 Change-Id: I5097264191af59a1585fec5f03acc82b708c401d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160948 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/guide/builtin_help.xhp b/source/text/shared/guide/builtin_help.xhp index fd284c462a..d721f697e4 100644 --- a/source/text/shared/guide/builtin_help.xhp +++ b/source/text/shared/guide/builtin_help.xhp @@ -17,6 +17,7 @@ + Built-in help;installation
core.git: sc/source sc/uiconfig
sc/source/ui/navipi/content.cxx | 38 +++
sc/source/ui/view/viewfun6.cxx |6 +
sc/uiconfig/scalc/ui/dropmenu.ui | 42 +++
3 files changed, 69 insertions(+), 17 deletions(-)
New commits:
commit 46c1ce9ac9fa8eff069d5998a6d96a639f277a8e
Author: Rafael Lima
AuthorDate: Tue Dec 12 01:35:46 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 16 01:24:38 2023 +0100
tdf#158514 Add "Edit Comment" entry to the navigator popup
Clicking this option will show the comment and enter edit mode.
Change-Id: Ia9d10e5e03229c48120c27de0a623de5c5cf50d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160582
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 89d77642558a..9e1cc51afd44 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -38,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -368,6 +370,17 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl,
weld::TreeView&, bool)
ScAddress aPos = GetNotePos( nChild );
pParentWindow->SetCurrentTable( aPos.Tab() );
pParentWindow->SetCurrentCell( aPos.Col(), aPos.Row() );
+// Check whether the comment is currently visible and toggle
its visibility
+ScDocument* pSrcDoc = GetSourceDocument();
+if (ScPostIt* pNote = pSrcDoc->GetNote(aPos.Col(), aPos.Row(),
aPos.Tab()))
+{
+bool bVisible = pNote->IsCaptionShown();
+// Effectivelly set the visibility of the comment
+GetManualOrCurrent()->GetDocFunc().ShowNote(aPos,
!bVisible);
+// Put the note in edit mode
+ScTabViewShell* pScTabViewShell =
ScNavigatorDlg::GetTabViewShell();
+pScTabViewShell->EditNote();
+}
}
break;
@@ -525,6 +538,13 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
{
bool bDone = false;
+ScContentId nType;
+sal_uLong nChild;
+std::unique_ptr xEntry(m_xTreeView->make_iterator());
+if (!m_xTreeView->get_cursor(xEntry.get()))
+xEntry.reset();
+GetEntryIndexes(nType, nChild, xEntry.get());
+
switch ( rCEvt.GetCommand() )
{
case CommandEventId::ContextMenu:
@@ -581,6 +601,10 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
sActive = sId;
xDocMenu->set_active(sActive, true);
+// Edit Comments entry is only visible for comments
+if (nType != ScContentId::NOTE)
+xPop->set_visible("edit", false);
+
OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)));
if (sIdent == "hyperlink")
pParentWindow->SetDropMode(0);
@@ -593,6 +617,20 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
OUString aName = xDocMenu->get_label(sIdent);
SelectDoc(aName);
}
+else if (sIdent == "edit")
+{
+ScAddress aPos = GetNotePos( nChild );
+pParentWindow->SetCurrentTable( aPos.Tab() );
+pParentWindow->SetCurrentCell( aPos.Col(), aPos.Row() );
+ScDocument* pSrcDoc = GetSourceDocument();
+if (pSrcDoc->GetNote(aPos.Col(), aPos.Row(), aPos.Tab()))
+{
+// Make the note visible and put it in edit mode
+GetManualOrCurrent()->GetDocFunc().ShowNote(aPos,
true);
+ScTabViewShell* pScTabViewShell =
ScNavigatorDlg::GetTabViewShell();
+pScTabViewShell->EditNote();
+}
+}
}
break;
default: break;
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index a840670dfce2..95d7cc2c2038 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -28,6 +28,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -507,6 +509,10 @@ void ScViewFunc::ShowNote( bool bShow )
void ScViewFunc::EditNote()
{
+// HACK: If another text object is selected, make sure it gets unselected
+if (FuText* pOldFuText = dynamic_cast(GetDrawFuncPtr()))
+pOldFuText->KeyInput(KeyEvent(0, vcl::KeyCode(KEY_ESCAPE)));
+
// for editing display and activate
ScDocShell* pDocSh = GetViewData().GetDocShell();
diff --git
core.git: sfx2/source sfx2/uiconfig
sfx2/source/appl/sfxhelp.cxx | 71 +--
sfx2/source/inc/helpids.h |2 +
sfx2/uiconfig/ui/helpmanual.ui | 82 +
3 files changed, 119 insertions(+), 36 deletions(-)
New commits:
commit c48952eb6b6f65affcda75ee74c292008be9c455
Author: Rafael Lima
AuthorDate: Fri Aug 4 04:35:42 2023 +0200
Commit: Rafael Lima
CommitDate: Fri Dec 15 18:17:32 2023 +0100
tdf#142926 Add button to Download page in Help dialog box
Change-Id: Ie22dda17949d583a388d45e5aad3728b91637bff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155298
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
Reviewed-by: Rafael Lima
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b596a4e33efa..c67f1485497f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -19,6 +19,7 @@
#include
#include
+#include
#include
#include
@@ -1011,22 +1012,33 @@ namespace {
class HelpManualMessage : public weld::MessageDialogController
{
private:
+std::unique_ptr m_xDownloadInfo;
std::unique_ptr m_xHideOfflineHelpCB;
+DECL_LINK(DownloadClickHdl, weld::LinkButton&, bool);
public:
HelpManualMessage(weld::Widget* pParent)
-: MessageDialogController(pParent, "sfx/ui/helpmanual.ui",
"onlinehelpmanual", "hidedialog")
+: MessageDialogController(pParent, "sfx/ui/helpmanual.ui",
"onlinehelpmanual", "box")
+, m_xDownloadInfo(m_xBuilder->weld_link_button("downloadinfo"))
, m_xHideOfflineHelpCB(m_xBuilder->weld_check_button("hidedialog"))
{
LanguageType aLangType =
Application::GetSettings().GetUILanguageTag().getLanguageType();
OUString sLocaleString =
SvtLanguageTable::GetLanguageString(aLangType);
OUString sPrimText = get_primary_text();
set_primary_text(sPrimText.replaceAll("$UILOCALE", sLocaleString));
+
+m_xDownloadInfo->connect_activate_link(LINK(this, HelpManualMessage,
DownloadClickHdl));
}
bool GetOfflineHelpPopUp() const { return
!m_xHideOfflineHelpCB->get_active(); }
};
+IMPL_LINK(HelpManualMessage, DownloadClickHdl, weld::LinkButton&, /* rButton
*/, bool)
+{
+m_xDialog->response(RET_YES);
+return true;
+}
+
}
bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow)
@@ -1138,6 +1150,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow)
if ( !impl_hasHelpInstalled() )
{
bool bShowOfflineHelpPopUp =
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get();
+short retOnlineHelpBox = RET_CLOSE;
TopLevelWindowLocker aBusy;
@@ -1145,18 +1158,31 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow)
{
aBusy.incBusy(pWeldWindow);
HelpManualMessage aQueryBox(pWeldWindow);
-short OnlineHelpBox = aQueryBox.run();
-bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK;
+retOnlineHelpBox = aQueryBox.run();
auto xChanges = comphelper::ConfigurationChanges::create();
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(aQueryBox.GetOfflineHelpPopUp(),
xChanges);
xChanges->commit();
aBusy.decBusy();
}
-if(!bShowOfflineHelpPopUp)
+
+// Checks whether the user clicked "Read Help Online" (RET_OK) or
"Information on downloading offline help" (RET_YES)
+if(retOnlineHelpBox == RET_OK || retOnlineHelpBox == RET_YES)
{
-if ( impl_showOnlineHelp(aHelpURL, pWeldWindow) )
-return true;
+bool bTopicExists;
+
+if (retOnlineHelpBox == RET_OK)
+{
+bTopicExists = impl_showOnlineHelp(aHelpURL, pWeldWindow);
+}
else
+{
+// Opens the help page that explains how to install
offline help
+OUString
aOfflineHelpURL(CreateHelpURL_Impl(HID_HELPMANUAL_OFFLINE, "shared"));
+impl_showOnlineHelp(aOfflineHelpURL, pWeldWindow);
+bTopicExists = true;
+}
+
+if (!bTopicExists)
{
aBusy.incBusy(pWeldWindow);
NoHelpErrorBox aErrBox(pWeldWindow);
@@ -1164,6 +1190,10 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow)
aBusy.decBusy();
return false;
}
+else
+{
+return true;
+}
}
else
{
@@ -1307,6 +1337,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL,
weld::Widget* pWidget, const OUSt
if (
help.git: Branch 'libreoffice-24-2' - AllLangHelp_shared.mk source/text
AllLangHelp_shared.mk |1 source/text/shared/guide/builtin_help.xhp | 84 ++ 2 files changed, 85 insertions(+) New commits: commit 8a730f3601264c1c389599df9c0b8b4809fb6d9b Author: Rafael Lima AuthorDate: Thu Dec 14 01:56:33 2023 +0100 Commit: Olivier Hallot CommitDate: Thu Dec 14 15:10:23 2023 +0100 Related tdf#142926 Create help page about built-in help installation Change-Id: Ie71d9e5427a0bcdfeb9c20474e76635ca68a3f2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160696 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit e99617c55d064c67d0caa82adb53925f5589c6bb) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160708 diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 64888b0d18..c5b7d27797 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -683,6 +683,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/guide/background \ helpcontent2/source/text/shared/guide/border_paragraph \ helpcontent2/source/text/shared/guide/border_table \ +helpcontent2/source/text/shared/guide/builtin_help \ helpcontent2/source/text/shared/guide/breaking_lines \ helpcontent2/source/text/shared/guide/change_title \ helpcontent2/source/text/shared/guide/chart_axis \ diff --git a/source/text/shared/guide/builtin_help.xhp b/source/text/shared/guide/builtin_help.xhp new file mode 100644 index 00..b5a11e973c --- /dev/null +++ b/source/text/shared/guide/builtin_help.xhp @@ -0,0 +1,84 @@ + + + + + + +Installation of the built-in help +/text/shared/guide/builtin_help.xhp + + + + + +Built-in help;installation + + + Installing the Built-in Help + The instructions for installing the built-in help depend on the method used for installing %PRODUCTNAME on your device. For the purpose of this guide, consider the two following approaches: + + + Installation using the official binaries obtained from the https://www.libreoffice.org/download/download-libreoffice/;>%PRODUCTNAME download page. + + + Installation using third-party repositories. This is mainly the case for Linux operating systems that maintain their own packages. + + + This guide provides instruction for installing the built-in help for packages provided by Ubuntu and Fedora. If your installation method is not covered here, please contact the maintainers of the packages installed on your system. + + Installing from the Official Download page + The instructions in this section are suitable when %PRODUCTNAME was installed using the official binaries. Follow the steps below to obtain the installation file for the offline built-in help: + + + Visit the https://www.libreoffice.org/download/download-libreoffice/;>%PRODUCTNAME download page. + + + Make sure your current operating system is selected in the Choose your operating system section. + + + Click the link Help for offline use and save the binary file to your device. + + + Before clicking the link Help for offline use, make sure the desired language is selected. Click need another language if a different language is desired. + + Windows + Open the location where the .msi binary file was downloaded to and execute the installer. Follow the installer instructions. + MacOS + Open the location where the .dmg binary file was downloaded to and execute the installer. After the installation window appears, drag and drop the %PRODUCTNAME icon onto the Applications icon. + DEB installer + The .deb installer is meant for Ubuntu-based Linux distributions and it is available as a .tar.gz compressed file. + Download the .tar.gz file to your device and extract it. The .deb file will be inside a folder named DEBS. + Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + $ sudo dpkg -i libobasis7.6-en-us-help_7.6.4.1-1_amd64.deb + The name of the downloaded file contains the version number, therefore the actual file name may differ from the example above. + RPM installer + The .rpm installer is meant for Red Hat-based Linux distributions and it is available as a .tar.gz compressed file. + Download the .tar.gz file to your device and extract it. The .rpm file will be inside a folder named RPMS. + Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + $ sudo rpm -i libobasis7.6-en-US-help-7.6.4.1-1.x86_64.rpm + After installation, restart %PRODUCTNAME to be able to use the built-in help. + + Installing from Third-party Repositories + Linux distributions usually provide their own %PRODUCTNAME packages, hence the method to install the built-in help will be different for each distribution. +
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 83e4bc73e304d8e2eda06c768bf60ea7a3bcd963 Author: Rafael Lima AuthorDate: Thu Dec 14 15:10:24 2023 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 14 15:10:24 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 8a730f3601264c1c389599df9c0b8b4809fb6d9b - Related tdf#142926 Create help page about built-in help installation Change-Id: Ie71d9e5427a0bcdfeb9c20474e76635ca68a3f2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160696 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit e99617c55d064c67d0caa82adb53925f5589c6bb) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160708 diff --git a/helpcontent2 b/helpcontent2 index 77565bf3bbd6..8a730f360126 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 77565bf3bbd61c832c906ea42d89677f8ad0a7b1 +Subproject commit 8a730f3601264c1c389599df9c0b8b4809fb6d9b
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3e88c7c1df8b6f99a5c696b2e60adb2119ac676d Author: Rafael Lima AuthorDate: Thu Dec 14 13:18:20 2023 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 14 13:18:20 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e99617c55d064c67d0caa82adb53925f5589c6bb - Related tdf#142926 Create help page about built-in help installation Change-Id: Ie71d9e5427a0bcdfeb9c20474e76635ca68a3f2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160696 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 463b64614aed..e99617c55d06 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 463b64614aed4bb4bce500f782f131d9f88308e9 +Subproject commit e99617c55d064c67d0caa82adb53925f5589c6bb
help.git: AllLangHelp_shared.mk source/text
AllLangHelp_shared.mk |1 source/text/shared/guide/builtin_help.xhp | 84 ++ 2 files changed, 85 insertions(+) New commits: commit e99617c55d064c67d0caa82adb53925f5589c6bb Author: Rafael Lima AuthorDate: Thu Dec 14 01:56:33 2023 +0100 Commit: Olivier Hallot CommitDate: Thu Dec 14 13:18:20 2023 +0100 Related tdf#142926 Create help page about built-in help installation Change-Id: Ie71d9e5427a0bcdfeb9c20474e76635ca68a3f2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160696 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 64888b0d18..c5b7d27797 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -683,6 +683,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/guide/background \ helpcontent2/source/text/shared/guide/border_paragraph \ helpcontent2/source/text/shared/guide/border_table \ +helpcontent2/source/text/shared/guide/builtin_help \ helpcontent2/source/text/shared/guide/breaking_lines \ helpcontent2/source/text/shared/guide/change_title \ helpcontent2/source/text/shared/guide/chart_axis \ diff --git a/source/text/shared/guide/builtin_help.xhp b/source/text/shared/guide/builtin_help.xhp new file mode 100644 index 00..b5a11e973c --- /dev/null +++ b/source/text/shared/guide/builtin_help.xhp @@ -0,0 +1,84 @@ + + + + + + +Installation of the built-in help +/text/shared/guide/builtin_help.xhp + + + + + +Built-in help;installation + + + Installing the Built-in Help + The instructions for installing the built-in help depend on the method used for installing %PRODUCTNAME on your device. For the purpose of this guide, consider the two following approaches: + + + Installation using the official binaries obtained from the https://www.libreoffice.org/download/download-libreoffice/;>%PRODUCTNAME download page. + + + Installation using third-party repositories. This is mainly the case for Linux operating systems that maintain their own packages. + + + This guide provides instruction for installing the built-in help for packages provided by Ubuntu and Fedora. If your installation method is not covered here, please contact the maintainers of the packages installed on your system. + + Installing from the Official Download page + The instructions in this section are suitable when %PRODUCTNAME was installed using the official binaries. Follow the steps below to obtain the installation file for the offline built-in help: + + + Visit the https://www.libreoffice.org/download/download-libreoffice/;>%PRODUCTNAME download page. + + + Make sure your current operating system is selected in the Choose your operating system section. + + + Click the link Help for offline use and save the binary file to your device. + + + Before clicking the link Help for offline use, make sure the desired language is selected. Click need another language if a different language is desired. + + Windows + Open the location where the .msi binary file was downloaded to and execute the installer. Follow the installer instructions. + MacOS + Open the location where the .dmg binary file was downloaded to and execute the installer. After the installation window appears, drag and drop the %PRODUCTNAME icon onto the Applications icon. + DEB installer + The .deb installer is meant for Ubuntu-based Linux distributions and it is available as a .tar.gz compressed file. + Download the .tar.gz file to your device and extract it. The .deb file will be inside a folder named DEBS. + Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + $ sudo dpkg -i libobasis7.6-en-us-help_7.6.4.1-1_amd64.deb + The name of the downloaded file contains the version number, therefore the actual file name may differ from the example above. + RPM installer + The .rpm installer is meant for Red Hat-based Linux distributions and it is available as a .tar.gz compressed file. + Download the .tar.gz file to your device and extract it. The .rpm file will be inside a folder named RPMS. + Open the Terminal application, use the cd command to navigate to the folder where the .deb file is located and run the following command: + $ sudo rpm -i libobasis7.6-en-US-help-7.6.4.1-1.x86_64.rpm + After installation, restart %PRODUCTNAME to be able to use the built-in help. + + Installing from Third-party Repositories + Linux distributions usually provide their own %PRODUCTNAME packages, hence the method to install the built-in help will be different for each distribution. + Next are the installation instructions for help packages provided by Ubuntu and Fedora. + Ubuntu-based Distributions + Open the
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dd4a780280f2e92df381cb640e8897fe9c475a1a Author: Rafael Lima AuthorDate: Tue Dec 12 17:33:14 2023 +0100 Commit: Gerrit Code Review CommitDate: Tue Dec 12 17:33:14 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 9f962542a607ae8cf7beddae2e4eb8db0a7e - Improve sentence on SF_Dataset help page This patch improves a sentence following a suggestion in Weblate. Change-Id: Iff1574d6a960daf6c29cdf67ccee3df1d6a6f29e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160575 Tested-by: Jenkins Reviewed-by: Rafael Lima (cherry picked from commit 53a2884e42a11e02e747aba28a57563a68e1c1c5) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160633 Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 564667de83a4..9f962542 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 564667de83a40fa53b6dfdbfe3d4e02b81f76d83 +Subproject commit 9f962542a607ae8cf7beddae2e4eb8db0a7e
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_dataset.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9f962542a607ae8cf7beddae2e4eb8db0a7e Author: Rafael Lima AuthorDate: Mon Dec 11 11:59:38 2023 +0100 Commit: Olivier Hallot CommitDate: Tue Dec 12 17:33:13 2023 +0100 Improve sentence on SF_Dataset help page This patch improves a sentence following a suggestion in Weblate. Change-Id: Iff1574d6a960daf6c29cdf67ccee3df1d6a6f29e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160575 Tested-by: Jenkins Reviewed-by: Rafael Lima (cherry picked from commit 53a2884e42a11e02e747aba28a57563a68e1c1c5) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160633 Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp b/source/text/sbasic/shared/03/sf_dataset.xhp index 112a21dbbc..47158a535e 100644 --- a/source/text/sbasic/shared/03/sf_dataset.xhp +++ b/source/text/sbasic/shared/03/sf_dataset.xhp @@ -474,7 +474,7 @@ header: Set this argument to True to make the first entry in the Array contain the column headers (Default = False). -maxrows: Define the maximum number of records to be returned. If the number of existing records is smaller than maxrows, then the returned array will have only the existing records. Leave this argument blank or set it to zero to return all rows in the dataset (Default = 0) +maxrows: Defines the maximum number of records to be returned. If the number of existing records is smaller than maxrows, then the size of the returned array will be equal to the number of remaining records in the dataset. Leave this argument blank or set it to zero to return all rows in the dataset (Default = 0) The following example reads a dataset in chunks of 100 rows until all the dataset has been read.
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 890effa901a1406161d80acce8c3e7209ea78989 Author: Rafael Lima AuthorDate: Tue Dec 12 13:53:45 2023 +0100 Commit: Gerrit Code Review CommitDate: Tue Dec 12 13:53:45 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 53a2884e42a11e02e747aba28a57563a68e1c1c5 - Improve sentence on SF_Dataset help page This patch improves a sentence following a suggestion in Weblate. Change-Id: Iff1574d6a960daf6c29cdf67ccee3df1d6a6f29e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160575 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index c487633e8463..53a2884e42a1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c487633e84637e8b71bb92001f16a2ff4051c11c +Subproject commit 53a2884e42a11e02e747aba28a57563a68e1c1c5
help.git: source/text
source/text/sbasic/shared/03/sf_dataset.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53a2884e42a11e02e747aba28a57563a68e1c1c5 Author: Rafael Lima AuthorDate: Mon Dec 11 11:59:38 2023 +0100 Commit: Olivier Hallot CommitDate: Tue Dec 12 13:53:45 2023 +0100 Improve sentence on SF_Dataset help page This patch improves a sentence following a suggestion in Weblate. Change-Id: Iff1574d6a960daf6c29cdf67ccee3df1d6a6f29e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160575 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp b/source/text/sbasic/shared/03/sf_dataset.xhp index 112a21dbbc..47158a535e 100644 --- a/source/text/sbasic/shared/03/sf_dataset.xhp +++ b/source/text/sbasic/shared/03/sf_dataset.xhp @@ -474,7 +474,7 @@ header: Set this argument to True to make the first entry in the Array contain the column headers (Default = False). -maxrows: Define the maximum number of records to be returned. If the number of existing records is smaller than maxrows, then the returned array will have only the existing records. Leave this argument blank or set it to zero to return all rows in the dataset (Default = 0) +maxrows: Defines the maximum number of records to be returned. If the number of existing records is smaller than maxrows, then the size of the returned array will be equal to the number of remaining records in the dataset. Leave this argument blank or set it to zero to return all rows in the dataset (Default = 0) The following example reads a dataset in chunks of 100 rows until all the dataset has been read.
core.git: Branch 'libreoffice-24-2' - wizards/source
wizards/source/scriptforge/po/pt.po | 103 +--- 1 file changed, 96 insertions(+), 7 deletions(-) New commits: commit c3d4d56c37f1fc8448c4a1a69b6e39442fd36cfe Author: Rafael Lima AuthorDate: Wed Dec 6 15:11:24 2023 +0100 Commit: Xisco Fauli CommitDate: Mon Dec 11 14:03:55 2023 +0100 Update Portuguese translation of ScriptForge Change-Id: Ic16b782d63e84581134f2238454aa9599819f146 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160359 Tested-by: Jenkins Reviewed-by: Rafael Lima (cherry picked from commit b5526d4e95a465bee9fc810794570023f2a76ca5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160488 Reviewed-by: Xisco Fauli diff --git a/wizards/source/scriptforge/po/pt.po b/wizards/source/scriptforge/po/pt.po index f1d7ae9f0e57..aa4f5d5cfac6 100644 --- a/wizards/source/scriptforge/po/pt.po +++ b/wizards/source/scriptforge/po/pt.po @@ -7,7 +7,7 @@ # *** are part of the LibreOffice project. *** # * # -# ScriptForge Release 7.6 +# ScriptForge Release 24.2 # --- # msgid "" @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?; "product=LibreOffice_status=UNCONFIRMED=UI\n" -"POT-Creation-Date: 2021-06-19 16:57:15\n" -"PO-Revision-Date: 2022-08-03 18:30-0300\n" +"POT-Creation-Date: 2023-09-03 13:05:04\n" +"PO-Revision-Date: 2023-12-06 11:18-0300\n" "Language-Team: pt-BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1226,13 +1226,11 @@ msgctxt "DUPLICATECONTROL" msgid "" "A control with the same name exists already in the dialog '%3'.\n" "\n" -"« %1 » = %2\n" -"" +"« %1 » = %2" msgstr "" "Um controle com o mesmo nome já existe na caixa de diálogo '%3'.\n" "\n" -"« %1 » = %2\n" -"" +"« %1 » = %2" #. SF_Database when running update SQL statement #. %1: The concerned method @@ -1262,6 +1260,97 @@ msgstr "" "\n" "Instrução SQL : « %1 »" +#. SF_Database can't interpret SQL statement +#. %1: The statement +#. %2: a WHERE clause +#. %3: a ORDER BY clause +#, kde-format +msgctxt "SQLSYNTAX2" +msgid "" +"An SQL statement could not be interpreted or executed by the " +"database system.\n" +"Check its syntax, table and/or field names, ...\n" +"\n" +"SQL Statement : « %1 »\n" +"combined with\n" +"« %2 »\n" +"« %3 »" +msgstr "" +"Uma instrução SQL não pôde ser interpretada ou executada pelo " +"sistema de banco de dados.\n" +"Verifique a sintaxe, nomes de tabelas e/ou nomes dos campos, ...\n" +"\n" +"Instrução SQL : « %1 »\n" +"combinada com\n" +"« %2 »\n" +"« %3 »" + +#. SF_Dataset can't read field values or store field updates +msgctxt "NOCURRENTRECORD" +msgid "" +"A database record could not be retrieved, inserted or updated by the " +"database system.\n" +"The current record could not be determined." +msgstr "" +"Um registro do banco de dados não pôde ser recuperado, inserido ou " +"atualizado pelo sistema de banco de dados.\n" +"O registro atual não pôde ser determinado." + +#. SF_Database can't store field updates +#. %1: The field name +#. %2: the value to store in the field +#, kde-format +msgctxt "RECORDUPDATE" +msgid "" +"A database record could not be inserted or updated by the database " +"system.\n" +"Possible reasons:\n" +"- the field is not updatable\n" +"- a [NULL] value is provided which is forbidden for the field\n" +"- the type of value and the type of field are incompatible\n" +"- the input binary file does not exist or is empty\n" +"- the field type is not supported\n" +"\n" +"Field name : « %1 »\n" +"Field value : « %2 »\n" +"Field type : « %3 »" +msgstr "" +"Um registro do banco de dados não pôde ser inserido ou atualizado " +"pelo sistema de banco de dados.\n" +"Possíveis motivos:\n" +"- o campo não é atualizável\n" +"- um valor [NULL] foi fornecido, mas não é permitido para o campo\n" +"- o tipo do valor e o tipo do campo não são compatíveis\n" +"- o arquivo binário de entrada não existe ou está vazio\n" +"- o tipo do campo não é suportado\n" +"\n" +"Nome do campo : « %1 »\n" +"Valor do campo : « %2 »\n" +"Tipo do campo : « %3 »" + +#. SF_Dataset.ExportToFile error message +#. %1: An identifier +#. %2: A file name +#. %3: An identifier +#. %4: True or False +#. +#, kde-format +msgctxt "FIELDEXPORT" +msgid "" +"The database field could not be exported.\n" +"Either the destination file must not be overwritten, or it has a " +"read-only attribute set.\n" +"\n" +"%1 = '%2'\n" +"%3 = %4" +msgstr "" +"O campo do banco de dados não pôde ser exportado.\n" +"O arquivo de destino não pode ser sobrescrito, ou o arquivo está " +"definido como somente leitura.\n" +"\n" +"%1 = '%2'\n" +"%3 = %4" + #. SF_Exception.PythonShell error messageAPSO: to leave unchanged msgctxt "PYTHONSHELL" msgid ""
core.git: wizards/source
wizards/source/scriptforge/po/pt.po | 103 +--- 1 file changed, 96 insertions(+), 7 deletions(-) New commits: commit b5526d4e95a465bee9fc810794570023f2a76ca5 Author: Rafael Lima AuthorDate: Wed Dec 6 15:11:24 2023 +0100 Commit: Rafael Lima CommitDate: Sun Dec 10 19:06:41 2023 +0100 Update Portuguese translation of ScriptForge Change-Id: Ic16b782d63e84581134f2238454aa9599819f146 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160359 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/wizards/source/scriptforge/po/pt.po b/wizards/source/scriptforge/po/pt.po index f1d7ae9f0e57..aa4f5d5cfac6 100644 --- a/wizards/source/scriptforge/po/pt.po +++ b/wizards/source/scriptforge/po/pt.po @@ -7,7 +7,7 @@ # *** are part of the LibreOffice project. *** # * # -# ScriptForge Release 7.6 +# ScriptForge Release 24.2 # --- # msgid "" @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?; "product=LibreOffice_status=UNCONFIRMED=UI\n" -"POT-Creation-Date: 2021-06-19 16:57:15\n" -"PO-Revision-Date: 2022-08-03 18:30-0300\n" +"POT-Creation-Date: 2023-09-03 13:05:04\n" +"PO-Revision-Date: 2023-12-06 11:18-0300\n" "Language-Team: pt-BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1226,13 +1226,11 @@ msgctxt "DUPLICATECONTROL" msgid "" "A control with the same name exists already in the dialog '%3'.\n" "\n" -"« %1 » = %2\n" -"" +"« %1 » = %2" msgstr "" "Um controle com o mesmo nome já existe na caixa de diálogo '%3'.\n" "\n" -"« %1 » = %2\n" -"" +"« %1 » = %2" #. SF_Database when running update SQL statement #. %1: The concerned method @@ -1262,6 +1260,97 @@ msgstr "" "\n" "Instrução SQL : « %1 »" +#. SF_Database can't interpret SQL statement +#. %1: The statement +#. %2: a WHERE clause +#. %3: a ORDER BY clause +#, kde-format +msgctxt "SQLSYNTAX2" +msgid "" +"An SQL statement could not be interpreted or executed by the " +"database system.\n" +"Check its syntax, table and/or field names, ...\n" +"\n" +"SQL Statement : « %1 »\n" +"combined with\n" +"« %2 »\n" +"« %3 »" +msgstr "" +"Uma instrução SQL não pôde ser interpretada ou executada pelo " +"sistema de banco de dados.\n" +"Verifique a sintaxe, nomes de tabelas e/ou nomes dos campos, ...\n" +"\n" +"Instrução SQL : « %1 »\n" +"combinada com\n" +"« %2 »\n" +"« %3 »" + +#. SF_Dataset can't read field values or store field updates +msgctxt "NOCURRENTRECORD" +msgid "" +"A database record could not be retrieved, inserted or updated by the " +"database system.\n" +"The current record could not be determined." +msgstr "" +"Um registro do banco de dados não pôde ser recuperado, inserido ou " +"atualizado pelo sistema de banco de dados.\n" +"O registro atual não pôde ser determinado." + +#. SF_Database can't store field updates +#. %1: The field name +#. %2: the value to store in the field +#, kde-format +msgctxt "RECORDUPDATE" +msgid "" +"A database record could not be inserted or updated by the database " +"system.\n" +"Possible reasons:\n" +"- the field is not updatable\n" +"- a [NULL] value is provided which is forbidden for the field\n" +"- the type of value and the type of field are incompatible\n" +"- the input binary file does not exist or is empty\n" +"- the field type is not supported\n" +"\n" +"Field name : « %1 »\n" +"Field value : « %2 »\n" +"Field type : « %3 »" +msgstr "" +"Um registro do banco de dados não pôde ser inserido ou atualizado " +"pelo sistema de banco de dados.\n" +"Possíveis motivos:\n" +"- o campo não é atualizável\n" +"- um valor [NULL] foi fornecido, mas não é permitido para o campo\n" +"- o tipo do valor e o tipo do campo não são compatíveis\n" +"- o arquivo binário de entrada não existe ou está vazio\n" +"- o tipo do campo não é suportado\n" +"\n" +"Nome do campo : « %1 »\n" +"Valor do campo : « %2 »\n" +"Tipo do campo : « %3 »" + +#. SF_Dataset.ExportToFile error message +#. %1: An identifier +#. %2: A file name +#. %3: An identifier +#. %4: True or False +#. +#, kde-format +msgctxt "FIELDEXPORT" +msgid "" +"The database field could not be exported.\n" +"Either the destination file must not be overwritten, or it has a " +"read-only attribute set.\n" +"\n" +"%1 = '%2'\n" +"%3 = %4" +msgstr "" +"O campo do banco de dados não pôde ser exportado.\n" +"O arquivo de destino não pode ser sobrescrito, ou o arquivo está " +"definido como somente leitura.\n" +"\n" +"%1 = '%2'\n" +"%3 = %4" + #. SF_Exception.PythonShell error messageAPSO: to leave unchanged msgctxt "PYTHONSHELL" msgid ""
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f17c6385fbff08ec72eab3fde6121c488bc1149 Author: Rafael Lima AuthorDate: Sun Dec 3 22:09:37 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 3 22:09:37 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 7829aba61ee098e59768600c532c8a31cf25ee34 - Document SF Database transaction handling methods Change-Id: Id5eadea4d55cfba1b240967f76096142af04d00e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160174 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index c099ceeaf1cb..7829aba61ee0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c099ceeaf1cb4651bbca712ba19d16ee4206ab0f +Subproject commit 7829aba61ee098e59768600c532c8a31cf25ee34
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_database.xhp | 202 ++-
1 file changed, 200 insertions(+), 2 deletions(-)
New commits:
commit 7829aba61ee098e59768600c532c8a31cf25ee34
Author: Rafael Lima
AuthorDate: Fri Dec 1 21:08:22 2023 +0100
Commit: Rafael Lima
CommitDate: Sun Dec 3 22:09:36 2023 +0100
Document SF Database transaction handling methods
Change-Id: Id5eadea4d55cfba1b240967f76096142af04d00e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160174
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/source/text/sbasic/shared/03/sf_database.xhp
b/source/text/sbasic/shared/03/sf_database.xhp
index feaac92aa4..cc2ae5c00a 100644
--- a/source/text/sbasic/shared/03/sf_database.xhp
+++ b/source/text/sbasic/shared/03/sf_database.xhp
@@ -44,6 +44,90 @@
The provided interfaces include simple tables and queries
lists, as well as access to database data.
To make SQL statements
more readable, you may use square brackets "[ ]" to enclose names of tables,
queries and fields instead of using other enclosing characters that may be
exclusive to certain Relational Database Management Systems (RDBMS). But beware
that enclosing characters are mandatory in this context.
+
+Transaction handling
+
+ Database service; Transaction handling
+
+By default the
database handles transactions in auto-commit mode, meaning that a commit is
done after every SQL statement.
+Use the
SetTransactionMode method to change the default behavior,
which allows for manual commits and rollbacks.
+The methods
Commit and Rollback are used to delimit
transactions.
+In %PRODUCTNAME,
there are five types of transaction isolation modes, as defined in the https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1sdbc_1_1TransactionIsolation.html;>com.sun.star.sdbc.TransactionIsolation
constant group:
+
+
+
+
+Constant
+
+
+Value
+
+
+Interpretation
+
+
+
+
+NONE
+
+
+0
+
+
+Transaction
handling is disabled and the database is set to the default auto-commit
mode.
+
+
+
+
+READ_UNCOMMITTED
+
+
+1
+
+
+Dirty reads,
non-repeatable reads and phantom reads can occur.
+If a row is
changed by a transaction, another transaction will be able to read these
changes even if they have not been committed.
+
+
+
+
+READ_COMMITTED
+
+
+2
+
+
+Dirty reads
are prevented, however non-repeatable reads and phantom reads can
occur.
+This level
prevents that rows with uncommitted changes are read.
+
+
+
+
+REPEATABLE_READ
+
+
+4
+
+
+Dirty reads
and non-repeatable reads are prevented. However, phantom reads can
occur.
+Besides
preventing uncommitted data from being read, it also prevents that two read
operations in the same transaction return different results.
+
+
+
+
+SERIALIZABLE
+
+
+8
+
+
+Dirty reads,
non-repeatable reads and phantom reads are prevented.
+In addition
to the constraints of the previous level, it also ensures that the set of
records that match a WHERE clause remains unchanged inside
the same transaction.
+
+
+
+ Read the Wikipedia page on https://en.wikipedia.org/wiki/Isolation_(database_systems)">Isolation in
Database Systems to learn more about transaction integrity.
+
Service invocation
Before using the
Database service the ScriptForge library
needs to be loaded or imported:
@@ -193,6 +277,7 @@
CloseDatabase
+ Commit
CreateDataset
DAvg
DCount
@@ -206,14 +291,16 @@
DLookup
GetRows
OpenFormDocument
+ OpenQuery
- OpenQuery
OpenSql
OpenTable
- RunSql
+ Rollback
+ RunSql
+ SetTransactionMode
@@ -240,6 +327,49 @@
+
+ Commit
-
+
+ Database Service;Commit
+
+Commit
+Commits all updates
done since the previous Commit or
Rollback call.
+This method is ignored if commits are
done automatically after each SQL statement, i.e. the database is set to the
default auto-commit mode.
+
+
+ db.Commit()
+
+
+
+
+ ' Set the
REPEATABLE_READ transaction level
+ myDB.SetTransactionMode(4)
+ myDB.RunSql("UPDATE ...")
+ myDB.Commit()
+ myDB.RunSql("DELETE ...")
+ ' Test some
condition before commiting
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e8f3caea8c0e97b6bfd0a269568d621b2cfb3b72 Author: Rafael Lima AuthorDate: Fri Dec 1 21:07:50 2023 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 1 21:07:50 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3d13c05329657af7015c298220855c4fddabd73d - Document new SF IncludeSubfolders argument Change-Id: I360b504446185870e8ea89843e834006f56e2af8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160041 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index 00f8970a292d..3d13c0532965 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 00f8970a292d6876c29f2d2d4ca7958d832743e9 +Subproject commit 3d13c05329657af7015c298220855c4fddabd73d
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_filesystem.xhp | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 3d13c05329657af7015c298220855c4fddabd73d
Author: Rafael Lima
AuthorDate: Thu Nov 30 00:57:10 2023 +0100
Commit: Rafael Lima
CommitDate: Fri Dec 1 21:07:50 2023 +0100
Document new SF IncludeSubfolders argument
Change-Id: I360b504446185870e8ea89843e834006f56e2af8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160041
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/source/text/sbasic/shared/03/sf_filesystem.xhp
b/source/text/sbasic/shared/03/sf_filesystem.xhp
index 9c5e7cc50f..b05ca4fef1 100644
--- a/source/text/sbasic/shared/03/sf_filesystem.xhp
+++ b/source/text/sbasic/shared/03/sf_filesystem.xhp
@@ -712,17 +712,19 @@
The resulting list
may be filtered with wildcards.
- svc.Files(foldername: str, filter: str = ''): str[0..*]
+ svc.Files(foldername: str, filter: str = '', includesubfolders:
bool = False): str[0..*]
foldername: A string representing a
folder. The folder must exist. This argument must not designate a
file.
filter: A string containing wildcards ("?" and
"*") that will be applied to the resulting list of files (default =
"").
+includesubfolders: Set this argument to
True to include the contents of subfolders (Default =
False).
Dim filesList As Variant, file As String
FSO.FileNaming = "SYS"
- filesList = FSO.Files("/home/user/",
"*.txt")
+ ' Returns all files
matching the "*.txt" filter, including files in subfolders
+ filesList = FSO.Files("/home/user/", "*.txt",
IncludeSubfolders := True)
For Each file In filesList
' ...
Next file
@@ -730,7 +732,7 @@
fs.FileNaming = "SYS"
- filesList = fs.Files("/home/user/",
"*.txt")
+ filesList = fs.Files("/home/user/", "*.txt",
includesubfolders = True)
for
file in fileList:
# ...
@@ -1197,11 +1199,12 @@
The list may be
filtered with wildcards.
- svc.SubFolders(foldername: str, filter: str = ''):
str[0..*]
+ svc.SubFolders(foldername: str, filter: str = '',
includesubfolders: bool = False): str[0..*]
foldername: A string representing a
folder. The folder must exist. foldername must not designate
a file.
filter: A string containing wildcards ("?" and
"*") that will be applied to the resulting list of folders (default =
"").
+ includesubfolders: Set this argument to
True to include the contents of subfolders (Default =
False).
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f93d70698220c9c1a16f470127d058f16e02440b Author: Rafael Lima AuthorDate: Fri Dec 1 14:51:21 2023 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 1 14:51:21 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to cd2824ba5ee24accdeffea3518bd89cc194ed189 - Document new SF Dataset service Change-Id: I4e6a792f2cbcbf826f51f5d62e6dad855d4a0bf0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160035 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index 6c2b0a0e7c74..cd2824ba5ee2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6c2b0a0e7c74c629ee248244fbf083314e076bd8 +Subproject commit cd2824ba5ee24accdeffea3518bd89cc194ed189
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk|1
source/auxiliary/sbasic.tree |1
source/text/sbasic/shared/03/lib_ScriptForge.xhp |8
source/text/sbasic/shared/03/sf_database.xhp | 34 +
source/text/sbasic/shared/03/sf_dataset.xhp | 703 +++
source/text/sbasic/shared/03/sf_toc.xhp | 40 +
6 files changed, 783 insertions(+), 4 deletions(-)
New commits:
commit cd2824ba5ee24accdeffea3518bd89cc194ed189
Author: Rafael Lima
AuthorDate: Wed Nov 29 14:48:04 2023 +0100
Commit: Rafael Lima
CommitDate: Fri Dec 1 14:51:21 2023 +0100
Document new SF Dataset service
Change-Id: I4e6a792f2cbcbf826f51f5d62e6dad855d4a0bf0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160035
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index d32336e7a3..8f89b33ffb 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
helpcontent2/source/text/sbasic/shared/03/sf_calc \
helpcontent2/source/text/sbasic/shared/03/sf_chart \
helpcontent2/source/text/sbasic/shared/03/sf_database \
+helpcontent2/source/text/sbasic/shared/03/sf_dataset \
helpcontent2/source/text/sbasic/shared/03/sf_datasheet \
helpcontent2/source/text/sbasic/shared/03/sf_dialog \
helpcontent2/source/text/sbasic/shared/03/sf_dialogcontrol \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 9d02967080..4ae26d4b4b 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -356,6 +356,7 @@
Calc
service
Chart
service
Database
service
+Dataset
service
Datasheet service
Dialog
service
DialogControl
service
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 7b978e89a5..9076514fae 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -98,14 +98,15 @@
Database
+ Dataset
Datasheet
- Document
+ Document
FormDocument
- Writer
+ Writer
@@ -179,6 +180,9 @@
+
+
+
diff --git a/source/text/sbasic/shared/03/sf_database.xhp
b/source/text/sbasic/shared/03/sf_database.xhp
index 5f8578c242..feaac92aa4 100644
--- a/source/text/sbasic/shared/03/sf_database.xhp
+++ b/source/text/sbasic/shared/03/sf_database.xhp
@@ -193,18 +193,19 @@
CloseDatabase
+ CreateDataset
DAvg
DCount
DMin
- DMax
+ DMax
DSum
DLookup
GetRows
- OpenFormDocument
+ OpenFormDocument
@@ -239,6 +240,34 @@
+
+ CreateDataset
--
+
+ Database Service;CreateDataset
+
+CreateDataset
+Creates a
Dataset service instance based on a table, query or SQL
SELECT statement.
+
+
+ db.CreateDataset(sqlcommand: str, opt directsql: bool, opt
filter: str, opt orderby: str): svc
+
+
+sqlcommand: A table name, a query name
or a valid SQL SELECT statement. Identifiers may be enclosed
with square brackets. This argument is case-sensitive.
+directsql: Set this argument to
True to send the statement directly to the database engine
without preprocessing by %PRODUCTNAME (Default =
False).
+filter: Specifies the condition that
records must match to be included in the returned dataset. This argument is
expressed as a SQL WHERE statement without the "WHERE"
keyword.
+orderby: Specifies the ordering of the
dataset as a SQL ORDER BY statement without the "ORDER BY"
keyword.
+
+The following
examples in Basic and Python return a dataset with the records of a table named
"Customers".
+
+
+ oDataset =
myDatabase.CreateDataset("Customers", Filter := "[Name] LIKE 'A'")
+
+
+
+ dataset =
myDatabase.CreateDataset("Customers", Filter = "[Name] LIKE 'A'")
+
+
+
DFunctions
---
@@ -514,6 +543,7 @@
+
diff --git a/source/text/sbasic/shared/03/sf_dataset.xhp
b/source/text/sbasic/shared/03/sf_dataset.xhp
new file mode 100644
index 00..82171d2c28
--- /dev/null
+++ b/source/text/sbasic/shared/03/sf_dataset.xhp
@@ -0,0 +1,703 @@
+
+
+
+
+
+
+SFDatabases.Dataset service
+/text/sbasic/shared/03/sf_dataset.xhp
+
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk |2 source/auxiliary/sbasic.tree |2 source/text/sbasic/shared/03/lib_ScriptForge.xhp | 14 source/text/sbasic/shared/03/sf_toc.xhp | 69 source/text/sbasic/shared/03/sf_toolbar.xhp | 261 source/text/sbasic/shared/03/sf_toolbarbutton.xhp | 345 ++ 6 files changed, 690 insertions(+), 3 deletions(-) New commits: commit 751a65e5be60a35ae970b3a66b2038d90ea580e4 Author: Rafael Lima AuthorDate: Sun Nov 26 17:02:19 2023 +0100 Commit: Jean-Pierre Ledure CommitDate: Tue Nov 28 15:45:43 2023 +0100 Document SF Toolbar and ToolbarButton services Change-Id: I57df3b88660198d2432ff73ef1b37025e1b893a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/159902 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Rafael Lima diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 8b7719e2b3..d32336e7a3 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -109,6 +109,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/03/sf_textstream \ helpcontent2/source/text/sbasic/shared/03/sf_timer \ helpcontent2/source/text/sbasic/shared/03/sf_toc \ +helpcontent2/source/text/sbasic/shared/03/sf_toolbar \ +helpcontent2/source/text/sbasic/shared/03/sf_toolbarbutton \ helpcontent2/source/text/sbasic/shared/03/sf_ui \ helpcontent2/source/text/sbasic/shared/03/sf_unittest \ helpcontent2/source/text/sbasic/shared/03/sf_writer \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 8371609dc9..9d02967080 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -376,6 +376,8 @@ String service TextStream service Timer service +Toolbar service +ToolbarButton service UI service UnitTest service Writer service diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp b/source/text/sbasic/shared/03/lib_ScriptForge.xhp index af306b184a..7b978e89a5 100644 --- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp +++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp @@ -123,13 +123,15 @@ FormControl - Menu + Menu + PopupMenu - PopupMenu - UI + Toolbar + ToolbarButton + UI @@ -237,6 +239,12 @@ + + + + + + diff --git a/source/text/sbasic/shared/03/sf_toc.xhp b/source/text/sbasic/shared/03/sf_toc.xhp index 849cb5829e..8255b37e30 100644 --- a/source/text/sbasic/shared/03/sf_toc.xhp +++ b/source/text/sbasic/shared/03/sf_toc.xhp @@ -925,6 +925,75 @@ + ScriptForge.Toolbar service + + + + + + List of Properties in the Toolbar Service + + + + + +BuiltIn +Docked +HasGlobalScope + + + + +Name +ResourceURL + + + + +Visible +XUIElement + + + + + + + ScriptForge.ToolbarButton service + + + + + + List of Properties in the ToolbarButton Service + + + + + +Caption +Height +Index +OnClick + + + + +Parent +TipText +Visible + + + + +Width +X +Y + + + + + + ScriptForge.UI service diff --git a/source/text/sbasic/shared/03/sf_toolbar.xhp b/source/text/sbasic/shared/03/sf_toolbar.xhp new file mode 100644 index 00..a5e19d6707 --- /dev/null +++ b/source/text/sbasic/shared/03/sf_toolbar.xhp @@ -0,0 +1,261 @@ + + + + + + +SFWidgets.Toolbar service +/text/sbasic/shared/03/sf_toolbar.xhp + + + + + + + Toolbar service + + + + +SFWidgets.Toolbar service +The Toolbar service allows to retrieve information related to the toolbars available for a specific document window. With this service it is possible to: + + +Toggle the visibility of specific toolbars. + + +Access information about the buttons available in each toolbar. + + + + Each %PRODUCTNAME application has its own set of available toolbars. This service handles both built-in and custom toolbars. + The status bar and the menu bar are not considered toolbars in the context of this service. + + Service invocation + Before using the Toolbar service the
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee161b9e484efd6e25c8b4d65071a93eeab4b1c2 Author: Rafael Lima AuthorDate: Tue Nov 28 15:45:43 2023 +0100 Commit: Gerrit Code Review CommitDate: Tue Nov 28 15:45:43 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 751a65e5be60a35ae970b3a66b2038d90ea580e4 - Document SF Toolbar and ToolbarButton services Change-Id: I57df3b88660198d2432ff73ef1b37025e1b893a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/159902 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index df97eb056605..751a65e5be60 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit df97eb056605af65df8f2b3935285b27b27c21ad +Subproject commit 751a65e5be60a35ae970b3a66b2038d90ea580e4
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2748f9099fe8a570924e3dfa9ce6322fa78aa167 Author: Rafael Lima AuthorDate: Fri Oct 27 15:41:30 2023 +0100 Commit: Gerrit Code Review CommitDate: Fri Oct 27 16:41:30 2023 +0200 Update git submodules * Update helpcontent2 from branch 'distro/collabora/co-22.05' to 7b180746e7c683af56d9e81015c88c08f7895141 - tdf#144332 Fix HID for Accessibility Check Change-Id: I9789043afbe17bc6eab6fd7bc3f664409d5effda Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127779 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a56914cfff5d..7b180746e7c6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a56914cfff5dd9f436fc05c51d8a03726efe01c1 +Subproject commit 7b180746e7c683af56d9e81015c88c08f7895141
[Libreoffice-commits] help.git: Branch 'distro/collabora/co-22.05' - source/text
source/text/swriter/01/accessibility_check.xhp |1 + 1 file changed, 1 insertion(+) New commits: commit 7b180746e7c683af56d9e81015c88c08f7895141 Author: Rafael Lima AuthorDate: Mon Jan 3 15:32:14 2022 +0100 Commit: Andras Timar CommitDate: Fri Oct 27 16:41:23 2023 +0200 tdf#144332 Fix HID for Accessibility Check Change-Id: I9789043afbe17bc6eab6fd7bc3f664409d5effda Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127779 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/01/accessibility_check.xhp b/source/text/swriter/01/accessibility_check.xhp index 10c4dc8823..0decc3f4d3 100644 --- a/source/text/swriter/01/accessibility_check.xhp +++ b/source/text/swriter/01/accessibility_check.xhp @@ -21,6 +21,7 @@ PDF/UA;check + Accessibility Check Review common accessibility problems in the document, and support for PDF/UA specifications in the PDF export dialog.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sc/inc sc/qa sc/source
sc/inc/document.hxx|2 ++
sc/inc/table.hxx |4
sc/qa/unit/data/ods/tdf157318.ods |binary
sc/qa/unit/subsequent_export_test4.cxx | 23 +--
sc/source/core/data/document.cxx |6 ++
sc/source/core/data/table1.cxx | 20
sc/source/filter/excel/xename.cxx |5 -
sc/source/ui/view/viewfun2.cxx |3 +++
8 files changed, 56 insertions(+), 7 deletions(-)
New commits:
commit 9395171aa8641341316f87e2537dcdfa3df4ef78
Author: Rafael Lima
AuthorDate: Mon Oct 2 00:13:57 2023 +0200
Commit: László Németh
CommitDate: Tue Oct 17 14:36:04 2023 +0200
tdf#100034 tdf#157318 XLSX export: fix lost named ranges associated to
sheets
The original fix for tdf#100034 (see commit [1]) consisted of explicitly
not exporting to XLSX named ranges that are not built-in. This has a
side-effect that user-defined named ranges associated with sheets are also not
exported to XLSX. Hence, if the user creates a named range linked to a sheet
and saves the file to XLSX, the named range is not exported (which is the issue
reported in tdf#157318).
This patch implements a new fix for tdf#100034, reverting the previous
fix. When the Print Ranges are cleared by the user, the associated named
ranges are also cleared, thus fixing the original problem.
This new fix has the advantage that user-defined named ranges linked to
sheets are again exported to XLSX files.
Regression from commit 639519dc2bad058197b6ff73c9e3df622f979f97
"tdf#100034: Fix to persistently remove print-range".
References:
[1] 639519dc2bad058197b6ff73c9e3df622f979f97
Change-Id: Ic3b84365a6086e96f60b222cd6337991ac90f483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157455
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit e13683b9d94f34a5c38bd2376eae8daeb9e57283)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157716
Tested-by: Jenkins
Reviewed-by: Rafael Lima
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 875c2489a14e..87defb0eafd0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2117,6 +2117,8 @@ public:
SC_DLLPUBLIC voidClearPrintRanges( SCTAB nTab );
/** Adds a new print ranges. */
SC_DLLPUBLIC voidAddPrintRange( SCTAB nTab, const ScRange&
rNew );
+// Removes all named ranges used for print ranges in a given tab
+SC_DLLPUBLIC voidClearPrintNamedRanges( SCTAB nTab );
/** Marks the specified sheet to be printed completely. Deletes old print
ranges on the sheet! */
SC_DLLPUBLIC voidSetPrintEntireSheet( SCTAB nTab );
SC_DLLPUBLIC voidSetRepeatColRange( SCTAB nTab,
std::optional oNew );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0662053cb89c..780d122ce47e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -830,6 +830,10 @@ public:
voidClearPrintRanges();
/** Adds a new print ranges. */
voidAddPrintRange( const ScRange& rNew );
+
+// Removes all named ranges used for print ranges
+voidClearPrintNamedRanges();
+
/** Marks the specified sheet to be printed completely. Deletes old print
ranges! */
voidSetPrintEntireSheet();
diff --git a/sc/qa/unit/data/ods/tdf157318.ods
b/sc/qa/unit/data/ods/tdf157318.ods
new file mode 100644
index ..6d17dc1ceb48
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf157318.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 74313ef67c27..f12d40727441 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1712,8 +1712,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf100034)
createScDoc("xlsx/tdf100034.xlsx");
ScDocument* pDoc = getScDoc();
-// Clear print ranges
-pDoc->ClearPrintRanges(0);
+// Clear print ranges (Format - Print Ranges - Clear)
+dispatchCommand(mxComponent, ".uno:DeletePrintArea", {});
// Save and load back
saveAndReload("Calc Office Open XML");
@@ -1723,6 +1723,25 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf100034)
CPPUNIT_ASSERT_EQUAL(static_cast(0),
pDoc->GetPrintRangeCount(0));
}
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf157318)
+{
+// This document has 2 named ranges; Test1 is global; Test2 is linked to
Sheet1)
+createScDoc("ods/tdf157318.ods");
+ScDocument* pDoc = getScDoc();
+
+// Save as XLSX and load back
+saveAndReload("Calc Office Open XML");
+pDoc = getScDoc();
+
+// Check if there is one global named range
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+
static_cast(pDoc->GetRangeName()->size()));
+
+// Check if there is one named range in the first sheet
+
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/table.hxx |4
sc/qa/unit/data/ods/tdf156815.ods |binary
sc/qa/unit/ucalc_solver.cxx | 33 +
sc/source/core/data/document.cxx |5 +
sc/source/ui/inc/docfunc.hxx |2 +-
5 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit cb46ad4c4602fbb6aeab482e9370e31495e12cfe
Author: Rafael Lima
AuthorDate: Tue Sep 12 19:17:47 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Oct 11 00:05:52 2023 +0200
tdf#156815 Reset solver settings when a sheet is renamed
When a sheet is renamed, the SolverSettings object needs to be reset so
that the updated references of the named ranges are reloaded the next time the
Solver dialog is opened.
Change-Id: I8d501bb5b52f6a69bc899a62863893744d80dc69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156872
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 34e0f9d27784..68b4c614c68b 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -451,6 +451,10 @@ public:
SC_DLLPUBLIC std::shared_ptr GetSolverSettings();
+// tdf#156815 Sets the solver settings object to nullptr to force
reloading Solver settings the
+// next time the dialog is opened. This is required when sheets are renamed
+void ResetSolverSettings() { m_pSolverSettings.reset(); }
+
/**
* Takes ownership of pCell
*
diff --git a/sc/qa/unit/data/ods/tdf156815.ods
b/sc/qa/unit/data/ods/tdf156815.ods
new file mode 100644
index ..cc797ee8619b
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf156815.ods differ
diff --git a/sc/qa/unit/ucalc_solver.cxx b/sc/qa/unit/ucalc_solver.cxx
index 7a8d76cc7534..47770ec0c0e5 100644
--- a/sc/qa/unit/ucalc_solver.cxx
+++ b/sc/qa/unit/ucalc_solver.cxx
@@ -10,6 +10,7 @@
#include
#include "helper/qahelper.hxx"
#include
+#include
#include
#include
@@ -130,4 +131,36 @@ CPPUNIT_TEST_FIXTURE(SolverTest, testSingleModel)
TestConstraintsModelA(pSettings.get());
}
+// Tests if references remain valid after a sheet is renamed
+CPPUNIT_TEST_FIXTURE(SolverTest, tdf156815)
+{
+createScDoc("ods/tdf156815.ods");
+ScDocument* pDoc = getScDoc();
+ScTable* pTable = pDoc->FetchTable(0);
+std::shared_ptr pSettings =
pTable->GetSolverSettings();
+CPPUNIT_ASSERT(pSettings);
+
+// Check current values in the solver model
+CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$A$1"),
pSettings->GetParameter(SP_OBJ_CELL));
+CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$A$3:$B$3"),
pSettings->GetParameter(SP_VAR_CELLS));
+
+std::vector aConstraints = pSettings->GetConstraints();
+CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$A$2"), aConstraints[0].aLeftStr);
+CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$B$2"), aConstraints[0].aRightStr);
+
+// Rename Sheet2 to NewName
+ScDocFunc& rDocFunc = getScDocShell()->GetDocFunc();
+rDocFunc.RenameTable(1, "NewName", false, true);
+
+// Check whether the ranges where updated
+pSettings = pTable->GetSolverSettings();
+CPPUNIT_ASSERT(pSettings);
+CPPUNIT_ASSERT_EQUAL(OUString("$NewName.$A$1"),
pSettings->GetParameter(SP_OBJ_CELL));
+CPPUNIT_ASSERT_EQUAL(OUString("$NewName.$A$3:$B$3"),
pSettings->GetParameter(SP_VAR_CELLS));
+
+aConstraints = pSettings->GetConstraints();
+CPPUNIT_ASSERT_EQUAL(OUString("$NewName.$A$2"), aConstraints[0].aLeftStr);
+CPPUNIT_ASSERT_EQUAL(OUString("$NewName.$B$2"), aConstraints[0].aRightStr);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 0880fdf8a857..8996577b588e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -865,7 +865,12 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString&
rName, bool bExternalDoc
for (const auto& pTable : maTabs)
{
if (pTable)
+{
pTable->SetStreamValid( false );
+// tdf#156815 Reset solver settings so next time they're
loaded they come with
+// the updated sheet name
+pTable->ResetSolverSettings();
+}
}
if (comphelper::LibreOfficeKit::isActive() && GetDrawLayer())
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 6419e285d5b7..aa9755566ef3 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -147,7 +147,7 @@ public:
bool bCut, bool bRecord, bool bPaint,
bool bApi );
SC_DLLPUBLIC bool InsertTable( SCTAB nTab, const OUString& rName, bool
bRecord, bool bApi );
-boolRenameTable( SCTAB nTab, const OUString& rName, bool
bRecord, bool bApi );
+SC_DLLPUBLIC bool RenameTable( SCTAB nTab, const OUString& rName, bool
bRecord, bool bApi );
boolDeleteTable( SCTAB
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/document.hxx|2 ++
sc/inc/table.hxx |4
sc/qa/unit/data/ods/tdf157318.ods |binary
sc/qa/unit/subsequent_export_test4.cxx | 23 +--
sc/source/core/data/document.cxx |6 ++
sc/source/core/data/table1.cxx | 20
sc/source/filter/excel/xename.cxx |5 -
sc/source/ui/view/viewfun2.cxx |3 +++
8 files changed, 56 insertions(+), 7 deletions(-)
New commits:
commit 2705c53c9d444eb5a8126d97b3e1fc4ff010b9c0
Author: Rafael Lima
AuthorDate: Mon Oct 2 00:13:57 2023 +0200
Commit: László Németh
CommitDate: Mon Oct 9 16:06:32 2023 +0200
tdf#100034 tdf#157318 XLSX export: fix lost named ranges associated to
sheets
The original fix for tdf#100034 (see commit [1]) consisted of explicitly
not exporting to XLSX named ranges that are not built-in. This has a
side-effect that user-defined named ranges associated with sheets are also not
exported to XLSX. Hence, if the user creates a named range linked to a sheet
and saves the file to XLSX, the named range is not exported (which is the issue
reported in tdf#157318).
This patch implements a new fix for tdf#100034, reverting the previous
fix. When the Print Ranges are cleared by the user, the associated named
ranges are also cleared, thus fixing the original problem.
This new fix has the advantage that user-defined named ranges linked to
sheets are again exported to XLSX files.
Regression from commit 639519dc2bad058197b6ff73c9e3df622f979f97
"tdf#100034: Fix to persistently remove print-range".
References:
[1] 639519dc2bad058197b6ff73c9e3df622f979f97
Change-Id: Ic3b84365a6086e96f60b222cd6337991ac90f483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157455
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f473034ea039..70a4827ce87f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2118,6 +2118,8 @@ public:
SC_DLLPUBLIC voidClearPrintRanges( SCTAB nTab );
/** Adds a new print ranges. */
SC_DLLPUBLIC voidAddPrintRange( SCTAB nTab, const ScRange&
rNew );
+// Removes all named ranges used for print ranges in a given tab
+SC_DLLPUBLIC voidClearPrintNamedRanges( SCTAB nTab );
/** Marks the specified sheet to be printed completely. Deletes old print
ranges on the sheet! */
SC_DLLPUBLIC voidSetPrintEntireSheet( SCTAB nTab );
SC_DLLPUBLIC voidSetRepeatColRange( SCTAB nTab,
std::optional oNew );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 615a2f03e5cd..34e0f9d27784 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -833,6 +833,10 @@ public:
voidClearPrintRanges();
/** Adds a new print ranges. */
voidAddPrintRange( const ScRange& rNew );
+
+// Removes all named ranges used for print ranges
+voidClearPrintNamedRanges();
+
/** Marks the specified sheet to be printed completely. Deletes old print
ranges! */
voidSetPrintEntireSheet();
diff --git a/sc/qa/unit/data/ods/tdf157318.ods
b/sc/qa/unit/data/ods/tdf157318.ods
new file mode 100644
index ..6d17dc1ceb48
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf157318.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 357ac567575f..77750a206622 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1725,8 +1725,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf100034)
createScDoc("xlsx/tdf100034.xlsx");
ScDocument* pDoc = getScDoc();
-// Clear print ranges
-pDoc->ClearPrintRanges(0);
+// Clear print ranges (Format - Print Ranges - Clear)
+dispatchCommand(mxComponent, ".uno:DeletePrintArea", {});
// Save and load back
saveAndReload("Calc Office Open XML");
@@ -1736,6 +1736,25 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf100034)
CPPUNIT_ASSERT_EQUAL(static_cast(0),
pDoc->GetPrintRangeCount(0));
}
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf157318)
+{
+// This document has 2 named ranges; Test1 is global; Test2 is linked to
Sheet1)
+createScDoc("ods/tdf157318.ods");
+ScDocument* pDoc = getScDoc();
+
+// Save as XLSX and load back
+saveAndReload("Calc Office Open XML");
+pDoc = getScDoc();
+
+// Check if there is one global named range
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+
static_cast(pDoc->GetRangeName()->size()));
+
+// Check if there is one named range in the first sheet
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+
static_cast(pDoc->GetRangeName(0)->size()));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
[Libreoffice-commits] core.git: offapi/com schema/libreoffice sc/inc sc/qa sc/source
offapi/com/sun/star/sheet/NamedRangeFlag.idl|7 +
sc/inc/rangenam.hxx |7 -
sc/qa/unit/data/ods/named-ranges-hidden.ods |binary
sc/qa/unit/data/xlsx/named-ranges-hidden.xlsx |binary
sc/qa/unit/subsequent_filters_test.cxx | 64
sc/source/core/tool/rangenam.cxx|1
sc/source/filter/excel/xename.cxx |6 +
sc/source/filter/inc/workbookhelper.hxx |4
sc/source/filter/oox/defnamesbuffer.cxx | 22 +++-
sc/source/filter/oox/workbookhelper.cxx | 26 ++--
sc/source/filter/xml/xmlexprt.cxx |6 +
sc/source/filter/xml/xmlimprt.cxx |4
sc/source/ui/namedlg/namemgrtable.cxx |4
sc/source/ui/unoobj/nameuno.cxx |6 -
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 34 ++
15 files changed, 166 insertions(+), 25 deletions(-)
New commits:
commit 8938bc703980e3bdf4a32863f3e0193302a08cde
Author: Rafael Lima
AuthorDate: Mon Aug 14 00:34:43 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Oct 1 13:01:32 2023 +0200
tdf#154449 Add support for hidden named ranges
This patch adds the possibility of having "hidden" named ranges in Calc, in
a way similar to what MS Excel has (i.e. they're not visible in the UI and can
only be hidden/shown via scripting).
This is done by creating a new HIDDEN flag in
com.sun.star.sheet.NamedRangeFlag.
Hence thia patch makes it so that named ranges can be made hidden/visible
via scripting. For instance, consider a Calc document with a named range
"NamedRange1". The following scripts hides "NamedRange1" from the UI (i.e. it's
no longer visible in the Manage Names dialog):
Sub SetHidden
Dim eFlags : eFlags = com.sun.star.sheet.NamedRangeFlag
aNamedRange = ThisComponent.NamedRanges.getByName("NamedRange1")
nType = aNamedRange.getType() Or eFlags.HIDDEN
aNamedRange.setType(nType)
End Sub
To make the named range visible again:
Sub RemoveHidden
Dim eFlags : eFlags = com.sun.star.sheet.NamedRangeFlag
aNamedRange = ThisComponent.NamedRanges.getByName("NamedRange1")
nType = aNamedRange.getType()
nType = nType - (aNamedRange.getType() And eFlags.HIDDEN)
aNamedRange.setType(nType)
End Sub
This patch also implements ODS and OOX import/export, as well as QA tests.
Change-Id: I10efe46938fe772b87dc17fc597cb83648b5efb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155599
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/offapi/com/sun/star/sheet/NamedRangeFlag.idl
b/offapi/com/sun/star/sheet/NamedRangeFlag.idl
index 3c42431cb992..5addc08ad561 100644
--- a/offapi/com/sun/star/sheet/NamedRangeFlag.idl
+++ b/offapi/com/sun/star/sheet/NamedRangeFlag.idl
@@ -45,6 +45,13 @@ published constants NamedRangeFlag
*/
const long ROW_HEADER = 8;
+
+/** The range is hidden from the user interface
+
+@since LibreOffice 24.2
+ */
+const long HIDDEN = 16;
+
};
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 31bdd1f5a23c..881a2e876bda 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -55,7 +55,8 @@ public:
RowHeader = 0x0010,
AbsArea= 0x0020,
RefArea= 0x0040,
-AbsPos = 0x0080
+AbsPos = 0x0080,
+Hidden = 0x0100
};
enum class IsNameValidType
@@ -124,7 +125,7 @@ public:
voidAddType( Type nType );
TypeGetType() const { return eType; }
boolHasType( Type nType ) const;
-sal_uInt32 GetUnoType() const;
+SC_DLLPUBLIC sal_uInt32 GetUnoType() const;
SC_DLLPUBLIC OUString GetSymbol( const formula::FormulaGrammar::Grammar
eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
SC_DLLPUBLIC OUString GetSymbol( const ScAddress& rPos, const
formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_DEFAULT ) const;
voidUpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& );
@@ -166,7 +167,7 @@ public:
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
diff --git a/sc/qa/unit/data/ods/named-ranges-hidden.ods
b/sc/qa/unit/data/ods/named-ranges-hidden.ods
new file mode 100644
index ..ff68f549f06a
Binary files /dev/null and b/sc/qa/unit/data/ods/named-ranges-hidden.ods differ
diff --git a/sc/qa/unit/data/xlsx/named-ranges-hidden.xlsx
b/sc/qa/unit/data/xlsx/named-ranges-hidden.xlsx
new file mode 100644
index ..bfb365943ee1
Binary files /dev/null and
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/formdlg/dwfunctr.cxx | 137 +++---
sc/source/ui/inc/dwfunctr.hxx |8 +
sc/source/ui/view/tabvwsh3.cxx|3
sc/uiconfig/scalc/ui/functionpanel.ui | 36
4 files changed, 166 insertions(+), 18 deletions(-)
New commits:
commit b5a8cdbd71a61c76f2b1a6ad33b0757911603184
Author: Rafael Lima
AuthorDate: Tue Jul 25 22:42:49 2023 +0200
Commit: Rafael Lima
CommitDate: Fri Sep 15 13:25:49 2023 +0200
tdf#122718 Add search functionality to the Functions sidebar
With this patch it is possible to search the list of functions in the
Functions sidebar.
To use this feature:
1) In Calc, go to View - Function List
2) The Functions sidebar will open with the "Search" entry focused
3) You can now type your search
4) With the "Search" entry focused, it is possible to use the arrow keys
(up/down) to select the function to insert
5) Press "Enter" to insert the function
The Escape key will clear the search box and F1 will open the help page of
the selected function.
Change-Id: I1af6c1c2489ff736c44e1b3750bea21c05786602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154917
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Rafael Lima
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 8fde50549be1..d158a4aada69 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -29,6 +30,8 @@
#include
#include
+#include
+#include
/*
#* Member: ScFunctionWin
@@ -50,6 +53,7 @@ ScFunctionWin::ScFunctionWin(weld::Widget* pParent)
, xFuncList(m_xBuilder->weld_tree_view("funclist"))
, xInsertButton(m_xBuilder->weld_button("insert"))
, xFiFuncDesc(m_xBuilder->weld_text_view("funcdesc"))
+, m_xSearchString(m_xBuilder->weld_entry("search"))
, xConfigListener(new
comphelper::ConfigurationListener("/org.openoffice.Office.Calc/Formula/Syntax"))
,
xConfigChange(std::make_unique(xConfigListener,
this))
, pFuncDesc(nullptr)
@@ -57,11 +61,15 @@ ScFunctionWin::ScFunctionWin(weld::Widget* pParent)
InitLRUList();
nArgs=0;
-m_aHelpId = xFuncList->get_help_id();
+m_aListHelpId = xFuncList->get_help_id();
+m_aSearchHelpId = m_xSearchString->get_help_id();
// Description box has a height of 8 lines of text
xFiFuncDesc->set_size_request(-1, 8 * xFiFuncDesc->get_text_height());
+m_xSearchString->connect_changed(LINK(this, ScFunctionWin, ModifyHdl));
+m_xSearchString->connect_key_press(LINK(this, ScFunctionWin, KeyInputHdl));
+
xCatBox->connect_changed(LINK( this, ScFunctionWin, SelComboHdl));
xFuncList->connect_changed(LINK( this, ScFunctionWin, SelTreeHdl));
@@ -100,7 +108,7 @@ ScFunctionWin::~ScFunctionWin()
}
/*
-#* Member: UpdateFunctionList
+#* Member: InitLRUList
#*
#*
#* Class: ScFunctionWin
@@ -121,11 +129,11 @@ void ScFunctionWin::InitLRUList()
sal_Int32 nSelPos = xCatBox->get_active();
if (nSelPos == 0)
-UpdateFunctionList();
+UpdateFunctionList("");
}
/*
-#* Member: UpdateFunctionList
+#* Member: UpdateLRUList
#*
#*
#* Class: ScFunctionWin
@@ -183,7 +191,7 @@ void ScFunctionWin::SetDescription()
if (!sHelpId.isEmpty())
xFuncList->set_help_id(pDesc->getHelpId());
else
-xFuncList->set_help_id(m_aHelpId);
+xFuncList->set_help_id(m_aListHelpId);
}
}
@@ -195,13 +203,13 @@ void ScFunctionWin::SetDescription()
#*
#* Function: Updates the list of functions depending on the set category
#*
-#* Input: ---
+#* Input: Search string used to filter the list of functions
#*
#* Output: ---
#*
#/
-void ScFunctionWin::UpdateFunctionList()
+void ScFunctionWin::UpdateFunctionList(const OUString& rSearchString)
{
sal_Int32 nSelPos = xCatBox->get_active();
sal_Int32 nCategory = ( -1 != nSelPos )
@@ -214,12 +222,32 @@ void ScFunctionWin::UpdateFunctionList()
{
ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr();
+SvtSysLocale aSysLocale;
+const CharClass& rCharClass = aSysLocale.GetCharClass();
+const OUString aSearchStr(rCharClass.uppercase(rSearchString));
+
+// First add the functions that start with the search string
const ScFuncDesc* pDesc = pFuncMgr->First(
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c22720f3b8a3c5c6ce08a088513d9525c2837184 Author: Rafael Lima AuthorDate: Fri Aug 25 13:34:34 2023 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 25 13:34:34 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 07d0a97995ad6ea6f853e499b187fbe4ab8d4551 - Document new SF FormDocument service Change-Id: I6bcf114d25877f5c69463285f9bddcf0c8339079 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/155783 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index a002539ad820..07d0a97995ad 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a002539ad82004b15916510d2feaec5771a9c198 +Subproject commit 07d0a97995ad6ea6f853e499b187fbe4ab8d4551
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk|1 source/auxiliary/sbasic.tree |1 source/text/sbasic/shared/03/lib_ScriptForge.xhp |8 source/text/sbasic/shared/03/sf_base.xhp | 24 +- source/text/sbasic/shared/03/sf_database.xhp | 44 source/text/sbasic/shared/03/sf_document.xhp |4 source/text/sbasic/shared/03/sf_formdocument.xhp | 209 +++ source/text/sbasic/shared/03/sf_toc.xhp |3 8 files changed, 278 insertions(+), 16 deletions(-) New commits: commit 07d0a97995ad6ea6f853e499b187fbe4ab8d4551 Author: Rafael Lima AuthorDate: Sun Aug 20 16:29:07 2023 +0200 Commit: Rafael Lima CommitDate: Fri Aug 25 13:34:33 2023 +0200 Document new SF FormDocument service Change-Id: I6bcf114d25877f5c69463285f9bddcf0c8339079 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/155783 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index a41510f962..8b7719e2b3 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -95,6 +95,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/03/sf_filesystem \ helpcontent2/source/text/sbasic/shared/03/sf_form \ helpcontent2/source/text/sbasic/shared/03/sf_formcontrol \ +helpcontent2/source/text/sbasic/shared/03/sf_formdocument \ helpcontent2/source/text/sbasic/shared/03/sf_intro \ helpcontent2/source/text/sbasic/shared/03/sf_l10n \ helpcontent2/source/text/sbasic/shared/03/sf_menu \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index e97c93b658..8371609dc9 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -365,6 +365,7 @@ FileSystem service Form service FormControl service +FormDocument service L10N service Menu service Platform service diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp b/source/text/sbasic/shared/03/lib_ScriptForge.xhp index ca6220be19..af306b184a 100644 --- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp +++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp @@ -98,12 +98,13 @@ Database - Datasheet + Datasheet + Document - Document + FormDocument Writer @@ -203,6 +204,9 @@ + + + diff --git a/source/text/sbasic/shared/03/sf_base.xhp b/source/text/sbasic/shared/03/sf_base.xhp index 9ef4987f76..bbbdf1909f 100644 --- a/source/text/sbasic/shared/03/sf_base.xhp +++ b/source/text/sbasic/shared/03/sf_base.xhp @@ -10,7 +10,7 @@ --> - + SFDocuments.Base service /text/sbasic/shared/03/sf_base.xhp @@ -21,7 +21,7 @@ Base service - SFDocuments.Base service + SFDocuments.Base service The Base service provides a number of methods and properties to facilitate the management and handling of %PRODUCTNAME Base documents. This service is closely related to the Document service, which provides generic methods for handling %PRODUCTNAME documents, including Base documents. Hence, the Base service extends the Document service and provides additional methods that are specific for Base documents, enabling users to: @@ -117,6 +117,7 @@ CloseFormDocument Closes the given form document. Returns True if closure is successful. + The method CloseFormDocument is deprecated since %PRODUCTNAME 7.6. Although it is still available, it may be removed from the Base service in a future release. Use the CloseDocument method from the FormDocument service instead. svc.CloseFormDocument(formdocument: str): bool @@ -183,6 +184,7 @@ A SFDocuments.Form object representing the form specified in the Form argument. + The method Forms is deprecated since %PRODUCTNAME 7.6. Although it is still available, it may be removed from the Base service in a future release. Use the Forms method from the FormDocument service instead. svc.Forms(formdocument: str): str[0..*] @@ -280,11 +282,12 @@ Base service;OpenFormDocument OpenFormDocument - Opens the specified FormDocument either in normal or in design mode. - If the form document is already open, it is activated without changing its mode. The method returns True if the form document could be opened. + Opens the specified FormDocument either in normal or in design mode. This method returns a FormDocument service instance corresponding to the specified form document. + If the form document is already open, it is activated without changing its mode. + If the specified form document does not exist, then Nothing is returned. -svc.OpenFormDocument(formdocument: str,
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2d8f1dda7ce89ad9eef9f7c6da1024e607dc186 Author: Rafael Lima AuthorDate: Wed Aug 23 14:14:01 2023 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 23 14:14:01 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 3d767df226fbda339165a48ca79fa6d21e6b71be - Document new UserData property in SF_Platform This patch also creates a new example and refactors the previously existing one. Change-Id: I7523188afcb058f0c8457b57c9680b6d8ec166e6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/155918 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index 2aa198ab5708..3d767df226fb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2aa198ab57081bed9c012ea49c25fcd9d05dbfcb +Subproject commit 3d767df226fbda339165a48ca79fa6d21e6b71be
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_platform.xhp | 83 ---
source/text/sbasic/shared/03/sf_toc.xhp |3
2 files changed, 65 insertions(+), 21 deletions(-)
New commits:
commit 3d767df226fbda339165a48ca79fa6d21e6b71be
Author: Rafael Lima
AuthorDate: Tue Aug 22 15:37:55 2023 +0200
Commit: Rafael Lima
CommitDate: Wed Aug 23 14:14:00 2023 +0200
Document new UserData property in SF_Platform
This patch also creates a new example and refactors the previously existing
one.
Change-Id: I7523188afcb058f0c8457b57c9680b6d8ec166e6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/155918
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/source/text/sbasic/shared/03/sf_platform.xhp
b/source/text/sbasic/shared/03/sf_platform.xhp
index bbd38a4ca9..6fe6f22aa4 100644
--- a/source/text/sbasic/shared/03/sf_platform.xhp
+++ b/source/text/sbasic/shared/03/sf_platform.xhp
@@ -78,6 +78,7 @@
Platform service;Processor
Platform service;PythonVersion
Platform service;SystemLocale
+ Platform service;UserData
Properties
@@ -381,28 +382,70 @@
Returns the locale of the operating system as a string in
the format "la-CO" (language-COUNTRY). This is equivalent to the
Locale property.
+
+
+ UserData
+
+
+ Yes
+
+
+ Dictionary
+
+
+ Returns a Dictionary instance containing
key-value pairs with the information found in the Tools - Options - User
Data dialog.
+
+
-
-The following
examples in Basic and Python illustrate how to use the Fonts
property to write the names of all available fonts to the current Calc sheet
starting at cell "A1":
-
-
- Dim oDoc as Object
- Dim allFonts as Object
- Dim svcPlatform as Object
- Set
oDoc = CreateScriptService("Calc")
- Set svcPlatform =
CreateScriptService("Platform")
- allFonts = svcPlatform.Fonts
- oDoc.setArray("~.A1", allFonts)
-
-
-
- from scriptforge import
CreateScriptService
- svc_platform =
CreateScriptService("Platform")
- doc
= CreateScriptService("Calc")
- all_fonts = svc_platform.Fonts
- doc.setArray("~.A1", all_fonts)
-
+
+
+
+ The following
examples in Basic and Python illustrate how to use the Fonts
property to write the names of all available fonts to the current Calc sheet
starting at cell "A1":
+
+Dim
oDoc as Object
+Dim
allFonts as Object
+Dim
svcPlatform as Object
+Set
oDoc = CreateScriptService("Calc")
+Set
svcPlatform = CreateScriptService("Platform")
+allFonts = svcPlatform.Fonts
+oDoc.setArray("~.A1", allFonts)
+
+
+ The example below
demonstrates how to create a Calc table with all the values stored in the
UserData property, which is a Dictionary
service instance:
+
+Dim
svcPlatform as Object, oUserData as Object, oDoc as Object
+Dim
arrUserData As Object, currCell As String
+Set
svcPlatform = CreateScriptService("Platform")
+oUserData = svcPlatform.UserData
+arrUserData = oUserData.ConvertToArray()
+Set
oDoc = CreateScriptService("Calc", ThisComponent)
+oDoc.SetArray("~.A1", Array(Array("Key",
"Value")))
+oDoc.SetArray("~.A2", arrUserData)
+
+
+
+ The examples above
can be writen in Python as follows:
+
+from
scriptforge import CreateScriptService
+bas =
CreateScriptService("Basic")
+doc =
CreateScriptService("Calc", bas.ThisComponent)
+svc_platform =
CreateScriptService("Platform")
+all_fonts = svc_platform.Fonts
+doc.setArray("~.A1", all_fonts)
+
+
+from
scriptforge import CreateScriptService
+bas =
CreateScriptService("Basic")
+doc =
CreateScriptService("Calc", bas.ThisComponent)
+svc_platform =
CreateScriptService("Platform")
+user_data = svc_platform.UserData
+arr_user_data = [[key, user_data[key]] for key in
user_data]
+doc.SetArray("~.A1", (("Key", "Value"),))
+doc.SetArray("~.A2", arr_user_data)
+
+
+
diff --git a/source/text/sbasic/shared/03/sf_toc.xhp
b/source/text/sbasic/shared/03/sf_toc.xhp
index a0ccfdcb3f..6e5900a003 100644
--- a/source/text/sbasic/shared/03/sf_toc.xhp
+++ b/source/text/sbasic/shared/03/sf_toc.xhp
@@ -695,7 +695,8 @@
Printers
Processor
PythonVersion
-SystemLocale
+SystemLocale
+UserData
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/ToolBarManager.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 188cff995830d52f4b04ee4d2ffcabeff5d17b27 Author: Rafael Lima AuthorDate: Wed Aug 9 01:30:25 2023 +0200 Commit: Rafael Lima CommitDate: Thu Aug 17 14:16:32 2023 +0200 tdf#142489 Do not show the table toolbar when Notebookbar is active When the Notebookbar UI is being used, all the commands are already accessible via the "Table" tab in the notebookbar, so showing the toolbar duplicates the commands on the screen. Therefore, this patch disables showing this toolbar when the Notebookbar UI is being used. Obviously, it can be enabled manually via View - Toolbars. Change-Id: I115effbd94f61df518ff90411a45431fefa9e844 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155473 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index b3ea6ee8ded2..4be073bac612 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1129,7 +1129,9 @@ void ToolBarRules::SubShellAdded ( break; case ToolbarId::Draw_Table_Toolbox: -mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTableObjectBar); +// tdf#142489 Do not show the table toolbar when the Notebookbar UI is active +if (!sfx2::SfxNotebookBar::IsActive(true)) +mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTableObjectBar); break; default:
[Libreoffice-commits] core.git: sfx2/inc sfx2/source sfx2/uiconfig sw/qa
sfx2/inc/sidebar/DeckDescriptor.hxx |1
sfx2/inc/sidebar/DeckTitleBar.hxx |3 -
sfx2/inc/sidebar/TitleBar.hxx |2
sfx2/source/sidebar/Deck.cxx|3 -
sfx2/source/sidebar/DeckDescriptor.cxx |1
sfx2/source/sidebar/DeckTitleBar.cxx| 16 +-
sfx2/source/sidebar/FocusManager.cxx| 84 +---
sfx2/source/sidebar/ResourceManager.cxx |1
sfx2/source/sidebar/TitleBar.cxx| 13
sfx2/uiconfig/ui/deck.ui| 26 -
sw/qa/uitest/sidebar/tdf152921.py |6 +-
11 files changed, 97 insertions(+), 59 deletions(-)
New commits:
commit 9ca60dc90958001c078ed6331bd432c36961a425
Author: Rafael Lima
AuthorDate: Wed Jul 26 02:00:40 2023 +0200
Commit: Rafael Lima
CommitDate: Sat Aug 5 00:05:56 2023 +0200
tdf#156156 Add Help button to sidebar decks
This patch adds a Help button to the sidebar deck, so that each deck has
its own Help ID, which can later be used as reference to write help pages.
The Help IDs of each sidebar deck is a combination of the string "SIDEBAR_"
+ the deck ID (as defined in Sidebar.xcu).
Change-Id: Ib7f106ff917e41130bde136e1e6f04bb2af40daf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154918
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou
Reviewed-by: Olivier Hallot
diff --git a/sfx2/inc/sidebar/DeckDescriptor.hxx
b/sfx2/inc/sidebar/DeckDescriptor.hxx
index 5381b4ea2cd7..8fde0c0330f7 100644
--- a/sfx2/inc/sidebar/DeckDescriptor.hxx
+++ b/sfx2/inc/sidebar/DeckDescriptor.hxx
@@ -34,6 +34,7 @@ public:
OUString msTitleBarIconURL;
OUString msHighContrastTitleBarIconURL;
OUString msHelpText;
+OUString msHelpId;
ContextList maContextList;
bool mbIsEnabled;
sal_Int32 mnOrderIndex;
diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx
b/sfx2/inc/sidebar/DeckTitleBar.hxx
index 72eda5cb7d7b..2834dda1e350 100644
--- a/sfx2/inc/sidebar/DeckTitleBar.hxx
+++ b/sfx2/inc/sidebar/DeckTitleBar.hxx
@@ -29,7 +29,7 @@ class GripWidget;
class DeckTitleBar final : public TitleBar
{
public:
-DeckTitleBar(const OUString& rsTitle, weld::Builder& rBuilder,
+DeckTitleBar(const OUString& rsTitle, weld::Builder& rBuilder, const
OUString& rsHelpId,
std::function aCloserAction);
virtual ~DeckTitleBar() override;
@@ -48,6 +48,7 @@ private:
std::unique_ptr mxGripWeld;
std::unique_ptr mxLabel;
+OUString msHelpId;
const std::function maCloserAction;
bool mbIsCloserVisible;
};
diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx
index 2cd7224bda12..7836a57be17a 100644
--- a/sfx2/inc/sidebar/TitleBar.hxx
+++ b/sfx2/inc/sidebar/TitleBar.hxx
@@ -56,10 +56,12 @@ protected:
std::unique_ptr mxAddonImage;
std::unique_ptr mxToolBox;
Theme::ThemeItem meThemeItem;
+OUString msToolBoxRId;
virtual void HandleToolBoxItemClick() = 0;
DECL_LINK(SelectionHandler, const OUString&, void);
+static void ShowHelp(const OUString& rHelpId);
private:
void SetBackground();
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 629a1d76d3d0..c45ab52e574e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -55,7 +55,8 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor,
SidebarDockingWindow* pParentW
, mnMinimalHeight(0)
, maPanels()
, mxParentWindow(pParentWindow)
-, mxTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, *m_xBuilder,
rCloserAction))
+, mxTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, *m_xBuilder,
+ rDeckDescriptor.msHelpId, rCloserAction))
, mxVerticalScrollBar(m_xBuilder->weld_scrolled_window("scrolledwindow"))
, mxContents(m_xBuilder->weld_box("contents"))
{
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx
b/sfx2/source/sidebar/DeckDescriptor.cxx
index fee839f08ad0..29af33e33f22 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -36,6 +36,7 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther)
msTitleBarIconURL(rOther.msTitleBarIconURL),
msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
msHelpText(rOther.msHelpText),
+ msHelpId(rOther.msHelpId),
maContextList(rOther.maContextList),
mbIsEnabled(rOther.mbIsEnabled),
mnOrderIndex(rOther.mnOrderIndex),
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 44b9387dc14d..9e12fd15c6ab 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -61,11 +61,13 @@ public:
DeckTitleBar::DeckTitleBar (const OUString& rsTitle,
weld::Builder& rBuilder,
+const OUString& rsHelpId,
std::function aCloserAction)
: TitleBar(rBuilder,
