officecfg/registry/schema/org/openoffice/Office/Math.xcs | 2 +-
starmath/source/cfgitem.cxx | 8 ++++----
uitest/math_tests/start.py | 4 ++--
uitest/math_tests/tdf147755.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit c4f69dd0896223a8f9350443df658cc9cb9b5e3f
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Aug 22 10:57:05 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Sep 6 14:13:48 2024 +0200
Related tdf#160226 - Math inline editing Off by default
Introduced per
I63672c054d1ead269863079e7f9c118a44b3ba19
Ib2ca942c537e466f6ff100be7f95adaead99f1d5
Change-Id: Iff2bd250c004e57800c84287483965ec3ae49187
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172241
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Tested-by: Jenkins
(cherry picked from commit cd2eba5c698081355d51c491398119f38068bfb2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172751
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 026f33b5e983..b7eb0f358df8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -301,7 +301,7 @@
<info>
<desc>Enables inline (visual) editing mode.</desc>
</info>
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="IgnoreSpacesRight" oor:type="xs:boolean"
oor:nillable="false">
<info>
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index d8805f44dfd0..8986702fee92 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -72,8 +72,8 @@ static Sequence<OUString> lcl_GetOtherPropertyNames()
return Sequence<OUString>{ u"LoadSave/IsSaveOnlyUsedSymbols"_ustr,
u"Misc/AutoCloseBrackets"_ustr,
u"Misc/DefaultSmSyntaxVersion"_ustr,
- u"Misc/IgnoreSpacesRight"_ustr,
u"Misc/InlineEditEnable"_ustr,
+ u"Misc/IgnoreSpacesRight"_ustr,
u"Misc/SmEditWindowZoomFactor"_ustr,
u"Print/FormulaText"_ustr,
u"Print/Frame"_ustr,
@@ -168,7 +168,7 @@ SmCfgOther::SmCfgOther()
, bPrintFrame(true)
, bIsSaveOnlyUsedSymbols(true)
, bIsAutoCloseBrackets(true)
- , bInlineEditEnable(true)
+ , bInlineEditEnable(false)
, bIgnoreSpacesRight(true)
, bToolboxVisible(true)
, bAutoRedraw(true)
@@ -1424,8 +1424,8 @@ void SmMathConfig::ItemSetToConfig(const SfxItemSet &rSet)
{ bVal = pRedrawItem->GetValue();
SetAutoRedraw( bVal );
}
- if (const SfxBoolItem* pSpacesItem =
rSet.GetItemIfSet(SID_INLINE_EDIT_ENABLE))
- { bVal = pSpacesItem->GetValue();
+ if (const SfxBoolItem* pInlineEditItem =
rSet.GetItemIfSet(SID_INLINE_EDIT_ENABLE))
+ { bVal = pInlineEditItem->GetValue();
SetInlineEditEnable( bVal );
}
if (const SfxBoolItem* pSpacesItem =
rSet.GetItemIfSet(SID_NO_RIGHT_SPACES))
diff --git a/uitest/math_tests/start.py b/uitest/math_tests/start.py
index 7504387a16f7..a2e4ba1d708c 100644
--- a/uitest/math_tests/start.py
+++ b/uitest/math_tests/start.py
@@ -57,11 +57,11 @@ class SimpleMathTest(UITestCase):
xElement.executeAction("DOUBLECLICK", tuple())
xEditView = xMathDoc.getChild("editview")
- xEditView.executeAction("TYPE", mkPropertyValues({"KEYCODE":"F4"}))
+
type_text(xEditView, "1")
xEditView.executeAction("TYPE", mkPropertyValues({"KEYCODE":"F4"}))
type_text(xEditView, "2")
- self.assertEqual("{ 1 <> 2 }",
get_state_as_dict(xEditView)["Text"])
+ self.assertEqual("1 <> 2 ", get_state_as_dict(xEditView)["Text"])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/math_tests/tdf147755.py b/uitest/math_tests/tdf147755.py
index 491974787802..710bf7efa6b4 100644
--- a/uitest/math_tests/tdf147755.py
+++ b/uitest/math_tests/tdf147755.py
@@ -26,7 +26,7 @@ class Tdf147755(UITestCase):
xEditView = xMathDoc.getChild("editview")
# Without the fix in place, this test would have failed with
- # AssertionError: '%arRay' != ''
- self.assertEqual("%arRay", get_state_as_dict(xEditView)["Text"])
+ # AssertionError: '%arRay ' != ''
+ self.assertEqual("%arRay ", get_state_as_dict(xEditView)["Text"])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
