core.git: Branch 'libreoffice-24-2' - starmath/source sw/qa
starmath/source/ooxmlimport.cxx |4 ++-- sw/qa/extras/ooxmlexport/data/tdf158023_export.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |9 - sw/qa/extras/ooxmlimport/data/tdf158023_import.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 20 sw/qa/extras/rtfexport/data/tdf158023.rtf |8 sw/qa/extras/rtfexport/rtfexport.cxx| 10 +- 7 files changed, 47 insertions(+), 4 deletions(-) New commits: commit 57946f4262b5d548d3429723faf380eaba5ce9f8 Author: Irgaliev Amin AuthorDate: Mon Dec 25 20:13:34 2023 +0400 Commit: Xisco Fauli CommitDate: Tue Jun 18 14:06:35 2024 +0200 tdf#158023 Add \ before parentheses if they are in the tag. MSO allows you to write unpair opening or closing parentheses in the t tag. The patch adds a backslash before parentheses, which allows you to correctly recognize and correctly save such formulas when exporting. Also add a test to check whether the parentheses are wrapped correctly. Change-Id: Ib1a941858f0843742b56b8089f3c14983ba1222c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158794 Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit 8148dd6ed3c61eaf5f9fe3a060ecda9d11611f39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169103 Reviewed-by: Xisco Fauli diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 4023a5e652ac..b0932c43919c 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -602,9 +602,9 @@ OUString SmOoxmlImport::handleR() { XmlStream::Tag rtag = m_rStream.ensureOpeningTag( M_TOKEN( t )); if( rtag.attribute( OOX_TOKEN( xml, space )) != "preserve" ) -text.append(o3tl::trim(rtag.text)); +text.append(o3tl::trim(rtag.text.replaceAll("(", "\(").replaceAll(")", "\)"))); else -text.append(rtag.text); +text.append(rtag.text.replaceAll("(", "\(").replaceAll(")", "\)")); m_rStream.ensureClosingTag( M_TOKEN( t )); break; } diff --git a/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx b/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx new file mode 100644 index ..289619a7e4b6 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 6e27f9a6a1ab..e18c1eebca5e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -261,7 +261,14 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentsNested) CPPUNIT_TEST_FIXTURE(Test, testMathEscape) { loadAndReload("math-escape.docx"); -CPPUNIT_ASSERT_EQUAL(OUString("\{ left [ right ] left ( right ) \}"), getFormula(getRun(getParagraph(1), 1))); +CPPUNIT_ASSERT_EQUAL(OUString("\{ left [ right ] \( \) \}"), getFormula(getRun(getParagraph(1), 1))); +} + +// Saving left and right for parentheses when importing not from the m:t tag (docx) +CPPUNIT_TEST_FIXTURE(Test, testTdf158023Export) +{ +loadAndReload("tdf158023_export.docx"); +CPPUNIT_ASSERT_EQUAL(OUString("left [ right ] left ( right ) left lbrace right rbrace"), getFormula(getRun(getParagraph(1), 1))); } CPPUNIT_TEST_FIXTURE(Test, testFdo51034) diff --git a/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx b/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx new file mode 100644 index ..1095499e2ebf Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 0c29484d765e..642c05b14aa8 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -697,6 +697,26 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf119200) CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2287 } {}"_ustr, getFormula(getRun(xPara, 7))); } +// Checking a formula where the closing brackets +// come first, and then the opening ones +CPPUNIT_TEST_FIXTURE(Test, testTdf158023Import) +{ +auto verify = [this]() { +auto xPara = getParagraph(1); +CPPUNIT_ASSERT_EQUAL(u"\) sqrt {\)2\(} \("_ustr, getFormula(getRun(xPara, 1))); +}; +auto verifyReload = [this]() { +auto xPara = getParagraph(1); +CPPUNIT_ASSERT_EQUAL(u"\) sqrt {\) 2 \(} \("_ustr, getFormula(getRun(xPara, 1))); +}; + +createSwDoc("tdf158023_import.docx"); +verify(); + +saveAndReload("Office Open XML Text"); +verifyReload(); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf115094) { createSwDoc("tdf115094.docx"); diff --git a/sw/qa/extras/rtfexport/data/tdf158023.rtf
core.git: starmath/source sw/qa
starmath/source/ooxmlimport.cxx |4 ++-- sw/qa/extras/ooxmlexport/data/tdf158023_export.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |9 - sw/qa/extras/ooxmlimport/data/tdf158023_import.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 20 sw/qa/extras/rtfexport/data/tdf158023.rtf |8 sw/qa/extras/rtfexport/rtfexport.cxx| 10 +- 7 files changed, 47 insertions(+), 4 deletions(-) New commits: commit 8148dd6ed3c61eaf5f9fe3a060ecda9d11611f39 Author: Irgaliev Amin AuthorDate: Mon Dec 25 20:13:34 2023 +0400 Commit: Mike Kaganski CommitDate: Mon Dec 25 18:35:18 2023 +0100 tdf#158023 Add \ before parentheses if they are in the tag. MSO allows you to write unpair opening or closing parentheses in the t tag. The patch adds a backslash before parentheses, which allows you to correctly recognize and correctly save such formulas when exporting. Also add a test to check whether the parentheses are wrapped correctly. Change-Id: Ib1a941858f0843742b56b8089f3c14983ba1222c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158794 Reviewed-by: Mike Kaganski Tested-by: Jenkins diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 4023a5e652ac..b0932c43919c 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -602,9 +602,9 @@ OUString SmOoxmlImport::handleR() { XmlStream::Tag rtag = m_rStream.ensureOpeningTag( M_TOKEN( t )); if( rtag.attribute( OOX_TOKEN( xml, space )) != "preserve" ) -text.append(o3tl::trim(rtag.text)); +text.append(o3tl::trim(rtag.text.replaceAll("(", "\(").replaceAll(")", "\)"))); else -text.append(rtag.text); +text.append(rtag.text.replaceAll("(", "\(").replaceAll(")", "\)")); m_rStream.ensureClosingTag( M_TOKEN( t )); break; } diff --git a/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx b/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx new file mode 100644 index ..289619a7e4b6 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158023_export.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 6e27f9a6a1ab..e18c1eebca5e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -261,7 +261,14 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentsNested) CPPUNIT_TEST_FIXTURE(Test, testMathEscape) { loadAndReload("math-escape.docx"); -CPPUNIT_ASSERT_EQUAL(OUString("\{ left [ right ] left ( right ) \}"), getFormula(getRun(getParagraph(1), 1))); +CPPUNIT_ASSERT_EQUAL(OUString("\{ left [ right ] \( \) \}"), getFormula(getRun(getParagraph(1), 1))); +} + +// Saving left and right for parentheses when importing not from the m:t tag (docx) +CPPUNIT_TEST_FIXTURE(Test, testTdf158023Export) +{ +loadAndReload("tdf158023_export.docx"); +CPPUNIT_ASSERT_EQUAL(OUString("left [ right ] left ( right ) left lbrace right rbrace"), getFormula(getRun(getParagraph(1), 1))); } CPPUNIT_TEST_FIXTURE(Test, testFdo51034) diff --git a/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx b/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx new file mode 100644 index ..1095499e2ebf Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf158023_import.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index d86a6bffe861..ed2d5371dfc4 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -699,6 +699,26 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf119200) CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2287 } {}"_ustr, getFormula(getRun(xPara, 7))); } +// Checking a formula where the closing brackets +// come first, and then the opening ones +CPPUNIT_TEST_FIXTURE(Test, testTdf158023Import) +{ +auto verify = [this]() { +auto xPara = getParagraph(1); +CPPUNIT_ASSERT_EQUAL(u"\) sqrt {\)2\(} \("_ustr, getFormula(getRun(xPara, 1))); +}; +auto verifyReload = [this]() { +auto xPara = getParagraph(1); +CPPUNIT_ASSERT_EQUAL(u"\) sqrt {\) 2 \(} \("_ustr, getFormula(getRun(xPara, 1))); +}; + +createSwDoc("tdf158023_import.docx"); +verify(); + +saveAndReload("Office Open XML Text"); +verifyReload(); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf115094) { createSwDoc("tdf115094.docx"); diff --git a/sw/qa/extras/rtfexport/data/tdf158023.rtf b/sw/qa/extras/rtfexport/data/tdf158023.rtf new file mode 100644 index ..cdcddc4532fc --- /dev/null +++ b/sw/qa/extras/rtfexport/data/tdf158023.rtf @@ -0,0 +1,8 @@ +{ tf1 +{\mmath
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg include/vcl officecfg/registry sd/inc sd/source sd/uiconfig slideshow/
dev/null |binary icon-themes/colibre/sd/res/nextslide_extralarge.png |binary icon-themes/colibre/sd/res/nextslide_large.png |binary icon-themes/colibre/sd/res/prevslide_extralarge.png |binary icon-themes/colibre/sd/res/prevslide_large.png |binary icon-themes/colibre/sd/res/slideshowmenu_extralarge.png |binary icon-themes/colibre/sd/res/slideshowmenu_large.png |binary icon-themes/colibre_dark/sd/res/nextslide_extralarge.png |binary icon-themes/colibre_dark/sd/res/nextslide_large.png |binary icon-themes/colibre_dark/sd/res/prevslide_extralarge.png |binary icon-themes/colibre_dark/sd/res/prevslide_large.png |binary icon-themes/colibre_dark/sd/res/slideshowmenu_extralarge.png |binary icon-themes/colibre_dark/sd/res/slideshowmenu_large.png |binary icon-themes/colibre_dark_svg/sd/res/nextslide_extralarge.svg | 47 +++ icon-themes/colibre_dark_svg/sd/res/nextslide_large.svg | 47 +++ icon-themes/colibre_dark_svg/sd/res/nextslide_mouseover.svg |1 icon-themes/colibre_dark_svg/sd/res/prevslide_extralarge.svg | 47 +++ icon-themes/colibre_dark_svg/sd/res/prevslide_large.svg | 47 +++ icon-themes/colibre_dark_svg/sd/res/prevslide_mouseover.svg |1 icon-themes/colibre_dark_svg/sd/res/slideshowmenu_extralarge.svg | 62 ++ icon-themes/colibre_dark_svg/sd/res/slideshowmenu_large.svg | 62 ++ icon-themes/colibre_dark_svg/sd/res/slideshowmenu_mouseover.svg |1 icon-themes/colibre_svg/sd/res/nextslide_extralarge.svg | 47 +++ icon-themes/colibre_svg/sd/res/nextslide_large.svg | 47 +++ icon-themes/colibre_svg/sd/res/nextslide_mouseover.svg |1 icon-themes/colibre_svg/sd/res/prevslide_extralarge.svg | 47 +++ icon-themes/colibre_svg/sd/res/prevslide_large.svg | 47 +++ icon-themes/colibre_svg/sd/res/prevslide_mouseover.svg |1 icon-themes/colibre_svg/sd/res/slideshowmenu_extralarge.svg | 62 ++ icon-themes/colibre_svg/sd/res/slideshowmenu_large.svg | 62 ++ icon-themes/colibre_svg/sd/res/slideshowmenu_mouseover.svg |1 include/vcl/vclenum.hxx |9 + officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 30 sd/inc/bitmaps.hlst | 14 +- sd/source/ui/dlg/present.cxx | 21 +++ sd/source/ui/inc/present.hxx |2 sd/source/ui/slideshow/slideshowimpl.cxx | 36 + sd/uiconfig/simpress/ui/presentationdialog.ui| 39 +- slideshow/source/engine/slideshowimpl.cxx|4 39 files changed, 768 insertions(+), 17 deletions(-) New commits: commit 847001ffbbcaf6d2657a5cce18f6c58151efbd2c Author: Irgaliev Amin AuthorDate: Wed Nov 22 22:43:18 2023 +0400 Commit: Samuel Mehrbrodt CommitDate: Wed Nov 22 21:20:09 2023 +0100 tdf#158126 UI: Scalable buttons for Impress navigation bar On some panels, small icons of navigation bar are not convenient to use. Currently there are 4 sizes available for other icons: automatic, small, large and extra large. It is useful to implement support for scalable buttons in the Impress navigation bar. This setting can be located in Slide show -> Slide Show Settings (Display section) Change-Id: Ief8cc0cbf4eac98ee90bf3e993e4fc44cea0165e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159294 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/icon-themes/colibre/sd/res/nextslide_extralarge.png b/icon-themes/colibre/sd/res/nextslide_extralarge.png new file mode 100644 index ..4b86301c93cc Binary files /dev/null and b/icon-themes/colibre/sd/res/nextslide_extralarge.png differ diff --git a/icon-themes/colibre/sd/res/nextslide_large.png b/icon-themes/colibre/sd/res/nextslide_large.png new file mode 100644 index ..4138f3d8bd8b Binary files /dev/null and b/icon-themes/colibre/sd/res/nextslide_large.png differ diff --git a/icon-themes/colibre/sd/res/nextslide_mouseover.png b/icon-themes/colibre/sd/res/nextslide_mouseover.png deleted file mode 100644 index 56b105438d58.. Binary files a/icon-themes/colibre/sd/res/nextslide_mouseover.png and /dev/null differ diff --git a/icon-themes/colibre/sd/res/nextslide.png b/icon-themes/colibre/sd/res/nextslide_small.png similarity index 100% rename from icon-themes/colibre/sd/res/nextslide.png rename to icon-themes/colibre/sd/res/nextslide_small.png diff --git a/icon-themes/colibre/sd/res/prevslide_extralarge.png
[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/qa sd/source sd/uiconfig
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |7 sd/inc/drawdoc.hxx |1 sd/inc/sdattr.hrc |3 - sd/qa/unit/dialogs-test.cxx |1 sd/source/core/drawdoc.cxx |1 sd/source/ui/app/optsitem.cxx | 19 +- sd/source/ui/dlg/present.cxx|3 - sd/source/ui/dlg/tpoption.cxx | 10 - sd/source/ui/func/fusldlg.cxx |8 sd/source/ui/inc/optsitem.hxx |6 +++ sd/source/ui/inc/present.hxx|1 sd/source/ui/inc/tpoption.hxx |2 + sd/source/ui/slideshow/slideshow.cxx| 19 -- sd/source/ui/slideshow/slideshowimpl.cxx|6 +-- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui| 21 +++- sd/uiconfig/simpress/ui/presentationdialog.ui | 19 -- 16 files changed, 62 insertions(+), 65 deletions(-) New commits: commit 0e14912af0c449396f10c2ae4be3c7f2a3a98bc2 Author: Irgaliev Amin AuthorDate: Mon Oct 16 19:19:18 2023 +0400 Commit: Heiko Tietze CommitDate: Tue Oct 17 09:55:28 2023 +0200 tdf#157788 Saving the "Show navigation panel" setting for a device Currently, the value of the "Show navigation panel" parameter for presentations is not saved. The section in which this setting is now located, apparently, is saved in files. It might make sense to move this setting to Tools -> Options -> LibreOffice Impress -> General, because it relates to the device rather than the slideshow. Change-Id: I2286a4a6d432b11fce2b9c3e65fa6b82e004275f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158057 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index adb6d257b01e..baafb0972c94 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -584,6 +584,13 @@ true + + + Indicates whether to show navigation panel for presentations. + Show navigation panel + + false + diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 5b602c45ec12..dd6b81647ef7 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -105,7 +105,6 @@ namespace sd bool mbMouseAsPen; bool mbLockedPages; bool mbAlwaysOnTop; -bool mbUseNavigation; bool mbFullScreen; bool mbAnimationAllowed; sal_Int32 mnPauseTimeout; diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 2e2bfddec98b..f431dea4f680 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -55,9 +55,8 @@ class XColorItem; #define ATTR_PRESENT_PAUSE_TIMEOUT TypedWhichId(ATTR_PRESENT_START + 13) #define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14 #define ATTR_PRESENT_DISPLAY TypedWhichId(ATTR_PRESENT_START + 15) -#define ATTR_PRESENT_SHOW_NAVIGATION_BUTTONS ATTR_PRESENT_START + 16 -#define ATTR_PRESENT_ENDATTR_PRESENT_SHOW_NAVIGATION_BUTTONS +#define ATTR_PRESENT_ENDATTR_PRESENT_DISPLAY // animation attributes #define ATTR_ANIMATION_STARTATTR_PRESENT_END + 1 diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 5a80d5ac4f72..c9182eea751d 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -404,7 +404,6 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID) aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_ANIMATION_ALLOWED, rPresentationSettings.mbAnimationAllowed)); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_CHANGE_PAGE, !rPresentationSettings.mbLockedPages)); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_ALWAYS_ON_TOP, rPresentationSettings.mbAlwaysOnTop)); -aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_SHOW_NAVIGATION_BUTTONS, rPresentationSettings.mbUseNavigation)); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_FULLSCREEN, rPresentationSettings.mbFullScreen)); aDlgSet.Put(SfxUInt32Item(ATTR_PRESENT_PAUSE_TIMEOUT, rPresentationSettings.mnPauseTimeout)); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_SHOW_PAUSELOGO, rPresentationSettings.mbShowPauseLogo)); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 76a1efd2d97b..9f798689ba03 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -105,7 +105,6 @@ PresentationSettings::PresentationSettings() mbMouseAsPen( false ), mbLockedPages( false ),