basic/qa/cppunit/test_compiler_checks.cxx | 40 ++++ basic/source/comp/scanner.cxx | 2 extensions/inc/stringarrays.hrc | 6 extensions/source/propctrlr/formmetadata.cxx | 8 g | 18 - icon-themes/breeze/vcl/res/check1.png |binary icon-themes/breeze/vcl/res/check2.png |binary icon-themes/breeze/vcl/res/check3.png |binary icon-themes/breeze/vcl/res/check4.png |binary icon-themes/breeze/vcl/res/check5.png |binary icon-themes/breeze/vcl/res/check6.png |binary icon-themes/breeze/vcl/res/check7.png |binary icon-themes/breeze/vcl/res/check8.png |binary icon-themes/breeze/vcl/res/check9.png |binary icon-themes/breeze/vcl/res/radio1.png |binary icon-themes/breeze/vcl/res/radio2.png |binary icon-themes/breeze/vcl/res/radio3.png |binary icon-themes/breeze/vcl/res/radio4.png |binary icon-themes/breeze/vcl/res/radio5.png |binary icon-themes/breeze/vcl/res/radio6.png |binary icon-themes/breeze_dark/vcl/res/check1.png |binary icon-themes/breeze_dark/vcl/res/check2.png |binary icon-themes/breeze_dark/vcl/res/check3.png |binary icon-themes/breeze_dark/vcl/res/check4.png |binary icon-themes/breeze_dark/vcl/res/check5.png |binary icon-themes/breeze_dark/vcl/res/check6.png |binary icon-themes/breeze_dark/vcl/res/check7.png |binary icon-themes/breeze_dark/vcl/res/check8.png |binary icon-themes/breeze_dark/vcl/res/check9.png |binary icon-themes/breeze_dark/vcl/res/radio1.png |binary icon-themes/breeze_dark/vcl/res/radio2.png |binary icon-themes/breeze_dark/vcl/res/radio3.png |binary icon-themes/breeze_dark/vcl/res/radio4.png |binary icon-themes/breeze_dark/vcl/res/radio5.png |binary icon-themes/breeze_dark/vcl/res/radio6.png |binary icon-themes/breeze_dark_svg/vcl/res/check1.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check2.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check3.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check4.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check5.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check6.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check7.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check8.svg | 2 icon-themes/breeze_dark_svg/vcl/res/check9.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio1.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio2.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio3.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio4.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio5.svg | 2 icon-themes/breeze_dark_svg/vcl/res/radio6.svg | 2 icon-themes/breeze_svg/vcl/res/check1.svg | 2 icon-themes/breeze_svg/vcl/res/check2.svg | 2 icon-themes/breeze_svg/vcl/res/check3.svg | 2 icon-themes/breeze_svg/vcl/res/check4.svg | 2 icon-themes/breeze_svg/vcl/res/check5.svg | 2 icon-themes/breeze_svg/vcl/res/check6.svg | 2 icon-themes/breeze_svg/vcl/res/check7.svg | 2 icon-themes/breeze_svg/vcl/res/check8.svg | 2 icon-themes/breeze_svg/vcl/res/check9.svg | 2 icon-themes/breeze_svg/vcl/res/radio1.svg | 2 icon-themes/breeze_svg/vcl/res/radio2.svg | 2 icon-themes/breeze_svg/vcl/res/radio3.svg | 2 icon-themes/breeze_svg/vcl/res/radio4.svg | 2 icon-themes/breeze_svg/vcl/res/radio5.svg | 2 icon-themes/breeze_svg/vcl/res/radio6.svg | 2 include/vcl/toolkit/spinfld.hxx | 9 sal/osl/unx/tempfile.cxx | 2 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java | 4 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 91 ++++------ svx/uiconfig/ui/docrecoveryrecoverdialog.ui | 2 sw/qa/extras/ooxmlexport/data/tdf149200.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 15 + sw/source/core/layout/anchoredobject.cxx | 3 sw/source/core/layout/flycnt.cxx | 10 - sw/source/filter/ww8/docxattributeoutput.cxx | 2 sw/source/ui/index/cnttab.cxx | 71 ++++--- sw/source/uibase/inc/swuicnttab.hxx | 3 sw/uiconfig/swriter/ui/tocentriespage.ui | 2 vcl/source/control/fmtfield.cxx | 7 vcl/source/control/spinfld.cxx | 31 +++ vcl/unx/gtk3/salnativewidgets-gtk.cxx | 11 - xmloff/source/text/XMLSectionFootnoteConfigImport.cxx | 2 82 files changed, 256 insertions(+), 143 deletions(-)
New commits: commit 3c8376a00636091b1c90970b4bd8a2a2eae9da52 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue May 31 15:06:53 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:37 2022 +0200 sw: fix crash in SwAnchoredObject::UpdateObjInSortedList See https://crashreport.libreoffice.org/stats/signature/SwAnchoredObject::UpdateObjInSortedList() Just a few lines above (line 636) the same checks are used inside the DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION condition so I don't understand why they weren't added here as well Change-Id: Id8ade0a506d5996d9e357d45c20fe56a68a93eec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135188 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 64f8a70298695d1952c3a399e897755ab861add5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135170 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 23c1e2f17906..c38cfcb03931 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -651,7 +651,8 @@ void SwAnchoredObject::UpdateObjInSortedList() AnchorFrame()->GetDrawObjs()->Update( *this ); // update its position in the sorted object list of its page frame // note: as-character anchored object aren't registered at a page frame - if ( GetFrameFormat().GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR ) + if ( GetPageFrame() && GetPageFrame()->GetSortedObjs() && + GetFrameFormat().GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR ) { GetPageFrame()->GetSortedObjs()->Update( *this ); } commit 78b6d38ceeb5f231b89123aade179a184517ebef Author: Andreas Heinisch <andreas.heini...@yahoo.de> AuthorDate: Wed May 25 12:42:23 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#149157 - Break multiline continuation in a comment after a new line Change-Id: I3dd875152a6f2cfafb67f13f597c36f01a4759b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135018 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de> (cherry picked from commit b94275f6d2cb4dc28d1563fd7994251042b6d51a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135164 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/basic/qa/cppunit/test_compiler_checks.cxx b/basic/qa/cppunit/test_compiler_checks.cxx index 24b380ed2a9a..e2882f3f694c 100644 --- a/basic/qa/cppunit/test_compiler_checks.cxx +++ b/basic/qa/cppunit/test_compiler_checks.cxx @@ -33,4 +33,44 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testDoubleArgument) CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED, aMacro.getError().StripDynamic()); } +CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157) +{ + MacroSnippet aMacro("Function extentComment() As Integer\n" + " ' _\n" + " If Not extentComment Then\n" + " extentComment = 1\n" + " End If\n" + "End Function\n"); + aMacro.Compile(); + CPPUNIT_ASSERT(!aMacro.HasError()); +} + +CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_compatible) +{ + MacroSnippet aMacro("Option Compatible\n" + "Function extentComment() As Integer\n" + " ' _\n" + "\n" + " If Not extentComment Then\n" + " extentComment = 1\n" + " End If\n" + "End Function\n"); + aMacro.Compile(); + CPPUNIT_ASSERT(!aMacro.HasError()); +} + +CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_vba) +{ + MacroSnippet aMacro("Option VBASupport 1\n" + "Function extentComment() As Integer\n" + " ' _\n" + "\n" + " If Not extentComment Then\n" + " extentComment = 1\n" + " End If\n" + "End Function\n"); + aMacro.Compile(); + CPPUNIT_ASSERT(!aMacro.HasError()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index a0d9b9ab6c76..d391e7b6dff2 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -701,6 +701,8 @@ eoln: aSym = "\n"; nColLock = 0; bClosingUnderscore = false; + // tdf#149157 - break multiline continuation in a comment after a new line + bPrevLineExtentsComment = false; return true; } } commit 587ac574a894a0efd35a3607070edfe1d69cc8ee Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue May 31 09:27:20 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#145527 Revert "Related tdf#116767: Call URLClassLoader.close" This reverts commit 418533f0af7cd303d559c8fb136c49e7e9fb0d79. Turned out that closing the given URLClassLoader once the script's main class has been loaded prevents the script from loading further classes located next to that main class. So abandon the Coverity suggestion that such class loaders should be closed promptly to avoid resource leaks. Change-Id: I1bcf83117836cfe317eac9850d413f2c3767bd8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135158 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit 2a263cbdaf16c723a93af020ebc11b3e07210242) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135165 diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java index 0974b8874110..b5e6e3085bd2 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java +++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java @@ -33,7 +33,7 @@ public class ClassLoaderFactory { private ClassLoaderFactory() {} - public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) { + public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) { ClassLoader parent = scriptData.getClass().getClassLoader(); URL[] classPath = scriptData.getClassPath(); LogUtils.DEBUG("Classpath has length " + classPath.length); @@ -45,7 +45,7 @@ public class ClassLoaderFactory { return getURLClassLoader(parent, classPath); } - public static URLClassLoader getURLClassLoader(final ClassLoader parent, + public static ClassLoader getURLClassLoader(final ClassLoader parent, final URL[] classpath) { return AccessController.doPrivileged( new PrivilegedAction<URLClassLoader>() { diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index 63dc3169f759..eeea0d49ebe5 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -45,8 +45,6 @@ import com.sun.star.uno.Any; import com.sun.star.uno.Type; import com.sun.star.uno.XComponentContext; -import java.io.IOException; -import java.net.URLClassLoader; import java.util.ArrayList; public class ScriptProviderForJava { @@ -184,63 +182,56 @@ class ScriptImpl implements XScript { ScriptDescriptor scriptDesc = new ScriptDescriptor(metaData.getLanguageName()); + LogUtils.DEBUG("Classloader starting..."); + + ClassLoader scriptLoader = + ClassLoaderFactory.getURLClassLoader(metaData); + + LogUtils.DEBUG("Classloader finished..."); + + ArrayList<Object> invocationArgList = new ArrayList<Object>(); Object[] invocationArgs = null; - ScriptProxy script = null; - LogUtils.DEBUG("Classloader starting..."); + LogUtils.DEBUG("Parameter Mapping..."); - try (URLClassLoader scriptLoader = ClassLoaderFactory.getURLClassLoader(metaData)) { - LogUtils.DEBUG("Classloader finished..."); + // Setup Context Object + XScriptContext xSc = + ScriptContext.createContext(m_xModel, m_xInvocContext, + m_xContext, m_xMultiComponentFactory); - ArrayList<Object> invocationArgList = new ArrayList<Object>(); + scriptDesc.addArgumentType(XScriptContext.class); + invocationArgList.add(xSc); - LogUtils.DEBUG("Parameter Mapping..."); + for (int i = 0; i < params.length; i++) { + scriptDesc.addArgumentType(params[ i ].getClass()); + invocationArgList.add(params[ i ]); + } - // Setup Context Object - XScriptContext xSc = - ScriptContext.createContext(m_xModel, m_xInvocContext, - m_xContext, m_xMultiComponentFactory); + if (!invocationArgList.isEmpty()) { + invocationArgs = invocationArgList.toArray(); + } - scriptDesc.addArgumentType(XScriptContext.class); - invocationArgList.add(xSc); + LogUtils.DEBUG("ScriptProxy starting... "); + ScriptProxy script = null; - for (int i = 0; i < params.length; i++) { - scriptDesc.addArgumentType(params[ i ].getClass()); - invocationArgList.add(params[ i ]); - } + try { - if (!invocationArgList.isEmpty()) { - invocationArgs = invocationArgList.toArray(); - } + String className = metaData.getLanguageName().substring(0, + metaData.getLanguageName().lastIndexOf('.')); - LogUtils.DEBUG("ScriptProxy starting... "); + LogUtils.DEBUG("About to load Class " + className + " starting... "); - try { + long start = new java.util.Date().getTime(); + Class<?> c = scriptLoader.loadClass(className); + long end = new java.util.Date().getTime(); - String className = metaData.getLanguageName().substring(0, - metaData.getLanguageName().lastIndexOf('.')); - - LogUtils.DEBUG("About to load Class " + className + " starting... "); - - long start = new java.util.Date().getTime(); - Class<?> c = scriptLoader.loadClass(className); - long end = new java.util.Date().getTime(); - - LogUtils.DEBUG("loadClass took: " + (end - start) + "milliseconds"); - - try { - LogUtils.DEBUG("class loaded ... "); - script = m_resolutionPolicy.getProxy(scriptDesc, c); - LogUtils.DEBUG("script resolved ... "); - } catch (NoSuchMethodException e) { - // Framework error - ScriptFrameworkErrorException e2 = new ScriptFrameworkErrorException( - e.toString(), null, metaData.getLanguageName(), - metaData.getLanguage(), ScriptFrameworkErrorType.NO_SUCH_SCRIPT); - e2.initCause(e); - throw e2; - } - } catch (ClassNotFoundException e) { + LogUtils.DEBUG("loadClass took: " + (end - start) + "milliseconds"); + + try { + LogUtils.DEBUG("class loaded ... "); + script = m_resolutionPolicy.getProxy(scriptDesc, c); + LogUtils.DEBUG("script resolved ... "); + } catch (NoSuchMethodException e) { // Framework error ScriptFrameworkErrorException e2 = new ScriptFrameworkErrorException( e.toString(), null, metaData.getLanguageName(), @@ -248,11 +239,11 @@ class ScriptImpl implements XScript { e2.initCause(e); throw e2; } - } catch (IOException e) { + } catch (ClassNotFoundException e) { // Framework error ScriptFrameworkErrorException e2 = new ScriptFrameworkErrorException( - e.toString(), null, metaData.getLanguageName(), metaData.getLanguage(), - ScriptFrameworkErrorType.NO_SUCH_SCRIPT); + e.toString(), null, metaData.getLanguageName(), + metaData.getLanguage(), ScriptFrameworkErrorType.NO_SUCH_SCRIPT); e2.initCause(e); throw e2; } commit da618fd7406322a18245285552aa740757243874 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Mon May 30 21:30:04 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 g: we are not, in fact, in the BUILDDIR For an out-of-tree build, "make fetch" poinlessly clones all git submodules. Change-Id: If4afb218946f49ba934f68b35806fd8143c39387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit aa8ef74b475a6fbd6e4ec27c42941aa274998df6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135159 Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/g b/g index 8b733fc878c6..d31cf60a2abd 100755 --- a/g +++ b/g @@ -10,9 +10,9 @@ fi SUBMODULES_ALL="dictionaries helpcontent2 translations" pushd $(dirname $0) > /dev/null -if [ -f config_host.mk ] ; then - # we are in the BUILDDIR - SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") +if [ -f ${BUILDDIR}/config_host.mk ] ; then + # we are in the SRCDIR + SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") else SRC_ROOT=$(pwd) fi @@ -150,8 +150,8 @@ get_active_submodules() get_configured_submodules() { SUBMODULES_CONFIGURED="" - if [ -f config_host.mk ] ; then - SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ] ; then + SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") else # if we need the configured submodule before the configuration is done. we assumed you want them all SUBMODULES_CONFIGURED=${SUBMODULES_ALL?} @@ -161,12 +161,12 @@ get_configured_submodules() get_git_reference() { REFERENCED_GIT="" - if [ -f config_host.mk ]; then - REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ]; then + REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") fi LINKED_GIT="" - if [ -f config_host.mk ]; then - LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") + if [ -f ${BUILDDIR}/config_host.mk ]; then + LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") fi } commit a641b293b6fdc2ea94cc941a5046b6396695ca35 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue May 31 10:02:58 2022 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#117006 gtk: detect High Contrast similar to https://bugzilla.mozilla.org/show_bug.cgi?id=1606038 .e.g. gnome a11y menu, pick "High Contrast" Change-Id: I60643b3a37b722230d5ed47082e4a6491d005ce4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135160 Reviewed-by: Michael Stahl <michael.st...@allotropia.de> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx index 0505010bea81..7bc455e62000 100644 --- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx @@ -2638,16 +2638,17 @@ bool GtkSalGraphics::updateSettings(AllSettings& rSettings) aStyleSet.SetToolbarIconSize( ToolbarIconSize::Large ); - // finally update the collected settings - rSettings.SetStyleSettings( aStyleSet ); -#if OSL_DEBUG_LEVEL > 1 - gchar* pThemeName = NULL; + gchar* pThemeName = nullptr; g_object_get( pSettings, "gtk-theme-name", &pThemeName, nullptr ); SAL_INFO("vcl.gtk3", "Theme name is \"" << pThemeName << "\"."); + // High contrast + aStyleSet.SetHighContrastMode(g_strcmp0(pThemeName, "HighContrast") == 0); g_free(pThemeName); -#endif + + // finally update the collected settings + rSettings.SetStyleSettings( aStyleSet ); return true; } commit e8c8d51d934f45c292b783b92a51d4bad245126d Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri May 20 19:47:01 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#149186: Table of contents editor not showing buttons in Dutch UI an alternative approach that doesn't leave things too wide for the English UI Change-Id: Idbdd75790607b1928bfc583004041f7f98688ae6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134852 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index c57f47278f2f..25d1d33ceaab 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1788,6 +1788,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* pPage, weld::DialogControl , m_xChapterInfoPB(m_xBuilder->weld_button("chapterinfo")) , m_xPageNoPB(m_xBuilder->weld_button("pageno")) , m_xHyperLinkPB(m_xBuilder->weld_button("hyperlink")) + , m_xFieldBox(m_xBuilder->weld_widget("fieldbox")) , m_xAuthFieldsLB(m_xBuilder->weld_combo_box("authfield")) , m_xAuthInsertPB(m_xBuilder->weld_button("insert")) , m_xAuthRemovePB(m_xBuilder->weld_button("remove")) @@ -1904,8 +1905,17 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* pPage, weld::DialogControl m_xSecondKeyLB->set_active(0); m_xThirdKeyLB->set_active(0); - //lock size + // lock size of dialog. Determine the field box's widest possible + // configuration (tdf#149186) before doing so. + int nFieldBoxWidth = 0; + for (int eType = TOX_CITATION; eType >= TOX_INDEX; --eType) + { + ShowHideControls(eType); + nFieldBoxWidth = std::max<int>(m_xFieldBox->get_preferred_size().Width(), nFieldBoxWidth); + } + m_xFieldBox->set_size_request(nFieldBoxWidth, -1); Size aPrefSize(m_xContainer->get_preferred_size()); + m_xFieldBox->set_size_request(-1, -1); m_xContainer->set_size_request(aPrefSize.Width(), aPrefSize.Height()); } @@ -1969,6 +1979,39 @@ void SwTOXEntryTabPage::Reset( const SfxItemSet* ) m_xCommaSeparatedCB->set_active(m_pCurrentForm->IsCommaSeparated()); } +void SwTOXEntryTabPage::ShowHideControls(int eType) +{ + bool bToxIsAuthorities = TOX_AUTHORITIES == eType; + bool bToxIsIndex = TOX_INDEX == eType; + bool bToxIsContent = TOX_CONTENT == eType; + bool bToxSupportsLinks = TOX_CONTENT == eType || + TOX_ILLUSTRATIONS == eType || + TOX_TABLES == eType || + TOX_OBJECTS == eType || + TOX_USER == eType; + + //show or hide controls + m_xEntryNoPB->set_visible(bToxIsContent); + m_xHyperLinkPB->set_visible(bToxSupportsLinks); + m_xRelToStyleCB->set_visible(!bToxIsAuthorities); + m_xChapterInfoPB->set_visible(!bToxIsContent && !bToxIsAuthorities); + m_xEntryPB->set_visible(!bToxIsAuthorities); + m_xPageNoPB->set_visible(!bToxIsAuthorities); + m_xAuthFieldsLB->set_visible(bToxIsAuthorities); + m_xAuthInsertPB->set_visible(bToxIsAuthorities); + m_xAuthRemovePB->set_visible(bToxIsAuthorities); + + m_xFormatFrame->set_visible(!bToxIsAuthorities); + + m_xSortingFrame->set_visible(bToxIsAuthorities); + m_xSortKeyFrame->set_visible(bToxIsAuthorities); + + m_xMainEntryStyleFT->set_visible(bToxIsIndex); + m_xMainEntryStyleLB->set_visible(bToxIsIndex); + m_xAlphaDelimCB->set_visible(bToxIsIndex); + m_xCommaSeparatedCB->set_visible(bToxIsIndex); +} + void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetDialogController()); @@ -1979,12 +2022,6 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType; bool bToxIsIndex = TOX_INDEX == aCurType.eType; - bool bToxIsContent = TOX_CONTENT == aCurType.eType; - bool bToxSupportsLinks = TOX_CONTENT == aCurType.eType || - TOX_ILLUSTRATIONS == aCurType.eType || - TOX_TABLES == aCurType.eType || - TOX_OBJECTS == aCurType.eType || - TOX_USER == aCurType.eType; m_xLevelLB->clear(); for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++) @@ -2047,25 +2084,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) m_xLevelLB->select(bToxIsIndex ? 1 : 0); //show or hide controls - m_xEntryNoPB->set_visible(bToxIsContent); - m_xHyperLinkPB->set_visible(bToxSupportsLinks); - m_xRelToStyleCB->set_visible(!bToxIsAuthorities); - m_xChapterInfoPB->set_visible(!bToxIsContent && !bToxIsAuthorities); - m_xEntryPB->set_visible(!bToxIsAuthorities); - m_xPageNoPB->set_visible(!bToxIsAuthorities); - m_xAuthFieldsLB->set_visible(bToxIsAuthorities); - m_xAuthInsertPB->set_visible(bToxIsAuthorities); - m_xAuthRemovePB->set_visible(bToxIsAuthorities); - - m_xFormatFrame->set_visible(!bToxIsAuthorities); - - m_xSortingFrame->set_visible(bToxIsAuthorities); - m_xSortKeyFrame->set_visible(bToxIsAuthorities); - - m_xMainEntryStyleFT->set_visible(bToxIsIndex); - m_xMainEntryStyleLB->set_visible(bToxIsIndex); - m_xAlphaDelimCB->set_visible(bToxIsIndex); - m_xCommaSeparatedCB->set_visible(bToxIsIndex); + ShowHideControls(aCurType.eType); } aLastTOXType = aCurType; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 11a34b91ff5e..502d6e1b5e2f 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -324,6 +324,7 @@ class SwTOXEntryTabPage final : public SfxTabPage std::unique_ptr<weld::Button> m_xChapterInfoPB; std::unique_ptr<weld::Button> m_xPageNoPB; std::unique_ptr<weld::Button> m_xHyperLinkPB; + std::unique_ptr<weld::Widget> m_xFieldBox; std::unique_ptr<weld::ComboBox> m_xAuthFieldsLB; std::unique_ptr<weld::Button> m_xAuthInsertPB; std::unique_ptr<weld::Button> m_xAuthRemovePB; @@ -383,6 +384,8 @@ class SwTOXEntryTabPage final : public SfxTabPage void OnModify(bool bAllLevels); DECL_LINK(ModifyClickHdl, weld::Toggleable&, void); + void ShowHideControls(int eType); + public: SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage() override; diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui index 44d4c7455b4f..123487935167 100644 --- a/sw/uiconfig/swriter/ui/tocentriespage.ui +++ b/sw/uiconfig/swriter/ui/tocentriespage.ui @@ -513,7 +513,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="fieldbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> commit 5c9bbdc0412eb08ffed584dc02e4bdf7e3744184 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon May 23 17:12:41 2022 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#148168 set built-in gtk search box to search "document name" column rather than column 0 which is used for icons Change-Id: Idef015e575fe6a4f76ad0cc67481ca8454a07206 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134782 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui index b48132a8be6b..982b19bf8bce 100644 --- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui +++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui @@ -139,7 +139,7 @@ <property name="model">liststore1</property> <property name="headers_clickable">False</property> <property name="headers_visible">True</property> - <property name="search_column">0</property> + <property name="search-column">1</property> <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection2"/> commit 11b992a6c07b66d512de384b26e6cdf0b0ce0d43 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sun May 22 11:58:36 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 tdf#149096: don't translate "Get" and "Post" submit methods Change-Id: I4427618dad0c168642225eaaf828a96e37936d8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134718 Tested-by: Julien Nabet <serval2...@yahoo.fr> Reviewed-by: Julien Nabet <serval2...@yahoo.fr> (cherry picked from commit 93b4191cefa5062b120c77335776beee34ee4392) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134789 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc index 2de092317cac..6de5d0126faa 100644 --- a/extensions/inc/stringarrays.hrc +++ b/extensions/inc/stringarrays.hrc @@ -76,12 +76,6 @@ const TranslateId RID_RSC_ENUM_BUTTONTYPE[] = NC_("RID_RSC_ENUM_BUTTONTYPE", "Refresh form") }; -const TranslateId RID_RSC_ENUM_SUBMIT_METHOD[] = -{ - NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Get"), - NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Post" ) -}; - const TranslateId RID_RSC_ENUM_SUBMIT_ENCODING[] = { NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "URL"), diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 1f51ee3994ed..54a9d7cf2e0f 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -410,6 +410,10 @@ namespace pcr OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); + if (_nId == PROPERTY_ID_SUBMIT_METHOD) + { + return { "Get", "Post" }; + } const TranslateId* pStringItemsResId = nullptr; int nElements = 0; switch ( _nId ) @@ -450,10 +454,6 @@ namespace pcr pStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_PUSHBUTTONTYPE); break; - case PROPERTY_ID_SUBMIT_METHOD: - pStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_METHOD); - break; case PROPERTY_ID_SUBMIT_ENCODING: pStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_ENCODING); commit e6d224bf4040c896252c95731b104ed5d7777fd0 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sun May 29 21:25:09 2022 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:36 2022 +0200 Related: tdf#89131 draw up/down spins disabled if value is at max/min if there is a max/min set. Change-Id: I2dc7ccccad9ec2aa7eb89d8b5fa137e077a846fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135105 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 2896c5dad1799addd72b626d93d7e89b1cf19ff6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135070 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx index f6de1202a45d..d82348bd44bb 100644 --- a/include/vcl/toolkit/spinfld.hxx +++ b/include/vcl/toolkit/spinfld.hxx @@ -61,6 +61,11 @@ public: virtual FactoryFunction GetUITestFactory() const override; + SAL_DLLPRIVATE void SetUpperEnabled(bool bEnabled); + SAL_DLLPRIVATE void SetLowerEnabled(bool bEnabled); + SAL_DLLPRIVATE bool IsUpperEnabled() const { return mbUpperEnabled; } + SAL_DLLPRIVATE bool IsLowerEnabled() const { return mbLowerEnabled; } + protected: tools::Rectangle maUpperRect; tools::Rectangle maLowerRect; @@ -91,7 +96,9 @@ private: mbInitialDown:1, mbUpperIn:1, mbLowerIn:1, - mbInDropDown:1; + mbInDropDown:1, + mbUpperEnabled:1, + mbLowerEnabled:1; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx index a0d96dd9caae..d3f7d88985f2 100644 --- a/vcl/source/control/fmtfield.cxx +++ b/vcl/source/control/fmtfield.cxx @@ -922,6 +922,13 @@ namespace { m_rSpinButton.SpinField::Modify(); } + + virtual void UpdateCurrentValue(double dCurrentValue) override + { + Formatter::UpdateCurrentValue(dCurrentValue); + m_rSpinButton.SetUpperEnabled(!m_bHasMax || dCurrentValue < m_dMaxValue); + m_rSpinButton.SetLowerEnabled(!m_bHasMin || dCurrentValue > m_dMinValue); + } }; class DoubleNumericFormatter : public FieldFormatter diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 8db25dfbc699..6bc1fac297a9 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -298,6 +298,8 @@ void SpinField::ImplInitSpinFieldData() mbInitialUp = false; mbInitialDown = false; mbInDropDown = false; + mbUpperEnabled = true; + mbLowerEnabled = true; } void SpinField::ImplInit(vcl::Window* pParent, WinBits nWinStyle) @@ -578,13 +580,38 @@ void SpinField::FillLayoutData() const Edit::FillLayoutData(); } +void SpinField::SetUpperEnabled(bool bEnabled) +{ + if (mbUpperEnabled == bEnabled) + return; + + mbUpperEnabled = bEnabled; + + if (mbSpin) + Invalidate(maUpperRect); +} + +void SpinField::SetLowerEnabled(bool bEnabled) +{ + if (mbLowerEnabled == bEnabled) + return; + + mbLowerEnabled = bEnabled; + + if (mbSpin) + Invalidate(maLowerRect); +} + void SpinField::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { if (mbSpin) { - bool bEnable = IsEnabled(); + bool bEnabled = IsEnabled(); + bool bUpperEnabled = bEnabled && IsUpperEnabled(); + bool bLowerEnabled = bEnabled && IsLowerEnabled(); ImplDrawSpinButton(rRenderContext, this, maUpperRect, maLowerRect, - mbUpperIn, mbLowerIn, bEnable, bEnable); + mbUpperIn && bUpperEnabled, mbLowerIn && bLowerEnabled, + bUpperEnabled, bLowerEnabled); } if (GetStyle() & WB_DROPDOWN) commit da0506bc1f14438952e17b78b23813dab0a7901d Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon May 30 09:33:49 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:35 2022 +0200 Avoid uninitialized temp_file_handle ...in case osl_create_temp_file_impl_ doesn't assign to it, for whatever osl_error reason, which then apparently leads to <https://crashreport.libreoffice.org/stats/crash_details/e47a9fbb-a6f1-4020-ade8-ab51549b727a> SIGSEGV at (relative to libreoffice-7-1) > 0 libuno_sal.so.3 osl_closeFile sal/osl/unx/file.cxx:1154 > 1 libuno_sal.so.3 osl_createTempFile sal/osl/unx/tempfile.cxx:330 > 2 libmergedlo.so PackedFile::flush include/osl/file.hxx:310 > 3 libmergedlo.so comphelper::BackupFileHelper::tryPush_file comphelper/source/misc/backupfilehelper.cxx:2090 [...] Change-Id: I2e81bbeab7daaaa3c19de4accce8a76ad24faa47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135111 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit bbcf26337cd2933205248909c55d5c1d161e9b9b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135067 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 00ae0664b2c0..4a0e7aa0762f 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -278,7 +278,7 @@ oslFileError SAL_CALL osl_createTempFile( rtl_uString** ppustrTempFileURL) { rtl_uString* base_directory = nullptr; - oslFileHandle temp_file_handle; + oslFileHandle temp_file_handle = nullptr; bool b_delete_on_close; oslFileError osl_error; commit f012cecd786c03e1210d4d9ba3aab9f1f8decc7b Author: Vasily Melenchuk <vasily.melenc...@cib.de> AuthorDate: Wed May 25 17:15:53 2022 +0300 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:35 2022 +0200 tdf#149200: docx export: transparent color fix If there is no color value we should not also try to write transparency information: otherwise w:srgbClr will have no parameter value and MS Word won't open such documents. Change-Id: Id67f174c5ae9aadf90ae54c126aef9a43ff3ba17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134945 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135121 diff --git a/sw/qa/extras/ooxmlexport/data/tdf149200.docx b/sw/qa/extras/ooxmlexport/data/tdf149200.docx new file mode 100644 index 000000000000..811f594b64f4 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf149200.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 2432f6112511..9f8c4c0b5c5d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -631,6 +631,21 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx") } } +CPPUNIT_TEST_FIXTURE(Test, testTdf149200) +{ + loadAndSave("tdf149200.docx"); + CPPUNIT_ASSERT_EQUAL(1, getPages()); + xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); + + // Ensure there is no unexpected invalid structure <w14:textFill> + // There is just one run property + xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "count(/w:document/w:body/w:p[1]/w:r[1]/w:rPr/*)"); + CPPUNIT_ASSERT(pXmlObj); + CPPUNIT_ASSERT_EQUAL(double(1), pXmlObj->floatval); + // And it is a color definition with themeColor + CPPUNIT_ASSERT_EQUAL(OUString("dark1"), getXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:color", "themeColor")); +} + DECLARE_OOXMLEXPORT_TEST(testTdf148273_sectionBulletFormatLeak, "tdf148273_sectionBulletFormatLeak.docx") { // get a paragraph with bullet point after section break diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index aa3b1392b1d4..e74ea397c40a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3192,7 +3192,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties() { const char* pVal = nullptr; m_pColorAttrList->getAsChar(FSNS(XML_w, XML_val), pVal); - if (pVal == nullptr || std::string_view("auto") != pVal) + if (pVal != nullptr && std::string_view("auto") != pVal) { m_pSerializer->startElementNS(XML_w14, XML_textFill); m_pSerializer->startElementNS(XML_w14, XML_solidFill); commit 7e0e28dfbf01351b796b230ffc9498521c3eea90 Author: Rizal Muttaqin <riz_17_...@yahoo.co.id> AuthorDate: Mon May 30 10:54:27 2022 +0700 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:35 2022 +0200 Breeze: tdf#149368 ^ radio & checbox button to follow up latest Plasma UI Change-Id: I2674ea52bc6217aa7cf9283c17f1d63533baaa49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135107 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz...@libreoffice.org> (cherry picked from commit f1d1555028c9e99ad1817fd15d68e24fb754d979) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135066 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/icon-themes/breeze/vcl/res/check1.png b/icon-themes/breeze/vcl/res/check1.png index 1f620d70f5cd..7276b09b0f78 100644 Binary files a/icon-themes/breeze/vcl/res/check1.png and b/icon-themes/breeze/vcl/res/check1.png differ diff --git a/icon-themes/breeze/vcl/res/check2.png b/icon-themes/breeze/vcl/res/check2.png index 257c6cbf9fba..80450a5553d7 100644 Binary files a/icon-themes/breeze/vcl/res/check2.png and b/icon-themes/breeze/vcl/res/check2.png differ diff --git a/icon-themes/breeze/vcl/res/check3.png b/icon-themes/breeze/vcl/res/check3.png index 25cc248f55f4..984362695263 100644 Binary files a/icon-themes/breeze/vcl/res/check3.png and b/icon-themes/breeze/vcl/res/check3.png differ diff --git a/icon-themes/breeze/vcl/res/check4.png b/icon-themes/breeze/vcl/res/check4.png index c3ba85e011ec..f92a311529fc 100644 Binary files a/icon-themes/breeze/vcl/res/check4.png and b/icon-themes/breeze/vcl/res/check4.png differ diff --git a/icon-themes/breeze/vcl/res/check5.png b/icon-themes/breeze/vcl/res/check5.png index 25cc248f55f4..be510ede90e7 100644 Binary files a/icon-themes/breeze/vcl/res/check5.png and b/icon-themes/breeze/vcl/res/check5.png differ diff --git a/icon-themes/breeze/vcl/res/check6.png b/icon-themes/breeze/vcl/res/check6.png index 6162e4408848..ceea0f13689b 100644 Binary files a/icon-themes/breeze/vcl/res/check6.png and b/icon-themes/breeze/vcl/res/check6.png differ diff --git a/icon-themes/breeze/vcl/res/check7.png b/icon-themes/breeze/vcl/res/check7.png index 7f6406e7a11f..67f9e2903abc 100644 Binary files a/icon-themes/breeze/vcl/res/check7.png and b/icon-themes/breeze/vcl/res/check7.png differ diff --git a/icon-themes/breeze/vcl/res/check8.png b/icon-themes/breeze/vcl/res/check8.png index 482037557c08..61250142e722 100644 Binary files a/icon-themes/breeze/vcl/res/check8.png and b/icon-themes/breeze/vcl/res/check8.png differ diff --git a/icon-themes/breeze/vcl/res/check9.png b/icon-themes/breeze/vcl/res/check9.png index 6162e4408848..ceea0f13689b 100644 Binary files a/icon-themes/breeze/vcl/res/check9.png and b/icon-themes/breeze/vcl/res/check9.png differ diff --git a/icon-themes/breeze/vcl/res/radio1.png b/icon-themes/breeze/vcl/res/radio1.png index df7f7cede2cf..41066326c451 100644 Binary files a/icon-themes/breeze/vcl/res/radio1.png and b/icon-themes/breeze/vcl/res/radio1.png differ diff --git a/icon-themes/breeze/vcl/res/radio2.png b/icon-themes/breeze/vcl/res/radio2.png index 3a098263a3df..3f476f92b4dd 100644 Binary files a/icon-themes/breeze/vcl/res/radio2.png and b/icon-themes/breeze/vcl/res/radio2.png differ diff --git a/icon-themes/breeze/vcl/res/radio3.png b/icon-themes/breeze/vcl/res/radio3.png index 8d71e8670b4f..706d8672e618 100644 Binary files a/icon-themes/breeze/vcl/res/radio3.png and b/icon-themes/breeze/vcl/res/radio3.png differ diff --git a/icon-themes/breeze/vcl/res/radio4.png b/icon-themes/breeze/vcl/res/radio4.png index 590379804563..6f4f358d29ca 100644 Binary files a/icon-themes/breeze/vcl/res/radio4.png and b/icon-themes/breeze/vcl/res/radio4.png differ diff --git a/icon-themes/breeze/vcl/res/radio5.png b/icon-themes/breeze/vcl/res/radio5.png index 8d71e8670b4f..138a306682f9 100644 Binary files a/icon-themes/breeze/vcl/res/radio5.png and b/icon-themes/breeze/vcl/res/radio5.png differ diff --git a/icon-themes/breeze/vcl/res/radio6.png b/icon-themes/breeze/vcl/res/radio6.png index 4267a669ebc2..84da2c429a59 100644 Binary files a/icon-themes/breeze/vcl/res/radio6.png and b/icon-themes/breeze/vcl/res/radio6.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check1.png b/icon-themes/breeze_dark/vcl/res/check1.png index 1f620d70f5cd..7276b09b0f78 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check1.png and b/icon-themes/breeze_dark/vcl/res/check1.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check2.png b/icon-themes/breeze_dark/vcl/res/check2.png index 257c6cbf9fba..31dfc2a6c090 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check2.png and b/icon-themes/breeze_dark/vcl/res/check2.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check3.png b/icon-themes/breeze_dark/vcl/res/check3.png index 25cc248f55f4..984362695263 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check3.png and b/icon-themes/breeze_dark/vcl/res/check3.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check4.png b/icon-themes/breeze_dark/vcl/res/check4.png index c3ba85e011ec..c008952043c9 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check4.png and b/icon-themes/breeze_dark/vcl/res/check4.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check5.png b/icon-themes/breeze_dark/vcl/res/check5.png index 25cc248f55f4..be510ede90e7 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check5.png and b/icon-themes/breeze_dark/vcl/res/check5.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check6.png b/icon-themes/breeze_dark/vcl/res/check6.png index 6162e4408848..ceea0f13689b 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check6.png and b/icon-themes/breeze_dark/vcl/res/check6.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check7.png b/icon-themes/breeze_dark/vcl/res/check7.png index 7f6406e7a11f..b088585e2404 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check7.png and b/icon-themes/breeze_dark/vcl/res/check7.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check8.png b/icon-themes/breeze_dark/vcl/res/check8.png index 482037557c08..673f813f1e90 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check8.png and b/icon-themes/breeze_dark/vcl/res/check8.png differ diff --git a/icon-themes/breeze_dark/vcl/res/check9.png b/icon-themes/breeze_dark/vcl/res/check9.png index 6162e4408848..ceea0f13689b 100644 Binary files a/icon-themes/breeze_dark/vcl/res/check9.png and b/icon-themes/breeze_dark/vcl/res/check9.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio1.png b/icon-themes/breeze_dark/vcl/res/radio1.png index df7f7cede2cf..41066326c451 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio1.png and b/icon-themes/breeze_dark/vcl/res/radio1.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio2.png b/icon-themes/breeze_dark/vcl/res/radio2.png index 3a098263a3df..3bf75a385828 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio2.png and b/icon-themes/breeze_dark/vcl/res/radio2.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio3.png b/icon-themes/breeze_dark/vcl/res/radio3.png index 8d71e8670b4f..706d8672e618 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio3.png and b/icon-themes/breeze_dark/vcl/res/radio3.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio4.png b/icon-themes/breeze_dark/vcl/res/radio4.png index 590379804563..1fbd9dabc5cc 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio4.png and b/icon-themes/breeze_dark/vcl/res/radio4.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio5.png b/icon-themes/breeze_dark/vcl/res/radio5.png index 8d71e8670b4f..138a306682f9 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio5.png and b/icon-themes/breeze_dark/vcl/res/radio5.png differ diff --git a/icon-themes/breeze_dark/vcl/res/radio6.png b/icon-themes/breeze_dark/vcl/res/radio6.png index 4267a669ebc2..84da2c429a59 100644 Binary files a/icon-themes/breeze_dark/vcl/res/radio6.png and b/icon-themes/breeze_dark/vcl/res/radio6.png differ diff --git a/icon-themes/breeze_dark_svg/vcl/res/check1.svg b/icon-themes/breeze_dark_svg/vcl/res/check1.svg index 2998c394df71..e99405cdb71c 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check1.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check1.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check2.svg b/icon-themes/breeze_dark_svg/vcl/res/check2.svg index c10e39afcb14..81c0d6ddce07 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check2.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check2.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#3daee9" stroke-width=".544444"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b8ddf1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check3.svg b/icon-themes/breeze_dark_svg/vcl/res/check3.svg index cd8885606515..f4102c930566 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check3.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check3.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check4.svg b/icon-themes/breeze_dark_svg/vcl/res/check4.svg index 3d63259e2600..d623e616dfcc 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check4.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check4.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#93cee9"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check5.svg b/icon-themes/breeze_dark_svg/vcl/res/check5.svg index cd8885606515..4c29e6e5a3b3 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check5.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check5.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check6.svg b/icon-themes/breeze_dark_svg/vcl/res/check6.svg index 9503e0c379f7..8d583198df54 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check6.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check6.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#7c8288" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#b6b8b9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check7.svg b/icon-themes/breeze_dark_svg/vcl/res/check7.svg index 31beb43307ea..33cbe6179e19 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check7.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check7.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7zm6 1v5h-5z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b8ddf1"/><path d="m3 6h9v3h-9z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check8.svg b/icon-themes/breeze_dark_svg/vcl/res/check8.svg index 25f700198889..8eeece8e9e77 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check8.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check8.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7zm6 1v5h-5z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#93cee9"/><path d="m3 6h9v3h-9z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/check9.svg b/icon-themes/breeze_dark_svg/vcl/res/check9.svg index 9503e0c379f7..8d583198df54 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/check9.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/check9.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#7c8288" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#b6b8b9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio1.svg b/icon-themes/breeze_dark_svg/vcl/res/radio1.svg index f2516712f20c..cb0eb42a6480 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio1.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio1.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#8c8e8f" fill-opacity=".992157"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio2.svg b/icon-themes/breeze_dark_svg/vcl/res/radio2.svg index 5073aa83b8a4..abd5e95bf7aa 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio2.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio2.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3daee9"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#b8ddf1"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio3.svg b/icon-themes/breeze_dark_svg/vcl/res/radio3.svg index a4830db9bace..7541efabc4f3 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio3.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio3.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio4.svg b/icon-themes/breeze_dark_svg/vcl/res/radio4.svg index 8baff824a745..1fe81be9a8f0 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio4.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio4.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3daee9"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#93cee9"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio5.svg b/icon-themes/breeze_dark_svg/vcl/res/radio5.svg index a4830db9bace..aa7ead2c6322 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio5.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio5.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/radio6.svg b/icon-themes/breeze_dark_svg/vcl/res/radio6.svg index cd973b1566d3..9170bbd8fa88 100644 --- a/icon-themes/breeze_dark_svg/vcl/res/radio6.svg +++ b/icon-themes/breeze_dark_svg/vcl/res/radio6.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#8c8e8f" fill-opacity=".992157"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#8c8e8f" fill-opacity=".992157"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#eff0f1"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#b6b8b9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check1.svg b/icon-themes/breeze_svg/vcl/res/check1.svg index 2998c394df71..e99405cdb71c 100644 --- a/icon-themes/breeze_svg/vcl/res/check1.svg +++ b/icon-themes/breeze_svg/vcl/res/check1.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check2.svg b/icon-themes/breeze_svg/vcl/res/check2.svg index c10e39afcb14..d82600df7ea8 100644 --- a/icon-themes/breeze_svg/vcl/res/check2.svg +++ b/icon-themes/breeze_svg/vcl/res/check2.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#3daee9" stroke-width=".544444"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b8ddf1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check3.svg b/icon-themes/breeze_svg/vcl/res/check3.svg index cd8885606515..f4102c930566 100644 --- a/icon-themes/breeze_svg/vcl/res/check3.svg +++ b/icon-themes/breeze_svg/vcl/res/check3.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check4.svg b/icon-themes/breeze_svg/vcl/res/check4.svg index 3d63259e2600..0da80043c4ae 100644 --- a/icon-themes/breeze_svg/vcl/res/check4.svg +++ b/icon-themes/breeze_svg/vcl/res/check4.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#93cee9"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check5.svg b/icon-themes/breeze_svg/vcl/res/check5.svg index cd8885606515..4c29e6e5a3b3 100644 --- a/icon-themes/breeze_svg/vcl/res/check5.svg +++ b/icon-themes/breeze_svg/vcl/res/check5.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check6.svg b/icon-themes/breeze_svg/vcl/res/check6.svg index 9503e0c379f7..8d583198df54 100644 --- a/icon-themes/breeze_svg/vcl/res/check6.svg +++ b/icon-themes/breeze_svg/vcl/res/check6.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#7c8288" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#b6b8b9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check7.svg b/icon-themes/breeze_svg/vcl/res/check7.svg index 31beb43307ea..39df53f285d9 100644 --- a/icon-themes/breeze_svg/vcl/res/check7.svg +++ b/icon-themes/breeze_svg/vcl/res/check7.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7zm6 1v5h-5z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b8ddf1"/><path d="m3 6h9v3h-9z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check8.svg b/icon-themes/breeze_svg/vcl/res/check8.svg index 25f700198889..6682dba1ed94 100644 --- a/icon-themes/breeze_svg/vcl/res/check8.svg +++ b/icon-themes/breeze_svg/vcl/res/check8.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill="#3daee9" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7zm6 1v5h-5z" fill="#3daee9" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#44b1e9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#93cee9"/><path d="m3 6h9v3h-9z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/check9.svg b/icon-themes/breeze_svg/vcl/res/check9.svg index 9503e0c379f7..8d583198df54 100644 --- a/icon-themes/breeze_svg/vcl/res/check9.svg +++ b/icon-themes/breeze_svg/vcl/res/check9.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><rect fill-opacity=".14902" height="13" rx="2" width="13" x="2" y="2"/><rect fill="#7c8288" height="13" rx="2" width="13" x="1" y="1"/><path d="m3.5 2h8c.831 0 1.5.669 1.5 1.5v8c0 .831-.669 1.5-1.5 1.5h-8c-.831 0-1.5-.669-1.5-1.5v-8c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m4 4v7h7v-7z" fill="#7c8288" stroke-width=".7"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m2 0c-1.108 0-2 .892-2 2v11c0 1.108.892 2 2 2h11c1.108 0 2-.892 2-2v-11c0-1.108-.892-2-2-2zm.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#b6b8b9"/><path d="m2.5 1h10c.831 0 1.5.669 1.5 1.5v10c0 .831-.669 1.5-1.5 1.5h-10c-.831 0-1.5-.669-1.5-1.5v-10c0-.831.669-1.5 1.5-1.5z" fill="#eff0f1"/><path d="m2 7v1.5l4 4 7-7v-1.5h-1.730341l-5.269659 5-2-2z" fill="#b6b8b9"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio1.svg b/icon-themes/breeze_svg/vcl/res/radio1.svg index f2516712f20c..cb0eb42a6480 100644 --- a/icon-themes/breeze_svg/vcl/res/radio1.svg +++ b/icon-themes/breeze_svg/vcl/res/radio1.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#8c8e8f" fill-opacity=".992157"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio2.svg b/icon-themes/breeze_svg/vcl/res/radio2.svg index 5073aa83b8a4..93763b0f071a 100644 --- a/icon-themes/breeze_svg/vcl/res/radio2.svg +++ b/icon-themes/breeze_svg/vcl/res/radio2.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3daee9"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#b8ddf1"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio3.svg b/icon-themes/breeze_svg/vcl/res/radio3.svg index a4830db9bace..7541efabc4f3 100644 --- a/icon-themes/breeze_svg/vcl/res/radio3.svg +++ b/icon-themes/breeze_svg/vcl/res/radio3.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#fff"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio4.svg b/icon-themes/breeze_svg/vcl/res/radio4.svg index 8baff824a745..9156b7e6f0b5 100644 --- a/icon-themes/breeze_svg/vcl/res/radio4.svg +++ b/icon-themes/breeze_svg/vcl/res/radio4.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3daee9"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#44b1e9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#93cee9"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#232629"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio5.svg b/icon-themes/breeze_svg/vcl/res/radio5.svg index a4830db9bace..aa7ead2c6322 100644 --- a/icon-themes/breeze_svg/vcl/res/radio5.svg +++ b/icon-themes/breeze_svg/vcl/res/radio5.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#3daee9"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#eff0f1"/></svg> \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/radio6.svg b/icon-themes/breeze_svg/vcl/res/radio6.svg index cd973b1566d3..9170bbd8fa88 100644 --- a/icon-themes/breeze_svg/vcl/res/radio6.svg +++ b/icon-themes/breeze_svg/vcl/res/radio6.svg @@ -1 +1 @@ -<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m14.5 8a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill-opacity=".14902"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#8c8e8f" fill-opacity=".992157"/><path d="m13 7.5a5.5 5.5 0 0 1 -5.5 5.5 5.5 5.5 0 0 1 -5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" fill="#eff0f1"/><path d="m12 7.5a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#8c8e8f" fill-opacity=".992157"/></svg> \ No newline at end of file +<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 0a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0 -7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#b6b8b9"/><path d="m14 7.5a6.5 6.5 0 0 1 -6.5 6.5 6.5 6.5 0 0 1 -6.5-6.5 6.5 6.5 0 0 1 6.5-6.5 6.5 6.5 0 0 1 6.5 6.5z" fill="#eff0f1"/><path d="m10.5 7.5a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#b6b8b9"/></svg> \ No newline at end of file commit 85b40f14e2e466688add2f9d57144b4fd3c2d7a0 Author: Attila Bakos (NISZ) <bakos.attilakar...@nisz.hu> AuthorDate: Tue May 17 15:28:59 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:35 2022 +0200 tdf#148365 sw: fix freezing with FrameIsAutomaticHeight Lock layout update temporarily during setting horizontal and after that, vertical orientations of textboxes with FrameIsAutomaticHeight to avoid freezing SwObjectFormatter, and depending on the platform, freezing Writer completely. Regression from commit 3b0a0e70cb67fc2e1f9999d2e8cbb9cfcd8c670e "Related tdf#66039 DOCX import: fix Z-order of group shapes". Change-Id: Ib106182b9f0d3d74ebdc3e746345380c8b685fdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134480 Tested-by: László Németh <nem...@numbertext.org> Reviewed-by: László Németh <nem...@numbertext.org> (cherry picked from commit 182d2a47a2b4ed0affdc828a534c1659cc2e926d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135007 Tested-by: Jenkins Reviewed-by: Attila Bakos <bakos.attilakar...@nisz.hu> diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 5e9bdfe92ef0..5bcdad916e13 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -549,8 +549,14 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) aHOri.SetPos(aHOri.GetPos() + aTextRectangle.Left()); aVOri.SetPos(aVOri.GetPos() + aTextRectangle.Top()); // save the new position for the shape - GetFormat()->SetFormatAttr(aHOri); - GetFormat()->SetFormatAttr(aVOri); + auto pFormat = GetFormat(); + const bool bLocked = pFormat->IsModifyLocked(); + if (!bLocked) + pFormat->LockModify(); + pFormat->SetFormatAttr(aHOri); + pFormat->SetFormatAttr(aVOri); + if (!bLocked) + pFormat->UnlockModify(); } if ( bOsz || bConsiderWrapInfluenceDueToOverlapPrevCol || // #i40444# commit c0984fb14f5ebb26a4c5fd7b3c472b719babedfa Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Fri May 27 21:34:57 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Jun 1 12:30:35 2022 +0200 tdf#145178 xmloff: ODF import: fix another bad attribute ...in XMLSectionFootnoteConfigImport. (regression from commit 9814c1f2edf56ecc0f31001db9234ef335488879) Change-Id: I79ab3b74853bd3ec9058fea72c341768e916bbd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135048 Tested-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit 9896f330cdb3df67b74b16a2c2177a8505fd2485) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135056 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index ef408c0c13c8..0f4f51e1b4e3 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -113,7 +113,7 @@ void XMLSectionFootnoteConfigImport::startFastElement( bNumOwn = true; break; } - case XML_ELEMENT(TEXT, XML_NUM_LETTER_SYNC): + case XML_ELEMENT(STYLE, XML_NUM_LETTER_SYNC): { sNumLetterSync = aIter.toString(); bNumOwn = true;